summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/ark/Makefile3
-rw-r--r--archivers/ark/PLIST11
-rw-r--r--archivers/ark/distinfo8
-rw-r--r--devel/kdesdk4/Makefile84
-rw-r--r--devel/kdesdk4/PLIST656
-rw-r--r--devel/kdesdk4/distinfo12
-rw-r--r--devel/kdesdk4/patches/patch-aa6
-rw-r--r--devel/kdesdk4/patches/patch-ab6
-rw-r--r--editors/kate/Makefile11
-rw-r--r--editors/kate/PLIST156
-rw-r--r--editors/kate/distinfo8
-rw-r--r--games/blinken/Makefile3
-rw-r--r--games/blinken/distinfo8
-rw-r--r--games/kanagram/Makefile3
-rw-r--r--games/kanagram/PLIST11
-rw-r--r--games/kanagram/distinfo8
-rw-r--r--games/kdetoys4/Makefile3
-rw-r--r--games/kdetoys4/distinfo8
-rw-r--r--games/khangman/Makefile3
-rw-r--r--games/khangman/PLIST11
-rw-r--r--games/khangman/distinfo8
-rw-r--r--graphics/gwenview/Makefile5
-rw-r--r--graphics/gwenview/PLIST10
-rw-r--r--graphics/gwenview/distinfo8
-rw-r--r--graphics/kamera/Makefile3
-rw-r--r--graphics/kamera/distinfo8
-rw-r--r--graphics/kcolorchooser/Makefile3
-rw-r--r--graphics/kcolorchooser/distinfo8
-rw-r--r--graphics/kde-base-artwork/DESCR1
-rw-r--r--graphics/kde-base-artwork/Makefile13
-rw-r--r--graphics/kde-base-artwork/PLIST22
-rw-r--r--graphics/kde-base-artwork/distinfo5
-rw-r--r--graphics/kdegraphics-mobipocket/Makefile3
-rw-r--r--graphics/kdegraphics-mobipocket/distinfo8
-rw-r--r--graphics/kdegraphics-strigi-analyzer/Makefile3
-rw-r--r--graphics/kdegraphics-strigi-analyzer/distinfo8
-rw-r--r--graphics/kdegraphics-thumbnailers/Makefile3
-rw-r--r--graphics/kdegraphics-thumbnailers/distinfo8
-rw-r--r--graphics/kgamma/Makefile3
-rw-r--r--graphics/kgamma/distinfo8
-rw-r--r--graphics/kolourpaint/Makefile3
-rw-r--r--graphics/kolourpaint/PLIST4
-rw-r--r--graphics/kolourpaint/distinfo8
-rw-r--r--graphics/kruler/Makefile3
-rw-r--r--graphics/kruler/distinfo8
-rw-r--r--graphics/ksaneplugin/Makefile3
-rw-r--r--graphics/ksaneplugin/distinfo8
-rw-r--r--graphics/ksnapshot/Makefile4
-rw-r--r--graphics/ksnapshot/distinfo8
-rw-r--r--graphics/libkdcraw/Makefile3
-rw-r--r--graphics/libkdcraw/PLIST7
-rw-r--r--graphics/libkdcraw/distinfo9
-rw-r--r--graphics/libkdcraw/patches/patch-libraw_internal_wf_filtering.cpp14
-rw-r--r--graphics/libkexiv2/Makefile3
-rw-r--r--graphics/libkexiv2/PLIST6
-rw-r--r--graphics/libkexiv2/distinfo8
-rw-r--r--graphics/libkipi/Makefile3
-rw-r--r--graphics/libkipi/PLIST15
-rw-r--r--graphics/libkipi/distinfo8
-rw-r--r--graphics/libksane/Makefile3
-rw-r--r--graphics/libksane/distinfo8
-rw-r--r--graphics/oxygen-icons/Makefile6
-rw-r--r--graphics/oxygen-icons/PLIST113
-rw-r--r--graphics/oxygen-icons/distinfo8
-rw-r--r--graphics/svgpart/Makefile3
-rw-r--r--graphics/svgpart/distinfo8
-rw-r--r--math/analitza/Makefile3
-rw-r--r--math/analitza/PLIST34
-rw-r--r--math/analitza/distinfo8
-rw-r--r--math/cantor/Makefile3
-rw-r--r--math/cantor/PLIST6
-rw-r--r--math/cantor/distinfo8
-rw-r--r--math/kalgebra/Makefile3
-rw-r--r--math/kalgebra/PLIST48
-rw-r--r--math/kalgebra/distinfo8
-rw-r--r--math/kcalc/Makefile4
-rw-r--r--math/kcalc/distinfo11
-rw-r--r--math/kcalc/patches/patch-CMakeLists.txt16
-rw-r--r--math/kcalc/patches/patch-knumber_knumber_float.cpp15
-rw-r--r--math/kcalc/patches/patch-knumber_tests_CMakeLists.txt12
-rw-r--r--meta-pkgs/kde4/Makefile190
-rw-r--r--meta-pkgs/kde4/Makefile.kde413
-rw-r--r--misc/kaccessible/Makefile3
-rw-r--r--misc/kaccessible/distinfo8
-rw-r--r--misc/kalzium/Makefile3
-rw-r--r--misc/kalzium/PLIST9
-rw-r--r--misc/kalzium/distinfo8
-rw-r--r--misc/kbruch/Makefile3
-rw-r--r--misc/kbruch/distinfo8
-rw-r--r--misc/kcharselect/Makefile3
-rw-r--r--misc/kcharselect/PLIST3
-rw-r--r--misc/kcharselect/distinfo8
-rw-r--r--misc/kde-wallpapers4/Makefile3
-rw-r--r--misc/kde-wallpapers4/PLIST35
-rw-r--r--misc/kde-wallpapers4/distinfo8
-rw-r--r--misc/kdeadmin4/Makefile3
-rw-r--r--misc/kdeadmin4/PLIST16
-rw-r--r--misc/kdeadmin4/distinfo8
-rw-r--r--misc/kdeartwork4/Makefile3
-rw-r--r--misc/kdeartwork4/PLIST101
-rw-r--r--misc/kdeartwork4/distinfo8
-rw-r--r--misc/kdepim-runtime4/Makefile4
-rw-r--r--misc/kdepim-runtime4/PLIST10
-rw-r--r--misc/kdepim4/Makefile5
-rw-r--r--misc/kdepim4/PLIST78
-rw-r--r--misc/kdepimlibs4/Makefile7
-rw-r--r--misc/kdepimlibs4/PLIST126
-rw-r--r--misc/kdepimlibs4/distinfo12
-rw-r--r--misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp20
-rw-r--r--misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt8
-rw-r--r--misc/kdeplasma-addons4/Makefile5
-rw-r--r--misc/kdeplasma-addons4/PLIST97
-rw-r--r--misc/kdeplasma-addons4/distinfo8
-rw-r--r--misc/kgeography/Makefile3
-rw-r--r--misc/kgeography/distinfo8
-rw-r--r--misc/kig/Makefile3
-rw-r--r--misc/kig/distinfo8
-rw-r--r--misc/kiten/Makefile3
-rw-r--r--misc/kiten/PLIST6
-rw-r--r--misc/kiten/distinfo8
-rw-r--r--misc/klettres/Makefile3
-rw-r--r--misc/klettres/distinfo8
-rw-r--r--misc/kmag/Makefile3
-rw-r--r--misc/kmag/distinfo8
-rw-r--r--misc/kmousetool/Makefile3
-rw-r--r--misc/kmousetool/distinfo8
-rw-r--r--misc/kmouth/Makefile3
-rw-r--r--misc/kmouth/distinfo8
-rw-r--r--misc/kremotecontrol/Makefile3
-rw-r--r--misc/kremotecontrol/PLIST4
-rw-r--r--misc/kremotecontrol/distinfo8
-rw-r--r--misc/kstars/Makefile3
-rw-r--r--misc/kstars/PLIST30
-rw-r--r--misc/kstars/distinfo9
-rw-r--r--misc/kstars/patches/patch-kstars_skyobjects_ksmoon.cpp15
-rw-r--r--misc/ktouch/Makefile4
-rw-r--r--misc/ktouch/PLIST267
-rw-r--r--misc/ktouch/distinfo8
-rw-r--r--misc/kturtle/Makefile3
-rw-r--r--misc/kturtle/distinfo8
-rw-r--r--misc/kwordquiz/Makefile3
-rw-r--r--misc/kwordquiz/PLIST264
-rw-r--r--misc/kwordquiz/distinfo8
-rw-r--r--misc/libkdeedu/Makefile3
-rw-r--r--misc/libkdeedu/PLIST6
-rw-r--r--misc/libkdeedu/distinfo8
-rw-r--r--misc/marble/Makefile3
-rw-r--r--misc/marble/PLIST83
-rw-r--r--misc/marble/distinfo8
-rw-r--r--misc/nepomuk-core/DESCR7
-rw-r--r--misc/nepomuk-core/Makefile27
-rw-r--r--misc/nepomuk-core/PLIST165
-rw-r--r--misc/nepomuk-core/buildlink3.mk13
-rw-r--r--misc/nepomuk-core/distinfo5
-rw-r--r--misc/nepomuk-widgets/DESCR7
-rw-r--r--misc/nepomuk-widgets/Makefile14
-rw-r--r--misc/nepomuk-widgets/PLIST11
-rw-r--r--misc/nepomuk-widgets/buildlink3.mk13
-rw-r--r--misc/nepomuk-widgets/distinfo5
-rw-r--r--misc/parley/Makefile3
-rw-r--r--misc/parley/distinfo8
-rw-r--r--misc/rocs/patches/patch-RocsCore_LoadSave_Plugins_CMakeLists.txt32
-rw-r--r--misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h15
-rw-r--r--misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp22
-rw-r--r--misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h15
-rw-r--r--misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h15
-rw-r--r--misc/step/Makefile3
-rw-r--r--misc/step/distinfo8
-rw-r--r--misc/superkaramba/Makefile3
-rw-r--r--misc/superkaramba/PLIST4
-rw-r--r--misc/superkaramba/distinfo8
-rw-r--r--misc/sweeper/Makefile3
-rw-r--r--misc/sweeper/distinfo8
-rw-r--r--net/kdenetwork4/Makefile3
-rw-r--r--net/kdenetwork4/PLIST16
-rw-r--r--net/kdenetwork4/distinfo8
-rw-r--r--print/okular/Makefile4
-rw-r--r--print/okular/PLIST18
-rw-r--r--print/okular/distinfo8
-rw-r--r--print/printer-applet/DESCR4
-rw-r--r--print/printer-applet/Makefile23
-rw-r--r--print/printer-applet/PLIST15
-rw-r--r--print/printer-applet/distinfo5
-rw-r--r--security/kgpg/Makefile3
-rw-r--r--security/kgpg/distinfo8
-rw-r--r--security/ksecrets/DESCR1
-rw-r--r--security/ksecrets/Makefile17
-rw-r--r--security/ksecrets/PLIST28
-rw-r--r--security/ksecrets/distinfo5
-rw-r--r--security/kwallet/Makefile3
-rw-r--r--security/kwallet/distinfo8
-rw-r--r--sysutils/filelight/Makefile3
-rw-r--r--sysutils/filelight/distinfo8
-rw-r--r--sysutils/kdf/Makefile3
-rw-r--r--sysutils/kdf/distinfo8
-rw-r--r--sysutils/kfloppy/Makefile3
-rw-r--r--sysutils/kfloppy/distinfo8
-rw-r--r--time/ktimer/Makefile3
-rw-r--r--time/ktimer/distinfo8
-rw-r--r--www/kdewebdev4/Makefile3
-rw-r--r--www/kdewebdev4/distinfo8
-rw-r--r--x11/kactivities/Makefile4
-rw-r--r--x11/kactivities/PLIST49
-rw-r--r--x11/kactivities/distinfo8
-rw-r--r--x11/kde-baseapps4/Makefile6
-rw-r--r--x11/kde-baseapps4/PLIST20
-rw-r--r--x11/kde-baseapps4/distinfo8
-rw-r--r--x11/kde-runtime4/Makefile12
-rw-r--r--x11/kde-runtime4/PLIST188
-rw-r--r--x11/kde-runtime4/distinfo8
-rw-r--r--x11/kde-workspace4/Makefile9
-rw-r--r--x11/kde-workspace4/PLIST350
-rw-r--r--x11/kde-workspace4/distinfo14
-rw-r--r--x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c10
-rw-r--r--x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp22
-rw-r--r--x11/kde-workspace4/patches/patch-startkde.cmake14
-rw-r--r--x11/kdelibs4/Makefile8
-rw-r--r--x11/kdelibs4/PLIST130
-rw-r--r--x11/kdelibs4/distinfo13
-rw-r--r--x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake19
-rw-r--r--x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt16
-rw-r--r--x11/kdelibs4/patches/patch-kparts_componentfactory.h13
-rw-r--r--x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp15
-rw-r--r--x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp16
-rw-r--r--x11/konsole/Makefile3
-rw-r--r--x11/konsole/PLIST14
-rw-r--r--x11/konsole/distinfo10
-rw-r--r--x11/konsole/patches/patch-src_ProcessInfo.cpp20
-rw-r--r--x11/py-kde4/Makefile8
-rw-r--r--x11/py-kde4/PLIST9
-rw-r--r--x11/py-kde4/distinfo11
-rw-r--r--x11/py-kde4/patches/patch-CMakeLists.txt27
-rw-r--r--x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip84
233 files changed, 2948 insertions, 2101 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 20bc2c568ab..3f1edc7c7c9 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2013/02/16 11:20:00 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2013/04/03 10:52:13 markd Exp $
DISTNAME= ark-${_KDE_VERSION}
-PKGREVISION= 8
CATEGORIES= archivers
COMMENT= for managing various archive formats within the KDE environment
diff --git a/archivers/ark/PLIST b/archivers/ark/PLIST
index 7fe4c1a5037..5470285ea61 100644
--- a/archivers/ark/PLIST
+++ b/archivers/ark/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 00:55:51 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:13 markd Exp $
bin/ark
lib/kde4/arkpart.so
lib/kde4/kerfuffle_cli7z.so
@@ -12,7 +12,7 @@ lib/kde4/kerfuffle_libxz.so
lib/kde4/libextracthere.so
lib/libkerfuffle.so
lib/libkerfuffle.so.4
-lib/libkerfuffle.so.4.8.0
+lib/libkerfuffle.so.${PKGVERSION}
man/man1/ark.1
share/applications/kde4/ark.desktop
share/doc/kde/HTML/en/ark/ark-mainwindow.png
@@ -20,6 +20,13 @@ share/doc/kde/HTML/en/ark/common
share/doc/kde/HTML/en/ark/index.cache.bz2
share/doc/kde/HTML/en/ark/index.docbook
share/doc/kde/HTML/en/ark/man-ark.1.docbook
+share/icons/hicolor/128x128/apps/ark.png
+share/icons/hicolor/16x16/apps/ark.png
+share/icons/hicolor/22x22/apps/ark.png
+share/icons/hicolor/32x32/apps/ark.png
+share/icons/hicolor/48x48/apps/ark.png
+share/icons/hicolor/64x64/apps/ark.png
+share/icons/hicolor/scalable/apps/ark.svgz
share/kde/apps/ark/ark_part.rc
share/kde/apps/ark/arkui.rc
share/kde/config.kcfg/ark.kcfg
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index 6b4d73d08e5..0c2ed829ae1 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:28 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:13 markd Exp $
-SHA1 (ark-4.8.4.tar.xz) = 1d0d311beb8beeee7f33a58baef7f95192eb69ac
-RMD160 (ark-4.8.4.tar.xz) = 7ed1b39055ca426ab5ba0cc82a2f5b17629bbf34
-Size (ark-4.8.4.tar.xz) = 157280 bytes
+SHA1 (ark-4.10.2.tar.xz) = 3927eec73d2f1d1c9cd7b0d8888047df0bfb04ff
+RMD160 (ark-4.10.2.tar.xz) = 4fb40f33b3acab8ecf82990769c2de69b6eeb3c0
+Size (ark-4.10.2.tar.xz) = 238228 bytes
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 93c1804aa0f..2abc9d6fc84 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2013/03/16 07:21:20 obache Exp $
+# $NetBSD: Makefile,v 1.53 2013/04/03 10:52:22 markd Exp $
DISTNAME= kdesdk-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 13
CATEGORIES= devel
COMMENT= Support applications and tools used by KDE developers
@@ -19,46 +18,43 @@ CMAKE_ARGS+= -DBUILD_kmtrace:BOOL=OFF
CMAKE_ARGS+= -DBUILD_kstartperf:BOOL=OFF
REPLACE_BASH+= \
- scripts/create_makefile \
- scripts/create_svnignore \
- scripts/makeobj \
- scripts/package_crystalsvg \
- scripts/svnversions
+ kde-dev-scripts/create_makefile \
+ kde-dev-scripts/create_svnignore \
+ kde-dev-scripts/makeobj \
+ kde-dev-scripts/package_crystalsvg \
+ kde-dev-scripts/svnversions
REPLACE_PERL+= \
- cervisia/cervisia-change_repos_list.pl \
- cervisia/cervisia-normalize_cvsroot.pl \
- cervisia/change_colors.pl \
kcachegrind/converters/dprof2calltree \
kcachegrind/converters/memprof2calltree \
kcachegrind/converters/op2calltree \
- kioslave/perldoc/pod2html.pl \
- scripts/colorcvs \
- scripts/colorsvn \
- scripts/cvs-clean \
- scripts/cvsblame \
- scripts/cvscheck \
- scripts/cvslastchange \
- scripts/cxxmetric \
- scripts/extend_dmalloc \
- scripts/extractattr \
- scripts/extractqml \
- scripts/extractrc \
- scripts/fixheaders \
- scripts/fixkdeincludes \
- scripts/fixuifiles \
- scripts/generate_string_table.pl \
- scripts/includemocs \
- scripts/kde-spellcheck.pl \
- scripts/kdemangen.pl \
- scripts/kdesrc-build \
- scripts/krazy-licensecheck \
- scripts/noncvslist \
- scripts/png2mng.pl \
- scripts/rc2kcfgxt.pl \
- scripts/svn-clean \
- scripts/svnintegrate \
- scripts/svnlastchange \
+ kdesdk-kioslaves/perldoc/pod2html.pl \
+ kde-dev-scripts/colorcvs \
+ kde-dev-scripts/colorsvn \
+ kde-dev-scripts/cvs-clean \
+ kde-dev-scripts/cvsblame \
+ kde-dev-scripts/cvscheck \
+ kde-dev-scripts/cvslastchange \
+ kde-dev-scripts/cxxmetric \
+ kde-dev-scripts/extend_dmalloc \
+ kde-dev-scripts/extractattr \
+ kde-dev-scripts/extractqml \
+ kde-dev-scripts/extractrc \
+ kde-dev-scripts/fixheaders \
+ kde-dev-scripts/fixkdeincludes \
+ kde-dev-scripts/fixuifiles \
+ kde-dev-scripts/generate_string_table.pl \
+ kde-dev-scripts/includemocs \
+ kde-dev-scripts/kde-spellcheck.pl \
+ kde-dev-scripts/kdemangen.pl \
+ kde-dev-scripts/kdesrc-build \
+ kde-dev-scripts/krazy-licensecheck \
+ kde-dev-scripts/noncvslist \
+ kde-dev-scripts/png2mng.pl \
+ kde-dev-scripts/rc2kcfgxt.pl \
+ kde-dev-scripts/svn-clean \
+ kde-dev-scripts/svnintegrate \
+ kde-dev-scripts/svnlastchange \
umbrello/umbrello/headings/heading.pm
# REPLACE_PHP+= kcachegrind/converters/pprof2calltree
@@ -71,19 +67,19 @@ SUBST_SED.php= -e 's,/usr/bin/env php,${PREFIX}/bin/php,'
REPLACE_PYTHON+= \
kcachegrind/converters/hotshot2calltree \
lokalize/scripts/xliffmerge.py \
- scripts/kde-systemsettings-tree.py \
- scripts/kde_generate_export_header \
- scripts/kdelnk2desktop.py \
- scripts/rename_source_files \
- scripts/zonetab2pot.py \
+ kde-dev-scripts/kde-systemsettings-tree.py \
+ kde-dev-scripts/kde_generate_export_header \
+ kde-dev-scripts/kdelnk2desktop.py \
+ kde-dev-scripts/rename_source_files \
+ kde-dev-scripts/zonetab2pot.py \
umbrello/umbrello/headings/heading.py
REPLACE_RUBY+= \
umbrello/umbrello/headings/heading.rb
REPLACE_SH+= \
- scripts/build-progress.sh \
- scripts/cvsaddcurrentdir
+ kde-dev-scripts/build-progress.sh \
+ kde-dev-scripts/cvsaddcurrentdir
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
diff --git a/devel/kdesdk4/PLIST b/devel/kdesdk4/PLIST
index c17f7535114..c2e76c038eb 100644
--- a/devel/kdesdk4/PLIST
+++ b/devel/kdesdk4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/06/16 04:45:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/04/03 10:52:22 markd Exp $
bin/adddebug
bin/build-progress.sh
bin/cervisia
@@ -43,6 +43,7 @@ bin/kio_svn_helper
bin/kompare
bin/kpartloader
bin/krazy-licensecheck
+bin/kstartperf
bin/kuiviewer
bin/lokalize
bin/makeobj
@@ -58,6 +59,7 @@ bin/pprof2calltree
bin/pruneemptydirs
bin/qtdoc
bin/split2po
+bin/struct2osd.sh
bin/svn-clean
bin/svnbackport
bin/svnchangesince
@@ -72,108 +74,108 @@ bin/umbrello
bin/wcgrep
bin/xml2pot
bin/zonetab2pot.py
-include/KDE/Kasten1/AbstractConnectJob
-include/KDE/Kasten1/AbstractDocument
-include/KDE/Kasten1/AbstractDocumentFactory
-include/KDE/Kasten1/AbstractDocumentStrategy
-include/KDE/Kasten1/AbstractExportJob
-include/KDE/Kasten1/AbstractFileSystemConnectJob
-include/KDE/Kasten1/AbstractFileSystemExportJob
-include/KDE/Kasten1/AbstractFileSystemLoadJob
-include/KDE/Kasten1/AbstractFileSystemSyncFromRemoteJob
-include/KDE/Kasten1/AbstractFileSystemSyncToRemoteJob
-include/KDE/Kasten1/AbstractFileSystemSyncWithRemoteJob
-include/KDE/Kasten1/AbstractGroupedViews
-include/KDE/Kasten1/AbstractLinePopup
-include/KDE/Kasten1/AbstractLoadJob
-include/KDE/Kasten1/AbstractModel
-include/KDE/Kasten1/AbstractModelDataGenerator
-include/KDE/Kasten1/AbstractModelDataGeneratorConfigEditor
-include/KDE/Kasten1/AbstractModelDataGeneratorConfigEditorFactory
-include/KDE/Kasten1/AbstractModelExporter
-include/KDE/Kasten1/AbstractModelExporterConfigEditor
-include/KDE/Kasten1/AbstractModelExporterConfigEditorFactory
-include/KDE/Kasten1/AbstractModelFileSystemSynchronizer
-include/KDE/Kasten1/AbstractModelSelection
-include/KDE/Kasten1/AbstractModelStreamEncoder
-include/KDE/Kasten1/AbstractModelStreamEncoderConfigEditor
-include/KDE/Kasten1/AbstractModelStreamEncoderConfigEditorFactory
-include/KDE/Kasten1/AbstractModelSynchronizer
-include/KDE/Kasten1/AbstractModelSynchronizerFactory
-include/KDE/Kasten1/AbstractSelectionView
-include/KDE/Kasten1/AbstractSyncFromRemoteJob
-include/KDE/Kasten1/AbstractSyncToRemoteJob
-include/KDE/Kasten1/AbstractSyncWithRemoteJob
-include/KDE/Kasten1/AbstractTool
-include/KDE/Kasten1/AbstractToolFactory
-include/KDE/Kasten1/AbstractToolInlineView
-include/KDE/Kasten1/AbstractToolView
-include/KDE/Kasten1/AbstractToolViewFactory
-include/KDE/Kasten1/AbstractToolWidget
-include/KDE/Kasten1/AbstractView
-include/KDE/Kasten1/AbstractViewArea
-include/KDE/Kasten1/AbstractViewFactory
-include/KDE/Kasten1/AbstractXmlGuiController
-include/KDE/Kasten1/ClipboardController
-include/KDE/Kasten1/CloseController
-include/KDE/Kasten1/CopyAsController
-include/KDE/Kasten1/CreatorController
-include/KDE/Kasten1/DataSelectable
-include/KDE/Kasten1/DialogHandler
-include/KDE/Kasten1/DocumentCreateManager
-include/KDE/Kasten1/DocumentManager
-include/KDE/Kasten1/DocumentSyncManager
-include/KDE/Kasten1/DocumentVersionData
-include/KDE/Kasten1/DocumentsTool
-include/KDE/Kasten1/DocumentsToolView
-include/KDE/Kasten1/DummyView
-include/KDE/Kasten1/ExportController
-include/KDE/Kasten1/FileSystemBrowserTool
-include/KDE/Kasten1/FileSystemBrowserToolView
-include/KDE/Kasten1/FullScreenController
-include/KDE/Kasten1/JobManager
-include/KDE/Kasten1/LoaderController
-include/KDE/Kasten1/ModelCodecManager
-include/KDE/Kasten1/ModelCodecViewManager
-include/KDE/Kasten1/ModelDataGenerateThread
-include/KDE/Kasten1/ModelEncoderFileSystemExportJob
-include/KDE/Kasten1/ModelEncoderFileSystemExporter
-include/KDE/Kasten1/ModelEncoderFileSystemExporterConfigEditor
-include/KDE/Kasten1/ModelEncoderFileSystemExporterConfigEditorFactory
-include/KDE/Kasten1/ModelStreamEncodeThread
-include/KDE/Kasten1/ModifiedBarController
-include/KDE/Kasten1/MultiDocumentStrategy
-include/KDE/Kasten1/MultiViewAreas
-include/KDE/Kasten1/Person
-include/KDE/Kasten1/QuitController
-include/KDE/Kasten1/ReadOnlyBarController
-include/KDE/Kasten1/ReadOnlyController
-include/KDE/Kasten1/SelectController
-include/KDE/Kasten1/SelectedDataWriteable
-include/KDE/Kasten1/SetRemoteController
-include/KDE/Kasten1/ShellWindow
-include/KDE/Kasten1/SingleDocumentStrategy
-include/KDE/Kasten1/SingleViewArea
-include/KDE/Kasten1/SingleViewWindow
-include/KDE/Kasten1/StatusBar
-include/KDE/Kasten1/SwitchViewController
-include/KDE/Kasten1/SynchronizeController
-include/KDE/Kasten1/TabbedViews
-include/KDE/Kasten1/ToggleButton
-include/KDE/Kasten1/ToolInlineViewable
-include/KDE/Kasten1/ToolListMenuController
-include/KDE/Kasten1/UserListable
-include/KDE/Kasten1/VersionController
-include/KDE/Kasten1/VersionViewTool
-include/KDE/Kasten1/VersionViewToolView
-include/KDE/Kasten1/Versionable
-include/KDE/Kasten1/ViewAreaSplitable
-include/KDE/Kasten1/ViewListMenuController
-include/KDE/Kasten1/ViewManager
-include/KDE/Kasten1/WidgetsDockable
-include/KDE/Kasten1/ZoomBarController
-include/KDE/Kasten1/ZoomController
-include/KDE/Kasten1/Zoomable
+include/KDE/Kasten2/AbstractConnectJob
+include/KDE/Kasten2/AbstractDocument
+include/KDE/Kasten2/AbstractDocumentFactory
+include/KDE/Kasten2/AbstractDocumentStrategy
+include/KDE/Kasten2/AbstractExportJob
+include/KDE/Kasten2/AbstractFileSystemConnectJob
+include/KDE/Kasten2/AbstractFileSystemExportJob
+include/KDE/Kasten2/AbstractFileSystemLoadJob
+include/KDE/Kasten2/AbstractFileSystemSyncFromRemoteJob
+include/KDE/Kasten2/AbstractFileSystemSyncToRemoteJob
+include/KDE/Kasten2/AbstractFileSystemSyncWithRemoteJob
+include/KDE/Kasten2/AbstractGroupedViews
+include/KDE/Kasten2/AbstractLinePopup
+include/KDE/Kasten2/AbstractLoadJob
+include/KDE/Kasten2/AbstractModel
+include/KDE/Kasten2/AbstractModelDataGenerator
+include/KDE/Kasten2/AbstractModelDataGeneratorConfigEditor
+include/KDE/Kasten2/AbstractModelDataGeneratorConfigEditorFactory
+include/KDE/Kasten2/AbstractModelExporter
+include/KDE/Kasten2/AbstractModelExporterConfigEditor
+include/KDE/Kasten2/AbstractModelExporterConfigEditorFactory
+include/KDE/Kasten2/AbstractModelFileSystemSynchronizer
+include/KDE/Kasten2/AbstractModelSelection
+include/KDE/Kasten2/AbstractModelStreamEncoder
+include/KDE/Kasten2/AbstractModelStreamEncoderConfigEditor
+include/KDE/Kasten2/AbstractModelStreamEncoderConfigEditorFactory
+include/KDE/Kasten2/AbstractModelSynchronizer
+include/KDE/Kasten2/AbstractModelSynchronizerFactory
+include/KDE/Kasten2/AbstractSelectionView
+include/KDE/Kasten2/AbstractSyncFromRemoteJob
+include/KDE/Kasten2/AbstractSyncToRemoteJob
+include/KDE/Kasten2/AbstractSyncWithRemoteJob
+include/KDE/Kasten2/AbstractTool
+include/KDE/Kasten2/AbstractToolFactory
+include/KDE/Kasten2/AbstractToolInlineView
+include/KDE/Kasten2/AbstractToolView
+include/KDE/Kasten2/AbstractToolViewFactory
+include/KDE/Kasten2/AbstractToolWidget
+include/KDE/Kasten2/AbstractView
+include/KDE/Kasten2/AbstractViewArea
+include/KDE/Kasten2/AbstractViewFactory
+include/KDE/Kasten2/AbstractXmlGuiController
+include/KDE/Kasten2/ClipboardController
+include/KDE/Kasten2/CloseController
+include/KDE/Kasten2/CopyAsController
+include/KDE/Kasten2/CreatorController
+include/KDE/Kasten2/DataSelectable
+include/KDE/Kasten2/DialogHandler
+include/KDE/Kasten2/DocumentCreateManager
+include/KDE/Kasten2/DocumentManager
+include/KDE/Kasten2/DocumentSyncManager
+include/KDE/Kasten2/DocumentVersionData
+include/KDE/Kasten2/DocumentsTool
+include/KDE/Kasten2/DocumentsToolView
+include/KDE/Kasten2/DummyView
+include/KDE/Kasten2/ExportController
+include/KDE/Kasten2/FileSystemBrowserTool
+include/KDE/Kasten2/FileSystemBrowserToolView
+include/KDE/Kasten2/FullScreenController
+include/KDE/Kasten2/JobManager
+include/KDE/Kasten2/LoaderController
+include/KDE/Kasten2/ModelCodecManager
+include/KDE/Kasten2/ModelCodecViewManager
+include/KDE/Kasten2/ModelDataGenerateThread
+include/KDE/Kasten2/ModelEncoderFileSystemExportJob
+include/KDE/Kasten2/ModelEncoderFileSystemExporter
+include/KDE/Kasten2/ModelEncoderFileSystemExporterConfigEditor
+include/KDE/Kasten2/ModelEncoderFileSystemExporterConfigEditorFactory
+include/KDE/Kasten2/ModelStreamEncodeThread
+include/KDE/Kasten2/ModifiedBarController
+include/KDE/Kasten2/MultiDocumentStrategy
+include/KDE/Kasten2/MultiViewAreas
+include/KDE/Kasten2/Person
+include/KDE/Kasten2/QuitController
+include/KDE/Kasten2/ReadOnlyBarController
+include/KDE/Kasten2/ReadOnlyController
+include/KDE/Kasten2/SelectController
+include/KDE/Kasten2/SelectedDataWriteable
+include/KDE/Kasten2/SetRemoteController
+include/KDE/Kasten2/ShellWindow
+include/KDE/Kasten2/SingleDocumentStrategy
+include/KDE/Kasten2/SingleViewArea
+include/KDE/Kasten2/SingleViewWindow
+include/KDE/Kasten2/StatusBar
+include/KDE/Kasten2/SwitchViewController
+include/KDE/Kasten2/SynchronizeController
+include/KDE/Kasten2/TabbedViews
+include/KDE/Kasten2/ToggleButton
+include/KDE/Kasten2/ToolInlineViewable
+include/KDE/Kasten2/ToolListMenuController
+include/KDE/Kasten2/UserListable
+include/KDE/Kasten2/VersionController
+include/KDE/Kasten2/VersionViewTool
+include/KDE/Kasten2/VersionViewToolView
+include/KDE/Kasten2/Versionable
+include/KDE/Kasten2/ViewAreaSplitable
+include/KDE/Kasten2/ViewListMenuController
+include/KDE/Kasten2/ViewManager
+include/KDE/Kasten2/WidgetsDockable
+include/KDE/Kasten2/ZoomBarController
+include/KDE/Kasten2/ZoomController
+include/KDE/Kasten2/Zoomable
include/KDE/Okteta1/AbstractByteArrayColumnRenderer
include/KDE/Okteta1/AbstractByteArrayModel
include/KDE/Okteta1/AbstractByteArrayView
@@ -199,7 +201,6 @@ include/KDE/Okteta1/ChangesDescribable
include/KDE/Okteta1/CharByteArrayColumnRenderer
include/KDE/Okteta1/CharCodec
include/KDE/Okteta1/Character
-include/KDE/Okteta1/ColumnsView
include/KDE/Okteta1/Line
include/KDE/Okteta1/LinePosition
include/KDE/Okteta1/LinePositionRange
@@ -215,196 +216,202 @@ include/KDE/Okteta1/ValueCodec
include/KDE/Okteta1/Versionable
include/KDE/Okteta1/WidgetColumnStylist
include/KDE/Okteta1/WordByteArrayService
-include/kasten1/abstractconnectjob.h
-include/kasten1/abstractcontroller.h
-include/kasten1/abstractdocument.h
-include/kasten1/abstractdocumentfactory.h
-include/kasten1/abstractdocumentstrategy.h
-include/kasten1/abstractexportjob.h
-include/kasten1/abstractfilesystemconnectjob.h
-include/kasten1/abstractfilesystemexportjob.h
-include/kasten1/abstractfilesystemloadjob.h
-include/kasten1/abstractfilesystemsyncfromremotejob.h
-include/kasten1/abstractfilesystemsynctoremotejob.h
-include/kasten1/abstractfilesystemsyncwithremotejob.h
-include/kasten1/abstractgroupedviews.h
-include/kasten1/abstractlinepopup.h
-include/kasten1/abstractloadjob.h
-include/kasten1/abstractmodel.h
-include/kasten1/abstractmodeldatagenerator.h
-include/kasten1/abstractmodeldatageneratorconfigeditor.h
-include/kasten1/abstractmodeldatageneratorconfigeditorfactory.h
-include/kasten1/abstractmodelexporter.h
-include/kasten1/abstractmodelexporterconfigeditor.h
-include/kasten1/abstractmodelexporterconfigeditorfactory.h
-include/kasten1/abstractmodelfilesystemsynchronizer.h
-include/kasten1/abstractmodelselection.h
-include/kasten1/abstractmodelstreamencoder.h
-include/kasten1/abstractmodelstreamencoderconfigeditor.h
-include/kasten1/abstractmodelstreamencoderconfigeditorfactory.h
-include/kasten1/abstractmodelsynchronizer.h
-include/kasten1/abstractmodelsynchronizerfactory.h
-include/kasten1/abstractoverwritedialog.h
-include/kasten1/abstractsavediscarddialog.h
-include/kasten1/abstractselectionview.h
-include/kasten1/abstractsyncfromremotejob.h
-include/kasten1/abstractsynctoremotejob.h
-include/kasten1/abstractsyncwithremotejob.h
-include/kasten1/abstracttool.h
-include/kasten1/abstracttoolfactory.h
-include/kasten1/abstracttoolinlineview.h
-include/kasten1/abstracttoolview.h
-include/kasten1/abstracttoolviewfactory.h
-include/kasten1/abstracttoolwidget.h
-include/kasten1/abstractview.h
-include/kasten1/abstractviewarea.h
-include/kasten1/abstractviewfactory.h
-include/kasten1/abstractxmlguicontroller.h
-include/kasten1/clipboardcontroller.h
-include/kasten1/closecontroller.h
-include/kasten1/copyascontroller.h
-include/kasten1/creatorcontroller.h
-include/kasten1/dataselectable.h
-include/kasten1/dialoghandler.h
-include/kasten1/documentcreatemanager.h
-include/kasten1/documentmanager.h
-include/kasten1/documentstool.h
-include/kasten1/documentstoolview.h
-include/kasten1/documentsyncmanager.h
-include/kasten1/documentversiondata.h
-include/kasten1/documentversionid.h
-include/kasten1/dummyview.h
-include/kasten1/exportcontroller.h
-include/kasten1/filesystembrowsertool.h
-include/kasten1/filesystembrowsertoolview.h
-include/kasten1/fullscreencontroller.h
-include/kasten1/insertcontroller.h
-include/kasten1/jobmanager.h
-include/kasten1/kastencontrollers_export.h
-include/kasten1/kastencore.h
-include/kasten1/kastencore_export.h
-include/kasten1/kastengui.h
-include/kasten1/kastengui_export.h
-include/kasten1/loadercontroller.h
-include/kasten1/modelcodecmanager.h
-include/kasten1/modelcodecviewmanager.h
-include/kasten1/modeldatageneratethread.h
-include/kasten1/modelencoderfilesystemexporter.h
-include/kasten1/modelencoderfilesystemexporterconfigeditor.h
-include/kasten1/modelencoderfilesystemexporterconfigeditorfactory.h
-include/kasten1/modelencoderfilesystemexportjob.h
-include/kasten1/modelstreamencodethread.h
-include/kasten1/modifiedbarcontroller.h
-include/kasten1/multidocumentstrategy.h
-include/kasten1/multiviewareas.h
-include/kasten1/okteta1/abstractbytearraystreamencoder.h
-include/kasten1/okteta1/bookmarkscontroller.h
-include/kasten1/okteta1/bookmarkstool.h
-include/kasten1/okteta1/bookmarkstoolfactory.h
-include/kasten1/okteta1/bookmarkstoolview.h
-include/kasten1/okteta1/bookmarkstoolviewfactory.h
-include/kasten1/okteta1/bytearraycharsstreamencoder.h
-include/kasten1/okteta1/bytearraydocument.h
-include/kasten1/okteta1/bytearraydocumentfactory.h
-include/kasten1/okteta1/bytearrayrawfilesynchronizer.h
-include/kasten1/okteta1/bytearrayrawfilesynchronizerfactory.h
-include/kasten1/okteta1/bytearrayselection.h
-include/kasten1/okteta1/bytearraysourcecodestreamencoder.h
-include/kasten1/okteta1/bytearraysourcecodestreamencoderconfigeditor.h
-include/kasten1/okteta1/bytearraysourcecodestreamencoderconfigeditorfactory.h
-include/kasten1/okteta1/bytearraytextstreamencoderpreview.h
-include/kasten1/okteta1/bytearrayvaluesstreamencoder.h
-include/kasten1/okteta1/bytearrayvaluesstreamencoderconfigeditor.h
-include/kasten1/okteta1/bytearrayvaluesstreamencoderconfigeditorfactory.h
-include/kasten1/okteta1/bytearrayview.h
-include/kasten1/okteta1/bytearrayviewfactory.h
-include/kasten1/okteta1/bytearrayviewtextstreamencoder.h
-include/kasten1/okteta1/bytetabletool.h
-include/kasten1/okteta1/bytetabletoolfactory.h
-include/kasten1/okteta1/bytetabletoolview.h
-include/kasten1/okteta1/bytetabletoolviewfactory.h
-include/kasten1/okteta1/charsetconversiontoolfactory.h
-include/kasten1/okteta1/charsetconversiontoolviewfactory.h
-include/kasten1/okteta1/checksumtool.h
-include/kasten1/okteta1/checksumtoolfactory.h
-include/kasten1/okteta1/checksumtoolview.h
-include/kasten1/okteta1/checksumtoolviewfactory.h
-include/kasten1/okteta1/documentinfotool.h
-include/kasten1/okteta1/documentinfotoolview.h
-include/kasten1/okteta1/filtertool.h
-include/kasten1/okteta1/filtertoolfactory.h
-include/kasten1/okteta1/filtertoolview.h
-include/kasten1/okteta1/filtertoolviewfactory.h
-include/kasten1/okteta1/gotooffsetcontroller.h
-include/kasten1/okteta1/gotooffsettool.h
-include/kasten1/okteta1/gotooffsettoolview.h
-include/kasten1/okteta1/infotool.h
-include/kasten1/okteta1/infotoolfactory.h
-include/kasten1/okteta1/infotoolview.h
-include/kasten1/okteta1/infotoolviewfactory.h
-include/kasten1/okteta1/kfinddirection.h
-include/kasten1/okteta1/oktetakastencontrollers_export.h
-include/kasten1/okteta1/oktetakastencore_export.h
-include/kasten1/okteta1/oktetakastengui_export.h
-include/kasten1/okteta1/overwritemodecontroller.h
-include/kasten1/okteta1/overwriteonlycontroller.h
-include/kasten1/okteta1/poddecodertool.h
-include/kasten1/okteta1/poddecodertoolfactory.h
-include/kasten1/okteta1/poddecodertoolview.h
-include/kasten1/okteta1/poddecodertoolviewfactory.h
-include/kasten1/okteta1/printcontroller.h
-include/kasten1/okteta1/replacecontroller.h
-include/kasten1/okteta1/replaceuserqueryable.h
-include/kasten1/okteta1/searchcontroller.h
-include/kasten1/okteta1/searchuserqueryable.h
-include/kasten1/okteta1/selectrangecontroller.h
-include/kasten1/okteta1/stringsextracttool.h
-include/kasten1/okteta1/stringsextracttoolfactory.h
-include/kasten1/okteta1/stringsextracttoolview.h
-include/kasten1/okteta1/stringsextracttoolviewfactory.h
-include/kasten1/okteta1/structtool.h
-include/kasten1/okteta1/structtoolview.h
-include/kasten1/okteta1/structurestoolfactory.h
-include/kasten1/okteta1/structurestoolviewfactory.h
-include/kasten1/okteta1/viewconfigcontroller.h
-include/kasten1/okteta1/viewmodecontroller.h
-include/kasten1/okteta1/viewstatuscontroller.h
-include/kasten1/person.h
-include/kasten1/quitcontroller.h
-include/kasten1/readonlybarcontroller.h
-include/kasten1/readonlycontroller.h
-include/kasten1/selectcontroller.h
-include/kasten1/selecteddatawriteable.h
-include/kasten1/setremotecontroller.h
-include/kasten1/shellwindow.h
-include/kasten1/singledocumentstrategy.h
-include/kasten1/singleviewarea.h
-include/kasten1/singleviewwindow.h
-include/kasten1/statusbar.h
-include/kasten1/statusbarlayout.h
-include/kasten1/switchviewcontroller.h
-include/kasten1/synchronizecontroller.h
-include/kasten1/tabbedviews.h
-include/kasten1/togglebutton.h
-include/kasten1/toolinlineviewable.h
-include/kasten1/toolinlineviewwidget.h
-include/kasten1/toollistmenucontroller.h
-include/kasten1/toolviewdockwidget.h
-include/kasten1/userlistable.h
-include/kasten1/versionable.h
-include/kasten1/versioncontroller.h
-include/kasten1/versionviewtool.h
-include/kasten1/versionviewtoolview.h
-include/kasten1/viewareabox.h
-include/kasten1/viewareasplitable.h
-include/kasten1/viewareasplitcontroller.h
-include/kasten1/viewbox.h
-include/kasten1/viewlistmenucontroller.h
-include/kasten1/viewmanager.h
-include/kasten1/widgetsdockable.h
-include/kasten1/zoomable.h
-include/kasten1/zoombarcontroller.h
-include/kasten1/zoomcontroller.h
+include/kasten2/abstractconnectjob.h
+include/kasten2/abstractcontroller.h
+include/kasten2/abstractdocument.h
+include/kasten2/abstractdocumentfactory.h
+include/kasten2/abstractdocumentstrategy.h
+include/kasten2/abstractexportjob.h
+include/kasten2/abstractfilesystemconnectjob.h
+include/kasten2/abstractfilesystemexportjob.h
+include/kasten2/abstractfilesystemloadjob.h
+include/kasten2/abstractfilesystemsyncfromremotejob.h
+include/kasten2/abstractfilesystemsynctoremotejob.h
+include/kasten2/abstractfilesystemsyncwithremotejob.h
+include/kasten2/abstractgroupedviews.h
+include/kasten2/abstractlinepopup.h
+include/kasten2/abstractloadjob.h
+include/kasten2/abstractmodel.h
+include/kasten2/abstractmodeldatagenerator.h
+include/kasten2/abstractmodeldatageneratorconfigeditor.h
+include/kasten2/abstractmodeldatageneratorconfigeditorfactory.h
+include/kasten2/abstractmodelexporter.h
+include/kasten2/abstractmodelexporterconfigeditor.h
+include/kasten2/abstractmodelexporterconfigeditorfactory.h
+include/kasten2/abstractmodelfilesystemsynchronizer.h
+include/kasten2/abstractmodelselection.h
+include/kasten2/abstractmodelstreamencoder.h
+include/kasten2/abstractmodelstreamencoderconfigeditor.h
+include/kasten2/abstractmodelstreamencoderconfigeditorfactory.h
+include/kasten2/abstractmodelsynchronizer.h
+include/kasten2/abstractmodelsynchronizerfactory.h
+include/kasten2/abstractoverwritedialog.h
+include/kasten2/abstractsavediscarddialog.h
+include/kasten2/abstractselectionview.h
+include/kasten2/abstractsyncfromremotejob.h
+include/kasten2/abstractsynctoremotejob.h
+include/kasten2/abstractsyncwithremotejob.h
+include/kasten2/abstracttool.h
+include/kasten2/abstracttoolfactory.h
+include/kasten2/abstracttoolinlineview.h
+include/kasten2/abstracttoolview.h
+include/kasten2/abstracttoolviewfactory.h
+include/kasten2/abstracttoolwidget.h
+include/kasten2/abstractview.h
+include/kasten2/abstractviewarea.h
+include/kasten2/abstractviewfactory.h
+include/kasten2/abstractxmlguicontroller.h
+include/kasten2/clipboardcontroller.h
+include/kasten2/closecontroller.h
+include/kasten2/copyascontroller.h
+include/kasten2/creatorcontroller.h
+include/kasten2/dataselectable.h
+include/kasten2/dialoghandler.h
+include/kasten2/documentcreatemanager.h
+include/kasten2/documentmanager.h
+include/kasten2/documentstool.h
+include/kasten2/documentstoolview.h
+include/kasten2/documentsyncmanager.h
+include/kasten2/documentversiondata.h
+include/kasten2/documentversionid.h
+include/kasten2/dummyview.h
+include/kasten2/exportcontroller.h
+include/kasten2/filesystembrowsertool.h
+include/kasten2/filesystembrowsertoolview.h
+include/kasten2/fullscreencontroller.h
+include/kasten2/insertcontroller.h
+include/kasten2/jobmanager.h
+include/kasten2/kastencontrollers_export.h
+include/kasten2/kastencore.h
+include/kasten2/kastencore_export.h
+include/kasten2/kastengui.h
+include/kasten2/kastengui_export.h
+include/kasten2/loadercontroller.h
+include/kasten2/modelcodecmanager.h
+include/kasten2/modelcodecviewmanager.h
+include/kasten2/modeldatageneratethread.h
+include/kasten2/modelencoderfilesystemexporter.h
+include/kasten2/modelencoderfilesystemexporterconfigeditor.h
+include/kasten2/modelencoderfilesystemexporterconfigeditorfactory.h
+include/kasten2/modelencoderfilesystemexportjob.h
+include/kasten2/modelstreamencodethread.h
+include/kasten2/modifiedbarcontroller.h
+include/kasten2/multidocumentstrategy.h
+include/kasten2/multiviewareas.h
+include/kasten2/okteta1/abstractbytearraystreamencoder.h
+include/kasten2/okteta1/bookmarkscontroller.h
+include/kasten2/okteta1/bookmarkstool.h
+include/kasten2/okteta1/bookmarkstoolfactory.h
+include/kasten2/okteta1/bookmarkstoolview.h
+include/kasten2/okteta1/bookmarkstoolviewfactory.h
+include/kasten2/okteta1/bytearraycharsstreamencoder.h
+include/kasten2/okteta1/bytearraydocument.h
+include/kasten2/okteta1/bytearraydocumentfactory.h
+include/kasten2/okteta1/bytearrayrawfilesynchronizer.h
+include/kasten2/okteta1/bytearrayrawfilesynchronizerfactory.h
+include/kasten2/okteta1/bytearrayselection.h
+include/kasten2/okteta1/bytearraysourcecodestreamencoder.h
+include/kasten2/okteta1/bytearraysourcecodestreamencoderconfigeditor.h
+include/kasten2/okteta1/bytearraysourcecodestreamencoderconfigeditorfactory.h
+include/kasten2/okteta1/bytearraytextstreamencoderpreview.h
+include/kasten2/okteta1/bytearrayvaluesstreamencoder.h
+include/kasten2/okteta1/bytearrayvaluesstreamencoderconfigeditor.h
+include/kasten2/okteta1/bytearrayvaluesstreamencoderconfigeditorfactory.h
+include/kasten2/okteta1/bytearrayview.h
+include/kasten2/okteta1/bytearrayviewfactory.h
+include/kasten2/okteta1/bytearrayviewprofile.h
+include/kasten2/okteta1/bytearrayviewprofilelock.h
+include/kasten2/okteta1/bytearrayviewprofilemanager.h
+include/kasten2/okteta1/bytearrayviewprofilesynchronizer.h
+include/kasten2/okteta1/bytearrayviewtextstreamencoder.h
+include/kasten2/okteta1/bytetabletool.h
+include/kasten2/okteta1/bytetabletoolfactory.h
+include/kasten2/okteta1/bytetabletoolview.h
+include/kasten2/okteta1/bytetabletoolviewfactory.h
+include/kasten2/okteta1/charsetconversiontoolfactory.h
+include/kasten2/okteta1/charsetconversiontoolviewfactory.h
+include/kasten2/okteta1/checksumtool.h
+include/kasten2/okteta1/checksumtoolfactory.h
+include/kasten2/okteta1/checksumtoolview.h
+include/kasten2/okteta1/checksumtoolviewfactory.h
+include/kasten2/okteta1/documentinfotool.h
+include/kasten2/okteta1/documentinfotoolview.h
+include/kasten2/okteta1/filtertool.h
+include/kasten2/okteta1/filtertoolfactory.h
+include/kasten2/okteta1/filtertoolview.h
+include/kasten2/okteta1/filtertoolviewfactory.h
+include/kasten2/okteta1/gotooffsetcontroller.h
+include/kasten2/okteta1/gotooffsettool.h
+include/kasten2/okteta1/gotooffsettoolview.h
+include/kasten2/okteta1/infotool.h
+include/kasten2/okteta1/infotoolfactory.h
+include/kasten2/okteta1/infotoolview.h
+include/kasten2/okteta1/infotoolviewfactory.h
+include/kasten2/okteta1/kfinddirection.h
+include/kasten2/okteta1/oktetakastencontrollers_export.h
+include/kasten2/okteta1/oktetakastencore_export.h
+include/kasten2/okteta1/oktetakastengui_export.h
+include/kasten2/okteta1/overwritemodecontroller.h
+include/kasten2/okteta1/overwriteonlycontroller.h
+include/kasten2/okteta1/poddecodertool.h
+include/kasten2/okteta1/poddecodertoolfactory.h
+include/kasten2/okteta1/poddecodertoolview.h
+include/kasten2/okteta1/poddecodertoolviewfactory.h
+include/kasten2/okteta1/printcontroller.h
+include/kasten2/okteta1/replacecontroller.h
+include/kasten2/okteta1/replaceuserqueryable.h
+include/kasten2/okteta1/searchcontroller.h
+include/kasten2/okteta1/searchuserqueryable.h
+include/kasten2/okteta1/selectrangecontroller.h
+include/kasten2/okteta1/stringsextracttool.h
+include/kasten2/okteta1/stringsextracttoolfactory.h
+include/kasten2/okteta1/stringsextracttoolview.h
+include/kasten2/okteta1/stringsextracttoolviewfactory.h
+include/kasten2/okteta1/structtool.h
+include/kasten2/okteta1/structtoolview.h
+include/kasten2/okteta1/structurestoolfactory.h
+include/kasten2/okteta1/structurestoolviewfactory.h
+include/kasten2/okteta1/viewconfigcontroller.h
+include/kasten2/okteta1/viewmodecontroller.h
+include/kasten2/okteta1/viewprofilecontroller.h
+include/kasten2/okteta1/viewprofilesmanagecontroller.h
+include/kasten2/okteta1/viewstatuscontroller.h
+include/kasten2/person.h
+include/kasten2/quitcontroller.h
+include/kasten2/readonlybarcontroller.h
+include/kasten2/readonlycontroller.h
+include/kasten2/selectcontroller.h
+include/kasten2/selecteddatawriteable.h
+include/kasten2/setremotecontroller.h
+include/kasten2/shellwindow.h
+include/kasten2/singledocumentstrategy.h
+include/kasten2/singleviewarea.h
+include/kasten2/singleviewwindow.h
+include/kasten2/statusbar.h
+include/kasten2/statusbarlayout.h
+include/kasten2/switchviewcontroller.h
+include/kasten2/synchronizecontroller.h
+include/kasten2/tabbedviews.h
+include/kasten2/togglebutton.h
+include/kasten2/toolinlineviewable.h
+include/kasten2/toolinlineviewwidget.h
+include/kasten2/toollistmenucontroller.h
+include/kasten2/toolviewdockwidget.h
+include/kasten2/userlistable.h
+include/kasten2/versionable.h
+include/kasten2/versioncontroller.h
+include/kasten2/versionviewtool.h
+include/kasten2/versionviewtoolview.h
+include/kasten2/viewareabox.h
+include/kasten2/viewareasplitable.h
+include/kasten2/viewareasplitcontroller.h
+include/kasten2/viewbox.h
+include/kasten2/viewlistmenucontroller.h
+include/kasten2/viewmanager.h
+include/kasten2/widgetsdockable.h
+include/kasten2/zoomable.h
+include/kasten2/zoombarcontroller.h
+include/kasten2/zoomcontroller.h
include/kompare/kompareinterface.h
include/kprofilemethod.h
include/okteta1/abstractbytearraycolumnrenderer.h
@@ -459,52 +466,52 @@ lib/kde4/fileviewbazaarplugin.so
lib/kde4/fileviewgitplugin.so
lib/kde4/fileviewhgplugin.so
lib/kde4/fileviewsvnplugin.so
-lib/kde4/kabcformat_kdeaccounts.so
lib/kde4/kded_ksvnd.so
lib/kde4/kio_perldoc.so
lib/kde4/kio_svn.so
lib/kde4/komparenavtreepart.so
lib/kde4/komparepart.so
+lib/kde4/kstartperf.so
lib/kde4/kuiviewerpart.so
lib/kde4/libkbytearrayedit.so
lib/kde4/oktetapart.so
lib/kde4/plugins/designer/oktetadesignerplugin.so
lib/kde4/quithumbnail.so
-lib/libkasten1controllers.so
-lib/libkasten1controllers.so.0.2.0
-lib/libkasten1controllers.so.1
-lib/libkasten1core.so
-lib/libkasten1core.so.0.2.0
-lib/libkasten1core.so.1
-lib/libkasten1gui.so
-lib/libkasten1gui.so.0.2.0
-lib/libkasten1gui.so.1
-lib/libkasten1okteta1controllers.so
-lib/libkasten1okteta1controllers.so.0.2.0
-lib/libkasten1okteta1controllers.so.1
-lib/libkasten1okteta1core.so
-lib/libkasten1okteta1core.so.0.2.0
-lib/libkasten1okteta1core.so.1
-lib/libkasten1okteta1gui.so
-lib/libkasten1okteta1gui.so.0.2.0
-lib/libkasten1okteta1gui.so.1
+lib/libkasten2controllers.so
+lib/libkasten2controllers.so.0.2.0
+lib/libkasten2controllers.so.2
+lib/libkasten2core.so
+lib/libkasten2core.so.0.2.0
+lib/libkasten2core.so.2
+lib/libkasten2gui.so
+lib/libkasten2gui.so.0.2.0
+lib/libkasten2gui.so.2
+lib/libkasten2okteta1controllers.so
+lib/libkasten2okteta1controllers.so.0.2.1
+lib/libkasten2okteta1controllers.so.1
+lib/libkasten2okteta1core.so
+lib/libkasten2okteta1core.so.0.2.1
+lib/libkasten2okteta1core.so.1
+lib/libkasten2okteta1gui.so
+lib/libkasten2okteta1gui.so.0.2.1
+lib/libkasten2okteta1gui.so.1
lib/libkdeinit4_cervisia.so
lib/libkdeinit4_cvsaskpass.so
lib/libkdeinit4_cvsservice.so
lib/libkomparedialogpages.so
lib/libkomparedialogpages.so.4
-lib/libkomparedialogpages.so.4.8.0
+lib/libkomparedialogpages.so.${PKGVERSION}
lib/libkomparediff2.so
lib/libkomparediff2.so.4
-lib/libkomparediff2.so.4.8.0
+lib/libkomparediff2.so.${PKGVERSION}
lib/libkompareinterface.so
lib/libkompareinterface.so.4
-lib/libkompareinterface.so.4.8.0
+lib/libkompareinterface.so.${PKGVERSION}
lib/libokteta1core.so
-lib/libokteta1core.so.0.8.0
+lib/libokteta1core.so.0.8.1
lib/libokteta1core.so.1
lib/libokteta1gui.so
-lib/libokteta1gui.so.0.8.0
+lib/libokteta1gui.so.0.8.1
lib/libokteta1gui.so.1
lib/strigi/strigila_diff.so
lib/strigi/strigila_po.so
@@ -845,7 +852,6 @@ share/icons/locolor/32x32/actions/transsearch.png
share/kde/apps/cervisia/cervisia.notifyrc
share/kde/apps/cervisia/cervisiashellui.rc
share/kde/apps/cervisiapart/cervisiaui.rc
-share/kde/apps/kabc/formats/kdeaccountsplugin.desktop
share/kde/apps/kcachegrind/icons/hicolor/16x16/actions/move.png
share/kde/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
share/kde/apps/kcachegrind/icons/hicolor/22x22/actions/hidetemplates.png
@@ -854,10 +860,6 @@ share/kde/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
share/kde/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
share/kde/apps/kcachegrind/kcachegrindui.rc
share/kde/apps/kcachegrind/tips
-share/kde/apps/kconf_update/cervisia-change_repos_list.pl
-share/kde/apps/kconf_update/cervisia-normalize_cvsroot.pl
-share/kde/apps/kconf_update/cervisia.upd
-share/kde/apps/kconf_update/change_colors.pl
share/kde/apps/kdevappwizard/template_previews/akonadi-resources.png
share/kde/apps/kdevappwizard/template_previews/akonadi-serializer.png
share/kde/apps/kdevappwizard/template_previews/default.png
@@ -895,6 +897,7 @@ share/kde/apps/kpartloader/kpartloaderui.rc
share/kde/apps/kuiviewer/kuiviewerui.rc
share/kde/apps/kuiviewerpart/kuiviewer_part.rc
share/kde/apps/lokalize/editorui.rc
+share/kde/apps/lokalize/filesearchtabui.rc
share/kde/apps/lokalize/lokalize.notifyrc
share/kde/apps/lokalize/lokalizemainwindowui.rc
share/kde/apps/lokalize/projectmanagerui.rc
@@ -912,6 +915,7 @@ share/kde/apps/lokalize/translationmemoryrui.rc
share/kde/apps/okteta/oktetaui.rc
share/kde/apps/okteta/structures/elf/elf.desktop
share/kde/apps/okteta/structures/elf/elf.osd
+share/kde/apps/okteta/structures/gccxml-to-osd.xsl
share/kde/apps/okteta/structures/png/png.desktop
share/kde/apps/okteta/structures/png/png.osd
share/kde/apps/oktetapart/oktetapartbrowserui.rc
@@ -952,6 +956,12 @@ share/kde/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_entityrelat
share/kde/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_sequence.png
share/kde/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_state.png
share/kde/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_usecase.png
+share/kde/apps/umbrello/layouts/activity-export.desktop
+share/kde/apps/umbrello/layouts/class-export.desktop
+share/kde/apps/umbrello/layouts/class-horizontal.desktop
+share/kde/apps/umbrello/layouts/class-vertical.desktop
+share/kde/apps/umbrello/layouts/state-export.desktop
+share/kde/apps/umbrello/layouts/usecase-default.desktop
share/kde/apps/umbrello/pics/CVglobal_meth.png
share/kde/apps/umbrello/pics/CVglobal_var.png
share/kde/apps/umbrello/pics/CVimplementation_meth.png
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 3b893a25653..38d49adfd4f 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2012/06/16 04:45:28 markd Exp $
+$NetBSD: distinfo,v 1.17 2013/04/03 10:52:22 markd Exp $
-SHA1 (kdesdk-4.8.4.tar.xz) = 62c176ee3dda5bbc013db7d1033ff89c105e3fd1
-RMD160 (kdesdk-4.8.4.tar.xz) = cc28eaba87edb107b6b78f53b397ac90388bec71
-Size (kdesdk-4.8.4.tar.xz) = 5361480 bytes
-SHA1 (patch-aa) = ab73e4306efb33344012f95c059ea0ed0adfafd1
-SHA1 (patch-ab) = af132807eaca326ad0c5fe87ffced9e8b813f3f9
+SHA1 (kdesdk-4.10.2.tar.xz) = 0cedb222c469f7e465486ac744806e52f762b413
+RMD160 (kdesdk-4.10.2.tar.xz) = 56c5dee25b613b4e83f8b88dfc12879f3c862fa5
+Size (kdesdk-4.10.2.tar.xz) = 5205748 bytes
+SHA1 (patch-aa) = 8af774481e5d684ad822540ef53b628b27c4bc70
+SHA1 (patch-ab) = d9603b23586014d6c5400c5eb048e2063780c063
diff --git a/devel/kdesdk4/patches/patch-aa b/devel/kdesdk4/patches/patch-aa
index 56e93cbb1de..c3acb065a22 100644
--- a/devel/kdesdk4/patches/patch-aa
+++ b/devel/kdesdk4/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/10/02 20:30:38 markd Exp $
+$NetBSD: patch-aa,v 1.2 2013/04/03 10:52:22 markd Exp $
---- scripts/cvsaddcurrentdir.orig 2006-10-18 21:16:48.000000000 +1300
-+++ scripts/cvsaddcurrentdir
+--- kde-dev-scripts/cvsaddcurrentdir.orig 2006-10-18 21:16:48.000000000 +1300
++++ kde-dev-scripts/cvsaddcurrentdir
@@ -17,7 +17,7 @@ ask_for_adding() {
echo
read -p "Add file $file to cvs ? (y/n) " answer rest
diff --git a/devel/kdesdk4/patches/patch-ab b/devel/kdesdk4/patches/patch-ab
index c0a7f439358..514078ca7f3 100644
--- a/devel/kdesdk4/patches/patch-ab
+++ b/devel/kdesdk4/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/10/02 20:30:38 markd Exp $
+$NetBSD: patch-ab,v 1.2 2013/04/03 10:52:22 markd Exp $
---- scripts/wcgrep.orig 2008-01-29 22:18:04.000000000 +1300
-+++ scripts/wcgrep
+--- kde-dev-scripts/wcgrep.orig 2008-01-29 22:18:04.000000000 +1300
++++ kde-dev-scripts/wcgrep
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 3db0913c69c..0920fec94ba 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -1,18 +1,25 @@
-# $NetBSD: Makefile,v 1.11 2013/02/16 11:20:56 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/03 10:52:23 markd Exp $
DISTNAME= kate-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= editors
COMMENT= KDE advanced text editor
+PY_PATCHPLIST= YES
+
.include "../../meta-pkgs/kde4/Makefile.kde4"
CHECK_PORTABILITY_SKIP+= part/tests/hl/highlight.sh
.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../devel/qjson/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../x11/py-kde4/buildlink3.mk"
+.include "../../x11/py-sip/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/kate/PLIST b/editors/kate/PLIST
index d7a408abb14..3fde2f689a5 100644
--- a/editors/kate/PLIST
+++ b/editors/kate/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/03 10:52:23 markd Exp $
bin/kate
-bin/ktesnippets_editor
bin/kwrite
-include/artisticcomment.h
include/kate/application.h
include/kate/documentmanager.h
include/kate/mainwindow.h
@@ -10,9 +8,6 @@ include/kate/plugin.h
include/kate/pluginconfigpageinterface.h
include/kate/pluginmanager.h
include/kate_export.h
-include/ktexteditor_codesnippets_core/completionmodel.h
-include/ktexteditor_codesnippets_core/ktexteditor_codesnippets_core_export.h
-include/ktexteditor_codesnippets_core/repository.h
lib/kde4/kate_kttsd.so
lib/kde4/katebacktracebrowserplugin.so
lib/kde4/katebuildplugin.so
@@ -25,9 +20,9 @@ lib/kde4/katekonsoleplugin.so
lib/kde4/katemailfilesplugin.so
lib/kde4/kateopenheaderplugin.so
lib/kde4/katepart.so
-lib/kde4/katequickdocumentswitcherplugin.so
+lib/kde4/kateprojectplugin.so
lib/kde4/katesearchplugin.so
-lib/kde4/katesnippets_tngplugin.so
+lib/kde4/katesnippetsplugin.so
lib/kde4/katesqlplugin.so
lib/kde4/katesymbolviewerplugin.so
lib/kde4/katetabbarextensionplugin.so
@@ -35,31 +30,25 @@ lib/kde4/katetabifyplugin.so
lib/kde4/katetextfilterplugin.so
lib/kde4/katexmlcheckplugin.so
lib/kde4/katexmltoolsplugin.so
-lib/kde4/ktexteditor_acomment.so
lib/kde4/ktexteditor_autobrace.so
lib/kde4/ktexteditor_exporter.so
lib/kde4/ktexteditor_hlselection.so
lib/kde4/ktexteditor_iconinserter.so
-lib/kde4/ktexteditor_insanehtml_le.so
lib/kde4/ktexteditor_insertfile.so
-lib/kde4/ktexteditor_kdatatool.so
-lib/kde4/ktexteditor_python-encoding.so
+lib/kde4/pateplugin.so
lib/kde4/plasma_applet_katesession.so
-lib/libacomment.a
lib/libkateinterfaces.so
lib/libkateinterfaces.so.4
-lib/libkateinterfaces.so.4.8.0
+lib/libkateinterfaces.so.${PKGVERSION}
lib/libkatepartinterfaces.so
lib/libkatepartinterfaces.so.4
-lib/libkatepartinterfaces.so.4.8.0
+lib/libkatepartinterfaces.so.${PKGVERSION}
lib/libkdeinit4_kate.so
lib/libkdeinit4_kwrite.so
-lib/libktexteditor_codesnippets_core.so
-lib/libktexteditor_codesnippets_core.so.0
-lib/libktexteditor_codesnippets_core.so.0.0.1
+${PYSITELIB}/PyKate4/__init__.py
+${PYSITELIB}/PyKate4/kate.so
man/man1/kate.1
share/applications/kde4/kate.desktop
-share/applications/kde4/ktesnippets_editor.desktop
share/applications/kde4/kwrite.desktop
share/doc/kde/HTML/en/kate/advanced.docbook
share/doc/kde/HTML/en/kate/comma-to.png
@@ -82,11 +71,13 @@ share/doc/kde/HTML/en/kate/line-modification-system.png
share/doc/kde/HTML/en/kate/man-kate.1.docbook
share/doc/kde/HTML/en/kate/mdi.docbook
share/doc/kde/HTML/en/kate/menus.docbook
+share/doc/kde/HTML/en/kate/minimap.png
share/doc/kde/HTML/en/kate/part.docbook
+share/doc/kde/HTML/en/kate/plugins-part.docbook
share/doc/kde/HTML/en/kate/plugins.docbook
share/doc/kde/HTML/en/kate/regular-expressions.docbook
-share/doc/kde/HTML/en/kate/snippets-config.png
share/doc/kde/HTML/en/kate/snippets-form.png
+share/doc/kde/HTML/en/kate/snippets-panel.png
share/doc/kde/HTML/en/kate/snippets-usage.png
share/doc/kde/HTML/en/kate/unhighlighted.png
share/doc/kde/HTML/en/kate/vi.docbook
@@ -105,17 +96,38 @@ share/icons/hicolor/64x64/apps/kate.png
share/icons/hicolor/scalable/apps/kate.svgz
share/icons/hicolor/scalable/apps/ktexteditorautobrace.svgz
share/icons/oxygen/16x16/actions/debug.png
-share/icons/oxygen/16x16/actions/repoadd.png
-share/icons/oxygen/16x16/actions/repomanage.png
-share/icons/oxygen/16x16/actions/snippetadd.png
-share/icons/oxygen/16x16/actions/snippetedit.png
-share/kde/apps/kate/icons/oxygen/16x16/actions/null.png
-share/kde/apps/kate/icons/oxygen/16x16/actions/sql-field-pk.png
-share/kde/apps/kate/icons/oxygen/16x16/actions/sql-field-red.png
-share/kde/apps/kate/icons/oxygen/16x16/actions/sql-field.png
-share/kde/apps/kate/icons/oxygen/16x16/actions/sql-table.png
-share/kde/apps/kate/icons/oxygen/16x16/actions/sql-view.png
+share/kde/apps/kate/icons/hicolor/16x16/actions/null.png
+share/kde/apps/kate/icons/hicolor/16x16/actions/sql-field-pk.png
+share/kde/apps/kate/icons/hicolor/16x16/actions/sql-field-red.png
+share/kde/apps/kate/icons/hicolor/16x16/actions/sql-field.png
+share/kde/apps/kate/icons/hicolor/16x16/actions/sql-table.png
+share/kde/apps/kate/icons/hicolor/16x16/actions/sql-view.png
share/kde/apps/kate/kateui.rc
+share/kde/apps/kate/pate/block.py
+share/kde/apps/kate/pate/close_tag.py
+share/kde/apps/kate/pate/commentar.py
+share/kde/apps/kate/pate/console/config.ui
+share/kde/apps/kate/pate/console/console.py
+share/kde/apps/kate/pate/expand.py
+share/kde/apps/kate/pate/expand/all.expand
+share/kde/apps/kate/pate/expand/text_css.expand
+share/kde/apps/kate/pate/expand/text_html.expand
+share/kde/apps/kate/pate/expand/text_x-c++hdr.expand
+share/kde/apps/kate/pate/expand/text_x-c++src.expand
+share/kde/apps/kate/pate/expand/text_x-chdr.expand
+share/kde/apps/kate/pate/expand/text_x-python.expand
+share/kde/apps/kate/pate/format.py
+share/kde/apps/kate/pate/gid/config.ui
+share/kde/apps/kate/pate/gid/gid.py
+share/kde/apps/kate/pate/gid/idutils.py
+share/kde/apps/kate/pate/gid/tool.ui
+share/kde/apps/kate/pate/libkatepate/__init__.py
+share/kde/apps/kate/pate/libkatepate/common.py
+share/kde/apps/kate/pate/libkatepate/decorators.py
+share/kde/apps/kate/pate/libkatepate/pred.py
+share/kde/apps/kate/pate/libkatepate/selection.py
+share/kde/apps/kate/pate/libkatepate/ui.py
+share/kde/apps/kate/pate/tools.py
share/kde/apps/kate/plugins/filetree/ui.rc
share/kde/apps/kate/plugins/kate_kttsd/ui.rc
share/kde/apps/kate/plugins/katebuild/ui.rc
@@ -132,9 +144,7 @@ share/kde/apps/kate/plugins/kategdb/ui.rc
share/kde/apps/kate/plugins/katekonsole/ui.rc
share/kde/apps/kate/plugins/katemailfiles/ui.rc
share/kde/apps/kate/plugins/kateopenheader/ui.rc
-share/kde/apps/kate/plugins/katequickdocumentswitcher/ui.rc
share/kde/apps/kate/plugins/katesearch/ui.rc
-share/kde/apps/kate/plugins/katesnippets_tng/ui.rc
share/kde/apps/kate/plugins/katesql/ui.rc
share/kde/apps/kate/plugins/katesymbolviewer/ui.rc
share/kde/apps/kate/plugins/katetabbarextension/ui.rc
@@ -142,25 +152,39 @@ share/kde/apps/kate/plugins/katetabify/ui.rc
share/kde/apps/kate/plugins/katetextfilter/ui.rc
share/kde/apps/kate/plugins/katexmlcheck/ui.rc
share/kde/apps/kate/plugins/katexmltools/ui.rc
+share/kde/apps/kate/plugins/pate/kate/__init__.py
+share/kde/apps/kate/plugins/pate/kate/gui.py
+share/kde/apps/kate/plugins/project/ui.rc
share/kde/apps/kate/tips
-share/kde/apps/katepart/api/05_cursor.js
-share/kde/apps/katepart/api/10_range.js
share/kde/apps/katepart/katepartsimpleui.rc
share/kde/apps/katepart/katepartui.rc
-share/kde/apps/katepart/script/cstyle.js
-share/kde/apps/katepart/script/haskell.js
-share/kde/apps/katepart/script/lilypond.js
-share/kde/apps/katepart/script/lisp.js
-share/kde/apps/katepart/script/lua.js
-share/kde/apps/katepart/script/python.js
-share/kde/apps/katepart/script/ruby.js
-share/kde/apps/katepart/script/utils.js
-share/kde/apps/katepart/script/xml.js
+share/kde/apps/katepart/script/commands/emmet.js
+share/kde/apps/katepart/script/commands/jumpMatchingIndent.js
+share/kde/apps/katepart/script/commands/quickcoding.js
+share/kde/apps/katepart/script/commands/utils.js
+share/kde/apps/katepart/script/files/quickcoding/cpp/a.template
+share/kde/apps/katepart/script/files/quickcoding/cpp/c.template
+share/kde/apps/katepart/script/indentation/cppstyle.js
+share/kde/apps/katepart/script/indentation/cstyle.js
+share/kde/apps/katepart/script/indentation/haskell.js
+share/kde/apps/katepart/script/indentation/lilypond.js
+share/kde/apps/katepart/script/indentation/lisp.js
+share/kde/apps/katepart/script/indentation/lua.js
+share/kde/apps/katepart/script/indentation/python.js
+share/kde/apps/katepart/script/indentation/ruby.js
+share/kde/apps/katepart/script/indentation/xml.js
+share/kde/apps/katepart/script/libraries/cursor.js
+share/kde/apps/katepart/script/libraries/emmet/editor_interface.js
+share/kde/apps/katepart/script/libraries/emmet/lib.js
+share/kde/apps/katepart/script/libraries/range.js
+share/kde/apps/katepart/script/libraries/string.js
+share/kde/apps/katepart/script/libraries/underscore.js
share/kde/apps/katepart/syntax/abap.xml
share/kde/apps/katepart/syntax/abc.xml
share/kde/apps/katepart/syntax/actionscript.xml
share/kde/apps/katepart/syntax/ada.xml
share/kde/apps/katepart/syntax/ahdl.xml
+share/kde/apps/katepart/syntax/ahk.xml
share/kde/apps/katepart/syntax/alert.xml
share/kde/apps/katepart/syntax/alert_indent.xml
share/kde/apps/katepart/syntax/ample.xml
@@ -181,9 +205,11 @@ share/kde/apps/katepart/syntax/bibtex.xml
share/kde/apps/katepart/syntax/bmethod.xml
share/kde/apps/katepart/syntax/boo.xml
share/kde/apps/katepart/syntax/c.xml
+share/kde/apps/katepart/syntax/ccss.xml
share/kde/apps/katepart/syntax/cg.xml
share/kde/apps/katepart/syntax/cgis.xml
share/kde/apps/katepart/syntax/changelog.xml
+share/kde/apps/katepart/syntax/chicken.xml
share/kde/apps/katepart/syntax/cisco.xml
share/kde/apps/katepart/syntax/clipper.xml
share/kde/apps/katepart/syntax/clojure.xml
@@ -193,10 +219,12 @@ share/kde/apps/katepart/syntax/coldfusion.xml
share/kde/apps/katepart/syntax/commonlisp.xml
share/kde/apps/katepart/syntax/component-pascal.xml
share/kde/apps/katepart/syntax/cpp.xml
+share/kde/apps/katepart/syntax/cpp11.xml
share/kde/apps/katepart/syntax/crk.xml
share/kde/apps/katepart/syntax/cs.xml
share/kde/apps/katepart/syntax/css-php.xml
share/kde/apps/katepart/syntax/css.xml
+share/kde/apps/katepart/syntax/cubescript.xml
share/kde/apps/katepart/syntax/cue.xml
share/kde/apps/katepart/syntax/d.xml
share/kde/apps/katepart/syntax/debianchangelog.xml
@@ -205,6 +233,7 @@ share/kde/apps/katepart/syntax/desktop.xml
share/kde/apps/katepart/syntax/diff.xml
share/kde/apps/katepart/syntax/djangotemplate.xml
share/kde/apps/katepart/syntax/dosbat.xml
+share/kde/apps/katepart/syntax/dot.xml
share/kde/apps/katepart/syntax/doxygen.xml
share/kde/apps/katepart/syntax/doxygenlua.xml
share/kde/apps/katepart/syntax/dtd.xml
@@ -213,6 +242,7 @@ share/kde/apps/katepart/syntax/eiffel.xml
share/kde/apps/katepart/syntax/email.xml
share/kde/apps/katepart/syntax/erlang.xml
share/kde/apps/katepart/syntax/euphoria.xml
+share/kde/apps/katepart/syntax/fasm.xml
share/kde/apps/katepart/syntax/ferite.xml
share/kde/apps/katepart/syntax/fgl-4gl.xml
share/kde/apps/katepart/syntax/fgl-per.xml
@@ -221,6 +251,7 @@ share/kde/apps/katepart/syntax/freebasic.xml
share/kde/apps/katepart/syntax/fsharp.xml
share/kde/apps/katepart/syntax/fstab.xml
share/kde/apps/katepart/syntax/gap.xml
+share/kde/apps/katepart/syntax/gcc.xml
share/kde/apps/katepart/syntax/gdb.xml
share/kde/apps/katepart/syntax/gdl.xml
share/kde/apps/katepart/syntax/gettext.xml
@@ -229,6 +260,7 @@ share/kde/apps/katepart/syntax/glsl.xml
share/kde/apps/katepart/syntax/gnuassembler.xml
share/kde/apps/katepart/syntax/go.xml
share/kde/apps/katepart/syntax/grammar.xml
+share/kde/apps/katepart/syntax/haml.xml
share/kde/apps/katepart/syntax/haskell.xml
share/kde/apps/katepart/syntax/haxe.xml
share/kde/apps/katepart/syntax/html-php.xml
@@ -245,12 +277,14 @@ share/kde/apps/katepart/syntax/javascript-php.xml
share/kde/apps/katepart/syntax/javascript.xml
share/kde/apps/katepart/syntax/json.xml
share/kde/apps/katepart/syntax/jsp.xml
+share/kde/apps/katepart/syntax/julia.xml
share/kde/apps/katepart/syntax/katetemplate.xml
share/kde/apps/katepart/syntax/kbasic.xml
share/kde/apps/katepart/syntax/language.dtd
share/kde/apps/katepart/syntax/latex.xml
share/kde/apps/katepart/syntax/ld.xml
share/kde/apps/katepart/syntax/ldif.xml
+share/kde/apps/katepart/syntax/less.xml
share/kde/apps/katepart/syntax/lex.xml
share/kde/apps/katepart/syntax/lilypond.xml
share/kde/apps/katepart/syntax/literate-haskell.xml
@@ -262,7 +296,9 @@ share/kde/apps/katepart/syntax/m3u.xml
share/kde/apps/katepart/syntax/m4.xml
share/kde/apps/katepart/syntax/mab.xml
share/kde/apps/katepart/syntax/makefile.xml
+share/kde/apps/katepart/syntax/mako.xml
share/kde/apps/katepart/syntax/mandoc.xml
+share/kde/apps/katepart/syntax/markdown.xml
share/kde/apps/katepart/syntax/mason.xml
share/kde/apps/katepart/syntax/matlab.xml
share/kde/apps/katepart/syntax/maxima.xml
@@ -272,11 +308,13 @@ share/kde/apps/katepart/syntax/mergetagtext.xml
share/kde/apps/katepart/syntax/metafont.xml
share/kde/apps/katepart/syntax/mips.xml
share/kde/apps/katepart/syntax/modelica.xml
+share/kde/apps/katepart/syntax/modelines.xml
share/kde/apps/katepart/syntax/modula-2.xml
share/kde/apps/katepart/syntax/monobasic.xml
share/kde/apps/katepart/syntax/mup.xml
share/kde/apps/katepart/syntax/nasm.xml
share/kde/apps/katepart/syntax/nemerle.xml
+share/kde/apps/katepart/syntax/nesc.xml
share/kde/apps/katepart/syntax/noweb.xml
share/kde/apps/katepart/syntax/objectivec.xml
share/kde/apps/katepart/syntax/objectivecpp.xml
@@ -290,20 +328,24 @@ share/kde/apps/katepart/syntax/perl.xml
share/kde/apps/katepart/syntax/pgn.xml
share/kde/apps/katepart/syntax/php.xml
share/kde/apps/katepart/syntax/picsrc.xml
+share/kde/apps/katepart/syntax/pig.xml
share/kde/apps/katepart/syntax/pike.xml
share/kde/apps/katepart/syntax/postscript.xml
share/kde/apps/katepart/syntax/povray.xml
+share/kde/apps/katepart/syntax/ppd.xml
share/kde/apps/katepart/syntax/progress.xml
share/kde/apps/katepart/syntax/prolog.xml
share/kde/apps/katepart/syntax/purebasic.xml
share/kde/apps/katepart/syntax/python.xml
share/kde/apps/katepart/syntax/qmake.xml
share/kde/apps/katepart/syntax/qml.xml
+share/kde/apps/katepart/syntax/qt4.xml
share/kde/apps/katepart/syntax/r.xml
share/kde/apps/katepart/syntax/rapidq.xml
share/kde/apps/katepart/syntax/relaxng.xml
share/kde/apps/katepart/syntax/relaxngcompact.xml
share/kde/apps/katepart/syntax/rest.xml
+share/kde/apps/katepart/syntax/restructuredtext.xml
share/kde/apps/katepart/syntax/rexx.xml
share/kde/apps/katepart/syntax/rhtml.xml
share/kde/apps/katepart/syntax/rib.xml
@@ -315,6 +357,7 @@ share/kde/apps/katepart/syntax/sather.xml
share/kde/apps/katepart/syntax/scala.xml
share/kde/apps/katepart/syntax/scheme.xml
share/kde/apps/katepart/syntax/sci.xml
+share/kde/apps/katepart/syntax/scss.xml
share/kde/apps/katepart/syntax/sed.xml
share/kde/apps/katepart/syntax/sgml.xml
share/kde/apps/katepart/syntax/sieve.xml
@@ -331,11 +374,16 @@ share/kde/apps/katepart/syntax/systemverilog.xml
share/kde/apps/katepart/syntax/tads3.xml
share/kde/apps/katepart/syntax/tcl.xml
share/kde/apps/katepart/syntax/tcsh.xml
+share/kde/apps/katepart/syntax/template-toolkit.xml
share/kde/apps/katepart/syntax/texinfo.xml
+share/kde/apps/katepart/syntax/textile.xml
share/kde/apps/katepart/syntax/tibasic.xml
share/kde/apps/katepart/syntax/txt2tags.xml
share/kde/apps/katepart/syntax/uscript.xml
+share/kde/apps/katepart/syntax/vala.xml
share/kde/apps/katepart/syntax/valgrind-suppression.xml
+share/kde/apps/katepart/syntax/varnish.xml
+share/kde/apps/katepart/syntax/vcard.xml
share/kde/apps/katepart/syntax/velocity.xml
share/kde/apps/katepart/syntax/vera.xml
share/kde/apps/katepart/syntax/verilog.xml
@@ -367,22 +415,14 @@ share/kde/apps/katexmltools/xhtml1-strict.dtd.xml
share/kde/apps/katexmltools/xhtml1-transitional.dtd.xml
share/kde/apps/katexmltools/xslt-1.0.dtd.xml
share/kde/apps/kconf_update/kate-2.4.upd
-share/kde/apps/ktexteditor_acomment/acommentui.rc
share/kde/apps/ktexteditor_exporter/ktexteditor_exporterui.rc
share/kde/apps/ktexteditor_iconinserter/ktexteditor_iconinserterui.rc
-share/kde/apps/ktexteditor_insanehtml_le/insanehtml_le_ui.rc
-share/kde/apps/ktexteditor_insanehtml_le/xhtml.cfg
share/kde/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
-share/kde/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
-share/kde/apps/ktexteditor_snippets/data/testsnippets.xml
-share/kde/apps/ktexteditor_snippets/data/testsnippetscpp.xml
share/kde/apps/kwrite/kwriteui.rc
-share/kde/config/artisticcommentrc
-share/kde/config/katefiletemplates.knsrc
share/kde/config/katemoderc
-share/kde/config/katepartpluginsrc
share/kde/config/katerc
-share/kde/config/ktexteditor_codesnippets_core.knsrc
+share/kde/config/kateschemarc
+share/kde/config/katesyntaxhighlightingrc
share/kde4/services/kate_kttsd.desktop
share/kde4/services/katebacktracebrowserplugin.desktop
share/kde4/services/katebuildplugin.desktop
@@ -395,9 +435,9 @@ share/kde4/services/katekonsoleplugin.desktop
share/kde4/services/katemailfilesplugin.desktop
share/kde4/services/kateopenheader.desktop
share/kde4/services/katepart.desktop
-share/kde4/services/katequickdocumentswitcher.desktop
+share/kde4/services/kateprojectplugin.desktop
share/kde4/services/katesearch.desktop
-share/kde4/services/katesnippets_tngplugin.desktop
+share/kde4/services/katesnippetsplugin.desktop
share/kde4/services/katesql.desktop
share/kde4/services/katesymbolviewer.desktop
share/kde4/services/katetabbarextension.desktop
@@ -405,16 +445,12 @@ share/kde4/services/katetabifyplugin.desktop
share/kde4/services/katetextfilter.desktop
share/kde4/services/katexmlcheck.desktop
share/kde4/services/katexmltools.desktop
-share/kde4/services/ktexteditor_acomment.desktop
share/kde4/services/ktexteditor_autobrace.desktop
share/kde4/services/ktexteditor_autobrace_config.desktop
share/kde4/services/ktexteditor_exporter.desktop
share/kde4/services/ktexteditor_hlselection.desktop
share/kde4/services/ktexteditor_iconinserter.desktop
-share/kde4/services/ktexteditor_insanehtml_le.desktop
share/kde4/services/ktexteditor_insertfile.desktop
-share/kde4/services/ktexteditor_kdatatool.desktop
-share/kde4/services/ktexteditor_python-encoding.desktop
+share/kde4/services/pate.desktop
share/kde4/services/plasma-applet-katesession.desktop
share/kde4/servicetypes/kateplugin.desktop
-share/mime/packages/ktesnippets.xml
diff --git a/editors/kate/distinfo b/editors/kate/distinfo
index f270f4976a6..1021d5f819e 100644
--- a/editors/kate/distinfo
+++ b/editors/kate/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:28 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:23 markd Exp $
-SHA1 (kate-4.8.4.tar.xz) = 5a70b64c92892781d50781fcaac81ff352ec3ed9
-RMD160 (kate-4.8.4.tar.xz) = 949ecda0374b2b94a7ddb59c509471d34904d790
-Size (kate-4.8.4.tar.xz) = 2227504 bytes
+SHA1 (kate-4.10.2.tar.xz) = 117850ca1728c309310f23a5ac2d583cfdfd29c7
+RMD160 (kate-4.10.2.tar.xz) = 53efb53f36d1e59c968bf6459258c262d5abe431
+Size (kate-4.10.2.tar.xz) = 2566336 bytes
diff --git a/games/blinken/Makefile b/games/blinken/Makefile
index d8be0f7058a..831999889a5 100644
--- a/games/blinken/Makefile
+++ b/games/blinken/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:21:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:56 markd Exp $
DISTNAME= blinken-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= games
COMMENT= memory enhancement game
diff --git a/games/blinken/distinfo b/games/blinken/distinfo
index 69adf34aa55..45ec5d5e4d6 100644
--- a/games/blinken/distinfo
+++ b/games/blinken/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:28 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:56 markd Exp $
-SHA1 (blinken-4.8.4.tar.xz) = 571e1f06270d38e56149a8770517bf892859e2eb
-RMD160 (blinken-4.8.4.tar.xz) = 0611fbb96862109182be122bcc820fe551109177
-Size (blinken-4.8.4.tar.xz) = 567144 bytes
+SHA1 (blinken-4.10.2.tar.xz) = 884c9bd072325b3fc3e06da5c875516c6ee1f728
+RMD160 (blinken-4.10.2.tar.xz) = c3115f8c9c9d0b60afb1b846869dd277967205f3
+Size (blinken-4.10.2.tar.xz) = 566692 bytes
diff --git a/games/kanagram/Makefile b/games/kanagram/Makefile
index 376835e169d..dce662735b4 100644
--- a/games/kanagram/Makefile
+++ b/games/kanagram/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:21:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:58 markd Exp $
DISTNAME= kanagram-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= games
COMMENT= KDE letter order game
diff --git a/games/kanagram/PLIST b/games/kanagram/PLIST
index 64fc97c208e..d5bdd621e48 100644
--- a/games/kanagram/PLIST
+++ b/games/kanagram/PLIST
@@ -1,5 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 07:20:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:58 markd Exp $
bin/kanagram
+include/kanagram/kanagram_engine_export.h
+include/kanagram/kanagramgame.h
+include/kanagram/kanagramsettings.h
+lib/libkanagramengine.so
+lib/libkanagramengine.so.4
+lib/libkanagramengine.so.${PKGVERSION}
share/applications/kde4/kanagram.desktop
share/doc/kde/HTML/en/kanagram/answer-highlight.png
share/doc/kde/HTML/en/kanagram/common
@@ -16,10 +22,11 @@ share/doc/kde/HTML/en/kanagram/vocab-editor.png
share/doc/kde/HTML/en/kanagram/vocab-settings.png
share/icons/hicolor/128x128/apps/kanagram.png
share/icons/hicolor/16x16/apps/kanagram.png
-share/icons/hicolor/22x22/apps/kanagram.png
+share/icons/hicolor/24x24/apps/kanagram.png
share/icons/hicolor/32x32/apps/kanagram.png
share/icons/hicolor/48x48/apps/kanagram.png
share/icons/hicolor/64x64/apps/kanagram.png
+share/icons/hicolor/80x80/apps/kanagram-harmattan.png
share/icons/hicolor/scalable/apps/kanagram.svgz
share/kde/apps/kanagram/images/kanagram.svg
share/kde/apps/kanagram/sounds/chalk.ogg
diff --git a/games/kanagram/distinfo b/games/kanagram/distinfo
index 71b69caf0c5..884bc8a1f09 100644
--- a/games/kanagram/distinfo
+++ b/games/kanagram/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:28 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:58 markd Exp $
-SHA1 (kanagram-4.8.4.tar.xz) = e897cc67ae046a4d7580f22a0ace534525fa6f1b
-RMD160 (kanagram-4.8.4.tar.xz) = 3efb54c560908059461a79a4c254b8cd2f77e40e
-Size (kanagram-4.8.4.tar.xz) = 623480 bytes
+SHA1 (kanagram-4.10.2.tar.xz) = 2536db114e6be17baf1556293c95b70fe83aa609
+RMD160 (kanagram-4.10.2.tar.xz) = c65ce6cbef1dfb35b84072a1dba063a28a5f41b4
+Size (kanagram-4.10.2.tar.xz) = 1068648 bytes
diff --git a/games/kdetoys4/Makefile b/games/kdetoys4/Makefile
index 4bfeef3ce45..c0fdb9b899a 100644
--- a/games/kdetoys4/Makefile
+++ b/games/kdetoys4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2013/02/16 11:21:23 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/04/03 10:52:13 markd Exp $
DISTNAME= kdetoys-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 7
CATEGORIES= games
COMMENT= Toys for the KDE integrated X11 desktop
diff --git a/games/kdetoys4/distinfo b/games/kdetoys4/distinfo
index 0f9041c121b..c2dfd6f8694 100644
--- a/games/kdetoys4/distinfo
+++ b/games/kdetoys4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2012/06/16 04:45:29 markd Exp $
+$NetBSD: distinfo,v 1.17 2013/04/03 10:52:13 markd Exp $
-SHA1 (kdetoys-4.8.4.tar.xz) = dd5f63f0e833135bac73a2e12692b1e6dd412f67
-RMD160 (kdetoys-4.8.4.tar.xz) = 8022a7abe3e0a4381ebad4aae3d2c3d211661e0a
-Size (kdetoys-4.8.4.tar.xz) = 391732 bytes
+SHA1 (kdetoys-4.10.2.tar.xz) = 3fa4fc9b9ec04e9967b9a326d9dc26c3055b5e2b
+RMD160 (kdetoys-4.10.2.tar.xz) = 361fb16722a5ccb430b33869a8fd0f76065e6862
+Size (kdetoys-4.10.2.tar.xz) = 379156 bytes
diff --git a/games/khangman/Makefile b/games/khangman/Makefile
index 7016786d47a..53040d074c7 100644
--- a/games/khangman/Makefile
+++ b/games/khangman/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:21:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:00 markd Exp $
DISTNAME= khangman-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= games
COMMENT= KDE hangman game
diff --git a/games/khangman/PLIST b/games/khangman/PLIST
index 6a71ef0547e..62a329bc2d9 100644
--- a/games/khangman/PLIST
+++ b/games/khangman/PLIST
@@ -1,5 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 07:20:40 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:00 markd Exp $
bin/khangman
+include/khangman/khangman_engine_export.h
+include/khangman/khangmanengine.h
+include/khangman/prefs.h
+lib/libkhangmanengine.so
+lib/libkhangmanengine.so.4
+lib/libkhangmanengine.so.${PKGVERSION}
man/man6/khangman.6
share/applications/kde4/khangman.desktop
share/doc/kde/HTML/en/khangman/application-exit.png
@@ -21,6 +27,8 @@ share/icons/hicolor/22x22/apps/khangman.png
share/icons/hicolor/32x32/apps/khangman.png
share/icons/hicolor/48x48/apps/khangman.png
share/icons/hicolor/64x64/apps/khangman.png
+share/icons/hicolor/80x80/apps/khangman-harmattan.png
+share/icons/hicolor/scalable/apps/khangman-harmattan.svgz
share/icons/hicolor/scalable/apps/khangman.svgz
share/kde/apps/khangman/fonts/Domestic_Manners.ttf
share/kde/apps/khangman/fonts/Dustismo_Roman.ttf
@@ -29,6 +37,7 @@ share/kde/apps/khangman/pics/bees/khangman_bees.svg
share/kde/apps/khangman/pics/desert/khangman_desert.svg
share/kde/apps/khangman/pics/sea/khangman_sea.svg
share/kde/apps/khangman/pics/standardthemes.xml
+share/kde/apps/khangman/pics/winter/khangman_winter.svg
share/kde/apps/khangman/sounds/EW_Dialogue_Appear.ogg
share/kde/apps/khangman/sounds/new_game.ogg
share/kde/config.kcfg/khangman.kcfg
diff --git a/games/khangman/distinfo b/games/khangman/distinfo
index db3d2ba67ad..53dfb330388 100644
--- a/games/khangman/distinfo
+++ b/games/khangman/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:29 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:00 markd Exp $
-SHA1 (khangman-4.8.4.tar.xz) = aa544ba55833983bd21ebf594f2003a66b251901
-RMD160 (khangman-4.8.4.tar.xz) = a2da44881e6b00cfcf044982f19d29fa22499029
-Size (khangman-4.8.4.tar.xz) = 1155292 bytes
+SHA1 (khangman-4.10.2.tar.xz) = 2795c1ada9898854fe3a8ffd8a92c8ad5cd3eb04
+RMD160 (khangman-4.10.2.tar.xz) = 4d328ff8d807b64d3c7a2410b07e3ee88459f087
+Size (khangman-4.10.2.tar.xz) = 3946600 bytes
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 08c5bf2a8ba..047a3d79808 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2013/02/16 11:22:08 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2013/04/03 10:52:06 markd Exp $
DISTNAME= gwenview-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE image viewer
@@ -10,9 +9,11 @@ COMMENT= KDE image viewer
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../graphics/exiv2/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
.include "../../graphics/libkipi/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../x11/kde-baseapps4/buildlink3.mk"
diff --git a/graphics/gwenview/PLIST b/graphics/gwenview/PLIST
index d3206ae8e0b..26132169ae7 100644
--- a/graphics/gwenview/PLIST
+++ b/graphics/gwenview/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.16 2012/03/19 23:32:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.17 2013/04/03 10:52:07 markd Exp $
bin/gwenview
bin/gwenview_importer
lib/kde4/gvpart.so
lib/libgwenviewlib.so
lib/libgwenviewlib.so.4
-lib/libgwenviewlib.so.4.8.0
+lib/libgwenviewlib.so.${PKGVERSION}
share/applications/kde4/gwenview.desktop
share/doc/kde/HTML/en/gwenview/browse_mode.png
share/doc/kde/HTML/en/gwenview/common
@@ -28,12 +28,10 @@ share/icons/hicolor/64x64/apps/gwenview.png
share/icons/hicolor/scalable/actions/document-share.svgz
share/icons/hicolor/scalable/apps/gwenview.svgz
share/kde/apps/gvpart/gvpart.rc
+share/kde/apps/gwenview/color-schemes/fullscreen.colors
share/kde/apps/gwenview/cursors/zoom.png
-share/kde/apps/gwenview/fullscreenthemes/blackglass/checked.png
-share/kde/apps/gwenview/fullscreenthemes/blackglass/scroll-left.png
-share/kde/apps/gwenview/fullscreenthemes/blackglass/scroll-right.png
-share/kde/apps/gwenview/fullscreenthemes/blackglass/style.css
share/kde/apps/gwenview/gwenviewui.rc
+share/kde/apps/gwenview/images/background.png
share/kde/apps/solid/actions/gwenview_importer.desktop
share/kde/apps/solid/actions/gwenview_importer_camera.desktop
share/kde4/services/ServiceMenus/slideshow.desktop
diff --git a/graphics/gwenview/distinfo b/graphics/gwenview/distinfo
index f3d5d82d18d..8cca63c599d 100644
--- a/graphics/gwenview/distinfo
+++ b/graphics/gwenview/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.23 2013/02/19 19:26:44 markd Exp $
+$NetBSD: distinfo,v 1.24 2013/04/03 10:52:07 markd Exp $
-SHA1 (gwenview-4.8.4.tar.xz) = 6cc6da85f6e2c8c817c1402baace16eb58b7a423
-RMD160 (gwenview-4.8.4.tar.xz) = 6529317ccbbf991280db7e1038161069a909d9c2
-Size (gwenview-4.8.4.tar.xz) = 1954644 bytes
+SHA1 (gwenview-4.10.2.tar.xz) = 6872a50b2fda3bed717e0fc1b367b02ad80550dd
+RMD160 (gwenview-4.10.2.tar.xz) = 5b0e75f5867bca7e6964af98275a277e797a608d
+Size (gwenview-4.10.2.tar.xz) = 2184620 bytes
SHA1 (patch-lib_CMakeLists.txt) = d5f94257c76eaa2ff366449314b7f7cfdf4af21a
diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile
index c6bcb1ca658..2b739ac058c 100644
--- a/graphics/kamera/Makefile
+++ b/graphics/kamera/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:05 markd Exp $
DISTNAME= kamera-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE digital camera manager
diff --git a/graphics/kamera/distinfo b/graphics/kamera/distinfo
index d11b84175a1..94cda230759 100644
--- a/graphics/kamera/distinfo
+++ b/graphics/kamera/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:06 markd Exp $
-SHA1 (kamera-4.8.4.tar.xz) = fc92327482bf1cd9b067667285ede00e3e464653
-RMD160 (kamera-4.8.4.tar.xz) = 123690c9e8718309e0d7333d17f4f5e07bc69dd2
-Size (kamera-4.8.4.tar.xz) = 37880 bytes
+SHA1 (kamera-4.10.2.tar.xz) = 5ee6904705c1d323c7c0d780d0ecf65f93175981
+RMD160 (kamera-4.10.2.tar.xz) = 759e29927b19658d743ac39e42a6fb67dd90a119
+Size (kamera-4.10.2.tar.xz) = 37868 bytes
diff --git a/graphics/kcolorchooser/Makefile b/graphics/kcolorchooser/Makefile
index 08603b82813..9a0f7e90737 100644
--- a/graphics/kcolorchooser/Makefile
+++ b/graphics/kcolorchooser/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:11 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:08 markd Exp $
DISTNAME= kcolorchooser-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE color chooser
diff --git a/graphics/kcolorchooser/distinfo b/graphics/kcolorchooser/distinfo
index 33003b32fb5..e909ae6a783 100644
--- a/graphics/kcolorchooser/distinfo
+++ b/graphics/kcolorchooser/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:08 markd Exp $
-SHA1 (kcolorchooser-4.8.4.tar.xz) = 2f5ee55c86a503e458b1884939a62408bedbfc70
-RMD160 (kcolorchooser-4.8.4.tar.xz) = 34fd5299d2ba5909952be09db3147e5413fbfb29
-Size (kcolorchooser-4.8.4.tar.xz) = 4732 bytes
+SHA1 (kcolorchooser-4.10.2.tar.xz) = 71d7e8415c4583ef72598bb4a50d8b2c7c83a8e6
+RMD160 (kcolorchooser-4.10.2.tar.xz) = a437da51ac92db71bb165d1134ec334a5e412e7e
+Size (kcolorchooser-4.10.2.tar.xz) = 4576 bytes
diff --git a/graphics/kde-base-artwork/DESCR b/graphics/kde-base-artwork/DESCR
new file mode 100644
index 00000000000..4c3cdcde533
--- /dev/null
+++ b/graphics/kde-base-artwork/DESCR
@@ -0,0 +1 @@
+KDE KSplash theme
diff --git a/graphics/kde-base-artwork/Makefile b/graphics/kde-base-artwork/Makefile
new file mode 100644
index 00000000000..f688435a47d
--- /dev/null
+++ b/graphics/kde-base-artwork/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2013/04/03 10:52:20 markd Exp $
+
+DISTNAME= kde-base-artwork-${_KDE_VERSION}
+CATEGORIES= graphics
+COMMENT= KDE KSplash theme
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.include "../../x11/kdelibs4/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kde-base-artwork/PLIST b/graphics/kde-base-artwork/PLIST
new file mode 100644
index 00000000000..1058b39af83
--- /dev/null
+++ b/graphics/kde-base-artwork/PLIST
@@ -0,0 +1,22 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/03 10:52:20 markd Exp $
+share/kde/apps/ksplash/Themes/Default/1024x768/background.png
+share/kde/apps/ksplash/Themes/Default/1280x1024/background.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/background.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/description.txt
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon1.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon1_anim.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon2.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon2_anim.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon3.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon3_anim.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon4.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon4_anim.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon5.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/icon5_anim.png
+share/kde/apps/ksplash/Themes/Default/1600x1200/rectangle.png
+share/kde/apps/ksplash/Themes/Default/1920x1080/background.png
+share/kde/apps/ksplash/Themes/Default/1920x1200/background.png
+share/kde/apps/ksplash/Themes/Default/600x400/background.png
+share/kde/apps/ksplash/Themes/Default/800x600/background.png
+share/kde/apps/ksplash/Themes/Default/Preview.png
+share/kde/apps/ksplash/Themes/Default/Theme.rc
diff --git a/graphics/kde-base-artwork/distinfo b/graphics/kde-base-artwork/distinfo
new file mode 100644
index 00000000000..ad6479557e9
--- /dev/null
+++ b/graphics/kde-base-artwork/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2013/04/03 10:52:21 markd Exp $
+
+SHA1 (kde-base-artwork-4.10.2.tar.xz) = 4071b07ebe544e7ec9032cf7fc2798eaa45ee39b
+RMD160 (kde-base-artwork-4.10.2.tar.xz) = 3cc2d135c53b3992749d632bb3317053e5748273
+Size (kde-base-artwork-4.10.2.tar.xz) = 7421812 bytes
diff --git a/graphics/kdegraphics-mobipocket/Makefile b/graphics/kdegraphics-mobipocket/Makefile
index 8d23dfc537d..0fc133545fd 100644
--- a/graphics/kdegraphics-mobipocket/Makefile
+++ b/graphics/kdegraphics-mobipocket/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:10 markd Exp $
DISTNAME= kdegraphics-mobipocket-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= library to support mobipocket ebooks.
diff --git a/graphics/kdegraphics-mobipocket/distinfo b/graphics/kdegraphics-mobipocket/distinfo
index 517b2d51e3f..c3b58cebc90 100644
--- a/graphics/kdegraphics-mobipocket/distinfo
+++ b/graphics/kdegraphics-mobipocket/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:10 markd Exp $
-SHA1 (kdegraphics-mobipocket-4.8.4.tar.xz) = 0c38ef851c054b0ee3689d41ff5f7f6fb3d83f67
-RMD160 (kdegraphics-mobipocket-4.8.4.tar.xz) = 9a67d9d0277136b98f12e517381b35f06307e7d8
-Size (kdegraphics-mobipocket-4.8.4.tar.xz) = 20576 bytes
+SHA1 (kdegraphics-mobipocket-4.10.2.tar.xz) = 657d912c5addd8b770309f125a16d6bd852141ac
+RMD160 (kdegraphics-mobipocket-4.10.2.tar.xz) = 44e17f31552218e06dc86e8fa646f100526202b8
+Size (kdegraphics-mobipocket-4.10.2.tar.xz) = 20304 bytes
diff --git a/graphics/kdegraphics-strigi-analyzer/Makefile b/graphics/kdegraphics-strigi-analyzer/Makefile
index 25abacd9c55..27d4a7a47e5 100644
--- a/graphics/kdegraphics-strigi-analyzer/Makefile
+++ b/graphics/kdegraphics-strigi-analyzer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:11 markd Exp $
DISTNAME= kdegraphics-strigi-analyzer-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= graphics file format plugins for Strigi Desktop Search
diff --git a/graphics/kdegraphics-strigi-analyzer/distinfo b/graphics/kdegraphics-strigi-analyzer/distinfo
index 1255259e7f3..78e110408c1 100644
--- a/graphics/kdegraphics-strigi-analyzer/distinfo
+++ b/graphics/kdegraphics-strigi-analyzer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:11 markd Exp $
-SHA1 (kdegraphics-strigi-analyzer-4.8.4.tar.xz) = 208dd945c1ecfaee97457585dc7a52916dd2318f
-RMD160 (kdegraphics-strigi-analyzer-4.8.4.tar.xz) = 0d4ab5f2f23452e9ddb6fa149b1b8840580791fe
-Size (kdegraphics-strigi-analyzer-4.8.4.tar.xz) = 41756 bytes
+SHA1 (kdegraphics-strigi-analyzer-4.10.2.tar.xz) = 3d09bd886eb8f94a0492748e2500af539b5aa339
+RMD160 (kdegraphics-strigi-analyzer-4.10.2.tar.xz) = 06df378e359e788ba755b0610a58a52325d0b30b
+Size (kdegraphics-strigi-analyzer-4.10.2.tar.xz) = 41052 bytes
diff --git a/graphics/kdegraphics-thumbnailers/Makefile b/graphics/kdegraphics-thumbnailers/Makefile
index d9b02d3a52f..ed1b7adabd2 100644
--- a/graphics/kdegraphics-thumbnailers/Makefile
+++ b/graphics/kdegraphics-thumbnailers/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:11 markd Exp $
DISTNAME= kdegraphics-thumbnailers-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= graphics file format thumbnailers for KDE
diff --git a/graphics/kdegraphics-thumbnailers/distinfo b/graphics/kdegraphics-thumbnailers/distinfo
index 0865d6f5729..4ca41017f4d 100644
--- a/graphics/kdegraphics-thumbnailers/distinfo
+++ b/graphics/kdegraphics-thumbnailers/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:11 markd Exp $
-SHA1 (kdegraphics-thumbnailers-4.8.4.tar.xz) = 57e753881f9ca78c4c188c49a3a1b258b92adb83
-RMD160 (kdegraphics-thumbnailers-4.8.4.tar.xz) = 3c292ba79f0156527c301aa428b4edd71f213379
-Size (kdegraphics-thumbnailers-4.8.4.tar.xz) = 42028 bytes
+SHA1 (kdegraphics-thumbnailers-4.10.2.tar.xz) = 7a3688aa23050967927e569f2b8d8c6841bf2401
+RMD160 (kdegraphics-thumbnailers-4.10.2.tar.xz) = 424fe1c11058db9e966607714a591796981d4c42
+Size (kdegraphics-thumbnailers-4.10.2.tar.xz) = 41696 bytes
diff --git a/graphics/kgamma/Makefile b/graphics/kgamma/Makefile
index d48d186db32..d5d44a8dc89 100644
--- a/graphics/kgamma/Makefile
+++ b/graphics/kgamma/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:08 markd Exp $
DISTNAME= kgamma-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE screen gamma values kcontrol module
diff --git a/graphics/kgamma/distinfo b/graphics/kgamma/distinfo
index 9af71323c4a..402f2cf152c 100644
--- a/graphics/kgamma/distinfo
+++ b/graphics/kgamma/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:09 markd Exp $
-SHA1 (kgamma-4.8.4.tar.xz) = 812a84564db52fb6a8b8e0e829eb762d479092ec
-RMD160 (kgamma-4.8.4.tar.xz) = f0206468044df48b95dd993d96e0011e1abde461
-Size (kgamma-4.8.4.tar.xz) = 27532 bytes
+SHA1 (kgamma-4.10.2.tar.xz) = 4f6e5269500800da897643246363b9c18ce36843
+RMD160 (kgamma-4.10.2.tar.xz) = c79e6dcf0a0d584fd9dd5ddac2cc8a1cff6cea22
+Size (kgamma-4.10.2.tar.xz) = 27116 bytes
diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile
index abe44ea9749..93c4fb9effe 100644
--- a/graphics/kolourpaint/Makefile
+++ b/graphics/kolourpaint/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:14 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:09 markd Exp $
DISTNAME= kolourpaint-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE paint program
diff --git a/graphics/kolourpaint/PLIST b/graphics/kolourpaint/PLIST
index b674c559d83..4eb9e561d8e 100644
--- a/graphics/kolourpaint/PLIST
+++ b/graphics/kolourpaint/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 00:14:35 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:09 markd Exp $
bin/kolourpaint
lib/libkolourpaint_lgpl.so
lib/libkolourpaint_lgpl.so.4
-lib/libkolourpaint_lgpl.so.4.8.0
+lib/libkolourpaint_lgpl.so.${PKGVERSION}
share/applications/kde4/kolourpaint.desktop
share/doc/kde/HTML/en/kolourpaint/KolourPaint.png
share/doc/kde/HTML/en/kolourpaint/brush_shapes.png
diff --git a/graphics/kolourpaint/distinfo b/graphics/kolourpaint/distinfo
index ad95f100486..916d2d70d27 100644
--- a/graphics/kolourpaint/distinfo
+++ b/graphics/kolourpaint/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:09 markd Exp $
-SHA1 (kolourpaint-4.8.4.tar.xz) = 1dc706ed29339df9fcc68ee606588941319bbf09
-RMD160 (kolourpaint-4.8.4.tar.xz) = e6dc8533c2f79fa20efb6f876161b4fc63d1a52e
-Size (kolourpaint-4.8.4.tar.xz) = 1193560 bytes
+SHA1 (kolourpaint-4.10.2.tar.xz) = 54c0999d3ce68ff4a28c879ac3743d22c76b0937
+RMD160 (kolourpaint-4.10.2.tar.xz) = d11b8e585f49db2b2402bd8f83a7350e177d905c
+Size (kolourpaint-4.10.2.tar.xz) = 1186736 bytes
diff --git a/graphics/kruler/Makefile b/graphics/kruler/Makefile
index 527d737ddd6..89fcadddb4c 100644
--- a/graphics/kruler/Makefile
+++ b/graphics/kruler/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:09 markd Exp $
DISTNAME= kruler-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE screen ruler
diff --git a/graphics/kruler/distinfo b/graphics/kruler/distinfo
index 8e36383ec3c..85078a5e5d5 100644
--- a/graphics/kruler/distinfo
+++ b/graphics/kruler/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:09 markd Exp $
-SHA1 (kruler-4.8.4.tar.xz) = b3fb40888f6cf2ad419e1f30a97c2052ffbae1d7
-RMD160 (kruler-4.8.4.tar.xz) = ff319c7dcb7fd7e93cd9ba3769afa32a60e1b2bd
-Size (kruler-4.8.4.tar.xz) = 134768 bytes
+SHA1 (kruler-4.10.2.tar.xz) = 9424591fe16cd1930f0a6bf89fcf7b56c0560227
+RMD160 (kruler-4.10.2.tar.xz) = 4d6bbbf3f895a8738cd9e2ca46a44fa20071778d
+Size (kruler-4.10.2.tar.xz) = 134264 bytes
diff --git a/graphics/ksaneplugin/Makefile b/graphics/ksaneplugin/Makefile
index 46dba8fa0d6..c3f92c143da 100644
--- a/graphics/ksaneplugin/Makefile
+++ b/graphics/ksaneplugin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:07 markd Exp $
DISTNAME= ksaneplugin-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= SANE Plugin for KDE
diff --git a/graphics/ksaneplugin/distinfo b/graphics/ksaneplugin/distinfo
index 9db81ea6610..8e363e48688 100644
--- a/graphics/ksaneplugin/distinfo
+++ b/graphics/ksaneplugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:07 markd Exp $
-SHA1 (ksaneplugin-4.8.4.tar.xz) = b7a3204ef27f04bffca0fd77d84bd46b236687b7
-RMD160 (ksaneplugin-4.8.4.tar.xz) = 738fb97cc2526dda34e9960a4130f25adc33220f
-Size (ksaneplugin-4.8.4.tar.xz) = 13668 bytes
+SHA1 (ksaneplugin-4.10.2.tar.xz) = 076c7ed01024c91bc690fe07e495e37444dbcdd5
+RMD160 (ksaneplugin-4.10.2.tar.xz) = ec16c968a16aa762ce5bdd16d0d160f4f93abdfc
+Size (ksaneplugin-4.10.2.tar.xz) = 13420 bytes
diff --git a/graphics/ksnapshot/Makefile b/graphics/ksnapshot/Makefile
index 12706988f3d..87ce7975b30 100644
--- a/graphics/ksnapshot/Makefile
+++ b/graphics/ksnapshot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:08 markd Exp $
DISTNAME= ksnapshot-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE screen capture program
@@ -10,6 +9,7 @@ COMMENT= KDE screen capture program
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/libkipi/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/graphics/ksnapshot/distinfo b/graphics/ksnapshot/distinfo
index 22ec332642d..d989279cfb1 100644
--- a/graphics/ksnapshot/distinfo
+++ b/graphics/ksnapshot/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:30 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:08 markd Exp $
-SHA1 (ksnapshot-4.8.4.tar.xz) = 1cbd1ea468e7722feb8c96dd5f1f3a18bb91d4ef
-RMD160 (ksnapshot-4.8.4.tar.xz) = 6aea7b32653f67e5edaaef50f842087c8625dae6
-Size (ksnapshot-4.8.4.tar.xz) = 264944 bytes
+SHA1 (ksnapshot-4.10.2.tar.xz) = 4f3167a98d300a56abe91fb56785afc350439cbf
+RMD160 (ksnapshot-4.10.2.tar.xz) = d7bbf56ffd4bf845658f3055ae371fc8d8686f94
+Size (ksnapshot-4.10.2.tar.xz) = 264348 bytes
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 5dbab113523..c4b4683f0de 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2013/02/16 11:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2013/04/03 10:52:11 markd Exp $
DISTNAME= libkdcraw-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE digital camera raw image library wrapper
diff --git a/graphics/libkdcraw/PLIST b/graphics/libkdcraw/PLIST
index d5234463b53..c012bf440d6 100644
--- a/graphics/libkdcraw/PLIST
+++ b/graphics/libkdcraw/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.7 2012/03/19 22:43:15 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/04/03 10:52:11 markd Exp $
include/libkdcraw/dcrawinfocontainer.h
include/libkdcraw/dcrawsettingswidget.h
include/libkdcraw/kdcraw.h
include/libkdcraw/libkdcraw_export.h
+include/libkdcraw/ractionthreadbase.h
include/libkdcraw/rawdecodingsettings.h
include/libkdcraw/rawfiles.h
include/libkdcraw/rcombobox.h
@@ -11,8 +12,8 @@ include/libkdcraw/rnuminput.h
include/libkdcraw/squeezedcombobox.h
include/libkdcraw/version.h
lib/libkdcraw.so
-lib/libkdcraw.so.20
-lib/libkdcraw.so.20.0.1
+lib/libkdcraw.so.22
+lib/libkdcraw.so.22.0.0
lib/pkgconfig/libkdcraw.pc
share/icons/hicolor/128x128/apps/kdcraw.png
share/icons/hicolor/32x32/apps/kdcraw.png
diff --git a/graphics/libkdcraw/distinfo b/graphics/libkdcraw/distinfo
index ba3a16a0405..0a4832e7898 100644
--- a/graphics/libkdcraw/distinfo
+++ b/graphics/libkdcraw/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2012/06/16 04:45:30 markd Exp $
+$NetBSD: distinfo,v 1.12 2013/04/03 10:52:12 markd Exp $
-SHA1 (libkdcraw-4.8.4.tar.xz) = ba67432cb3353a55d57ae749b42919399dfda3e2
-RMD160 (libkdcraw-4.8.4.tar.xz) = 9c509763df5fb4065bea559eb0fe798412b02dd9
-Size (libkdcraw-4.8.4.tar.xz) = 271096 bytes
+SHA1 (libkdcraw-4.10.2.tar.xz) = 639bf3bf9a872cccbb39e5d16188dfa1d895463a
+RMD160 (libkdcraw-4.10.2.tar.xz) = 206e3381285ee7596039e746bf2ebbd10caec139
+Size (libkdcraw-4.10.2.tar.xz) = 349516 bytes
+SHA1 (patch-libraw_internal_wf_filtering.cpp) = 88b5f66a3dbaeea03927dd2eab098877beb904d6
diff --git a/graphics/libkdcraw/patches/patch-libraw_internal_wf_filtering.cpp b/graphics/libkdcraw/patches/patch-libraw_internal_wf_filtering.cpp
new file mode 100644
index 00000000000..a4f297bdc14
--- /dev/null
+++ b/graphics/libkdcraw/patches/patch-libraw_internal_wf_filtering.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-libraw_internal_wf_filtering.cpp,v 1.1 2013/04/03 10:52:12 markd Exp $
+
+--- libraw/internal/wf_filtering.cpp.orig 2013-03-01 07:01:45.000000000 +0000
++++ libraw/internal/wf_filtering.cpp
+@@ -682,7 +682,8 @@ int LibRaw::wf_remove_banding()
+ }
+
+ free(dummy_line);
+-
++ return WF_DEBANDING_OK;
++
+ }
+
+ double LibRaw::wf_filter_energy(int r1_greenmode, int r1, int r2_greenmode, int r2)
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 8795b85de83..c0985f1e3f6 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.39 2013/02/16 11:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2013/04/03 10:51:54 markd Exp $
#
DISTNAME= libkexiv2-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= a KDE wrapper around exiv2
diff --git a/graphics/libkexiv2/PLIST b/graphics/libkexiv2/PLIST
index eb78e6ab7e7..09b474bc4fd 100644
--- a/graphics/libkexiv2/PLIST
+++ b/graphics/libkexiv2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/03/19 23:12:19 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/03 10:51:54 markd Exp $
include/libkexiv2/altlangstredit.h
include/libkexiv2/countryselector.h
include/libkexiv2/kexiv2.h
@@ -10,7 +10,7 @@ include/libkexiv2/rotationmatrix.h
include/libkexiv2/subjectwidget.h
include/libkexiv2/version.h
lib/libkexiv2.so
-lib/libkexiv2.so.10
-lib/libkexiv2.so.10.0.1
+lib/libkexiv2.so.11
+lib/libkexiv2.so.11.1.0
lib/pkgconfig/libkexiv2.pc
share/kde/apps/libkexiv2/data/topicset.iptc-subjectcode.xml
diff --git a/graphics/libkexiv2/distinfo b/graphics/libkexiv2/distinfo
index d1b4b04dc89..a2e38389c19 100644
--- a/graphics/libkexiv2/distinfo
+++ b/graphics/libkexiv2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2012/06/16 04:45:29 markd Exp $
+$NetBSD: distinfo,v 1.13 2013/04/03 10:51:54 markd Exp $
-SHA1 (libkexiv2-4.8.4.tar.xz) = a3429dd70677498c890598cd1e3bf6a610669b77
-RMD160 (libkexiv2-4.8.4.tar.xz) = bd35dfa837847feb52860c9041785e45947b8c77
-Size (libkexiv2-4.8.4.tar.xz) = 134952 bytes
+SHA1 (libkexiv2-4.10.2.tar.xz) = 02dce6eaf48c14f134f220eeed494d74d41f7226
+RMD160 (libkexiv2-4.10.2.tar.xz) = 4263958e9304540106b72da8a0af015d35b8cda0
+Size (libkexiv2-4.10.2.tar.xz) = 134504 bytes
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index 548484efb04..9b502fe6ad3 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2013/02/16 11:19:56 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2013/04/03 10:52:06 markd Exp $
DISTNAME= libkipi-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE image plugin interface
diff --git a/graphics/libkipi/PLIST b/graphics/libkipi/PLIST
index 6bd890d23d2..dc302a3c458 100644
--- a/graphics/libkipi/PLIST
+++ b/graphics/libkipi/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.13 2012/03/19 22:57:09 markd Exp $
-include/libkipi/exportinterface.h
-include/libkipi/extension.h
+@comment $NetBSD: PLIST,v 1.14 2013/04/03 10:52:06 markd Exp $
+bin/kxmlkipicmd
+include/libkipi/configwidget.h
include/libkipi/imagecollection.h
include/libkipi/imagecollectionselector.h
include/libkipi/imagecollectionshared.h
@@ -12,9 +12,10 @@ include/libkipi/plugin.h
include/libkipi/pluginloader.h
include/libkipi/uploadwidget.h
include/libkipi/version.h
+lib/kde4/kipiplugin_kxmlhelloworld.so
lib/libkipi.so
-lib/libkipi.so.8
-lib/libkipi.so.8.0.1
+lib/libkipi.so.10
+lib/libkipi.so.10.0.0
lib/pkgconfig/libkipi.pc
share/icons/hicolor/128x128/apps/kipi.png
share/icons/hicolor/16x16/apps/kipi.png
@@ -24,4 +25,8 @@ share/icons/hicolor/48x48/apps/kipi.png
share/kde/apps/kipi/data/kipi-icon.svg
share/kde/apps/kipi/data/kipi-logo.svg
share/kde/apps/kipi/data/kipi-plugins_logo.png
+share/kde/apps/kipi/kipiplugin_kxmlhelloworldui.rc
+share/kde/apps/kxmlkipicmd/kxmlkipicmd_defaultui.rc
+share/kde/apps/kxmlkipicmd/kxmlkipicmd_gwenviewui.rc
+share/kde4/services/kipiplugin_kxmlhelloworld.desktop
share/kde4/servicetypes/kipiplugin.desktop
diff --git a/graphics/libkipi/distinfo b/graphics/libkipi/distinfo
index 6c65b1bb162..cc7edb42fe4 100644
--- a/graphics/libkipi/distinfo
+++ b/graphics/libkipi/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2012/06/16 04:45:29 markd Exp $
+$NetBSD: distinfo,v 1.12 2013/04/03 10:52:06 markd Exp $
-SHA1 (libkipi-4.8.4.tar.xz) = d30ef671be8caf8eb9ead68de53cf187f0fcf88b
-RMD160 (libkipi-4.8.4.tar.xz) = b3c76752c9299a4b243573c2811c0c33ae039c50
-Size (libkipi-4.8.4.tar.xz) = 73188 bytes
+SHA1 (libkipi-4.10.2.tar.xz) = 3098759c56c8fa89bc087de60d8709c7f76dc7a6
+RMD160 (libkipi-4.10.2.tar.xz) = fd5423e405adff06335530c1a30456971791a4a9
+Size (libkipi-4.10.2.tar.xz) = 95964 bytes
diff --git a/graphics/libksane/Makefile b/graphics/libksane/Makefile
index c673c6a3ae9..adf5eea7a75 100644
--- a/graphics/libksane/Makefile
+++ b/graphics/libksane/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/02/16 11:19:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/03 10:52:07 markd Exp $
DISTNAME= libksane-${_KDE_VERSION}
-PKGREVISION= 8
CATEGORIES= graphics
COMMENT= SANE Library interface for KDE
diff --git a/graphics/libksane/distinfo b/graphics/libksane/distinfo
index 4f69100b6f4..c52be1200ff 100644
--- a/graphics/libksane/distinfo
+++ b/graphics/libksane/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:29 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:07 markd Exp $
-SHA1 (libksane-4.8.4.tar.xz) = 5ac35d8478ccace1495ae42eb2169918cebc8d95
-RMD160 (libksane-4.8.4.tar.xz) = abe5fb1a478182324f0bc10e610f2e07c72048ac
-Size (libksane-4.8.4.tar.xz) = 83108 bytes
+SHA1 (libksane-4.10.2.tar.xz) = 3b9b83974dd2cdabe0cbe5fd3904ced1413a756b
+RMD160 (libksane-4.10.2.tar.xz) = 9cc9fdf7ffec04f5330be38006e5d492e87ce8e8
+Size (libksane-4.10.2.tar.xz) = 82568 bytes
diff --git a/graphics/oxygen-icons/Makefile b/graphics/oxygen-icons/Makefile
index 49d7f54b6cf..6c4e6cb0095 100644
--- a/graphics/oxygen-icons/Makefile
+++ b/graphics/oxygen-icons/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2013/01/11 00:15:39 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2013/04/03 10:51:50 markd Exp $
-DISTNAME= oxygen-icons-4.8.4
+DISTNAME= oxygen-icons-4.10.2
CATEGORIES= graphics kde
-MASTER_SITES= ${MASTER_SITE_KDE:=4.8.4/src/}
+MASTER_SITES= ${MASTER_SITE_KDE:=4.10.2/src/}
EXTRACT_SUFX= .tar.xz
EXTRACT_USING= bsdtar
diff --git a/graphics/oxygen-icons/PLIST b/graphics/oxygen-icons/PLIST
index 06fe6801a3d..6085459055b 100644
--- a/graphics/oxygen-icons/PLIST
+++ b/graphics/oxygen-icons/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2012/06/16 04:45:29 markd Exp $
+@comment $NetBSD: PLIST,v 1.18 2013/04/03 10:51:50 markd Exp $
share/icons/oxygen/128x128/actions/address-book-new.png
share/icons/oxygen/128x128/actions/application-exit.png
share/icons/oxygen/128x128/actions/appointment-new.png
@@ -112,7 +112,6 @@ share/icons/oxygen/128x128/apps/internet-telephony.png
share/icons/oxygen/128x128/apps/internet-web-browser.png
share/icons/oxygen/128x128/apps/k3b.png
share/icons/oxygen/128x128/apps/kaffeine.png
-share/icons/oxygen/128x128/apps/karbon.png
share/icons/oxygen/128x128/apps/kblogger.png
share/icons/oxygen/128x128/apps/kbruch.png
share/icons/oxygen/128x128/apps/kbugbuster.png
@@ -122,13 +121,13 @@ share/icons/oxygen/128x128/apps/kde-windows.png
share/icons/oxygen/128x128/apps/kde.png
share/icons/oxygen/128x128/apps/kdevelop.png
share/icons/oxygen/128x128/apps/kdf.png
-share/icons/oxygen/128x128/apps/kexi.png
share/icons/oxygen/128x128/apps/kformula.png
share/icons/oxygen/128x128/apps/kgpg.png
share/icons/oxygen/128x128/apps/kig.png
share/icons/oxygen/128x128/apps/kivio.png
share/icons/oxygen/128x128/apps/kjournal.png
share/icons/oxygen/128x128/apps/klipper.png
+share/icons/oxygen/128x128/apps/kmag.png
share/icons/oxygen/128x128/apps/kmail2.png
share/icons/oxygen/128x128/apps/kmplayer.png
share/icons/oxygen/128x128/apps/knewsticker.png
@@ -143,7 +142,6 @@ share/icons/oxygen/128x128/apps/kplato.png
share/icons/oxygen/128x128/apps/kpresenter.png
share/icons/oxygen/128x128/apps/krdc.png
share/icons/oxygen/128x128/apps/krfb.png
-share/icons/oxygen/128x128/apps/krita.png
share/icons/oxygen/128x128/apps/ksnapshot.png
share/icons/oxygen/128x128/apps/ksniffer.png
share/icons/oxygen/128x128/apps/kspread.png
@@ -164,6 +162,7 @@ share/icons/oxygen/128x128/apps/office-calendar.png
share/icons/oxygen/128x128/apps/okteta.png
share/icons/oxygen/128x128/apps/oxygen.png
share/icons/oxygen/128x128/apps/partitionmanager.png
+share/icons/oxygen/128x128/apps/picmi.png
share/icons/oxygen/128x128/apps/planner.png
share/icons/oxygen/128x128/apps/plasma.png
share/icons/oxygen/128x128/apps/plasmagik.png
@@ -306,6 +305,8 @@ share/icons/oxygen/128x128/devices/printer-laser.png
share/icons/oxygen/128x128/devices/printer.png
share/icons/oxygen/128x128/devices/scanner.png
share/icons/oxygen/128x128/devices/secure-card.png
+share/icons/oxygen/128x128/devices/smartphone.png
+share/icons/oxygen/128x128/devices/tablet.png
share/icons/oxygen/128x128/devices/video-display.png
share/icons/oxygen/128x128/devices/video-projector.png
share/icons/oxygen/128x128/devices/video-television.png
@@ -420,6 +421,11 @@ share/icons/oxygen/128x128/mimetypes/application-x-java.png
share/icons/oxygen/128x128/mimetypes/application-x-javascript.png
share/icons/oxygen/128x128/mimetypes/application-x-k3b.png
share/icons/oxygen/128x128/mimetypes/application-x-kcsrc.png
+share/icons/oxygen/128x128/mimetypes/application-x-kexi-connectiondata.png
+share/icons/oxygen/128x128/mimetypes/application-x-kexiproject-shortcut.png
+share/icons/oxygen/128x128/mimetypes/application-x-kexiproject-sqlite.png
+share/icons/oxygen/128x128/mimetypes/application-x-kexiproject-sqlite2.png
+share/icons/oxygen/128x128/mimetypes/application-x-kexiproject-sqlite3.png
share/icons/oxygen/128x128/mimetypes/application-x-kformula.png
share/icons/oxygen/128x128/mimetypes/application-x-kgetlist.png
share/icons/oxygen/128x128/mimetypes/application-x-kontour.png
@@ -458,6 +464,8 @@ share/icons/oxygen/128x128/mimetypes/application-x-shockwave-flash.png
share/icons/oxygen/128x128/mimetypes/application-x-siag.png
share/icons/oxygen/128x128/mimetypes/application-x-smb-server.png
share/icons/oxygen/128x128/mimetypes/application-x-smb-workgroup.png
+share/icons/oxygen/128x128/mimetypes/application-x-sqlite2.png
+share/icons/oxygen/128x128/mimetypes/application-x-sqlite3.png
share/icons/oxygen/128x128/mimetypes/application-x-srt.png
share/icons/oxygen/128x128/mimetypes/application-x-srtrip.png
share/icons/oxygen/128x128/mimetypes/application-x-subrip.png
@@ -577,11 +585,13 @@ share/icons/oxygen/128x128/mimetypes/x-media-podcast.png
share/icons/oxygen/128x128/mimetypes/x-office-address-book.png
share/icons/oxygen/128x128/mimetypes/x-office-calendar.png
share/icons/oxygen/128x128/mimetypes/x-office-document.png
+share/icons/oxygen/128x128/mimetypes/x-office-presentation.png
share/icons/oxygen/128x128/mimetypes/x-office-spreadsheet.png
share/icons/oxygen/128x128/places/bookmarks.png
share/icons/oxygen/128x128/places/certificate-server.png
share/icons/oxygen/128x128/places/document-multiple.png
share/icons/oxygen/128x128/places/favorites.png
+share/icons/oxygen/128x128/places/folder-activities.png
share/icons/oxygen/128x128/places/folder-black.png
share/icons/oxygen/128x128/places/folder-blue.png
share/icons/oxygen/128x128/places/folder-bookmark.png
@@ -1290,7 +1300,6 @@ share/icons/oxygen/16x16/apps/internet-web-browser.png
share/icons/oxygen/16x16/apps/java.png
share/icons/oxygen/16x16/apps/k3b.png
share/icons/oxygen/16x16/apps/kaffeine.png
-share/icons/oxygen/16x16/apps/karbon.png
share/icons/oxygen/16x16/apps/kblogger.png
share/icons/oxygen/16x16/apps/kbruch.png
share/icons/oxygen/16x16/apps/kbugbuster.png
@@ -1300,13 +1309,13 @@ share/icons/oxygen/16x16/apps/kde-windows.png
share/icons/oxygen/16x16/apps/kde.png
share/icons/oxygen/16x16/apps/kdevelop.png
share/icons/oxygen/16x16/apps/kdf.png
-share/icons/oxygen/16x16/apps/kexi.png
share/icons/oxygen/16x16/apps/kformula.png
share/icons/oxygen/16x16/apps/kgpg.png
share/icons/oxygen/16x16/apps/kig.png
share/icons/oxygen/16x16/apps/kivio.png
share/icons/oxygen/16x16/apps/kjournal.png
share/icons/oxygen/16x16/apps/klipper.png
+share/icons/oxygen/16x16/apps/kmag.png
share/icons/oxygen/16x16/apps/kmplayer.png
share/icons/oxygen/16x16/apps/knewsticker.png
share/icons/oxygen/16x16/apps/knotes.png
@@ -1319,7 +1328,6 @@ share/icons/oxygen/16x16/apps/kplato.png
share/icons/oxygen/16x16/apps/kpresenter.png
share/icons/oxygen/16x16/apps/krdc.png
share/icons/oxygen/16x16/apps/krfb.png
-share/icons/oxygen/16x16/apps/krita.png
share/icons/oxygen/16x16/apps/ksnapshot.png
share/icons/oxygen/16x16/apps/ksniffer.png
share/icons/oxygen/16x16/apps/kspread.png
@@ -1339,6 +1347,7 @@ share/icons/oxygen/16x16/apps/office-calendar.png
share/icons/oxygen/16x16/apps/okteta.png
share/icons/oxygen/16x16/apps/oxygen.png
share/icons/oxygen/16x16/apps/partitionmanager.png
+share/icons/oxygen/16x16/apps/picmi.png
share/icons/oxygen/16x16/apps/plasma.png
share/icons/oxygen/16x16/apps/plasmagik.png
share/icons/oxygen/16x16/apps/preferences-contact-list.png
@@ -1481,6 +1490,8 @@ share/icons/oxygen/16x16/devices/phone.png
share/icons/oxygen/16x16/devices/printer.png
share/icons/oxygen/16x16/devices/scanner.png
share/icons/oxygen/16x16/devices/secure-card.png
+share/icons/oxygen/16x16/devices/smartphone.png
+share/icons/oxygen/16x16/devices/tablet.png
share/icons/oxygen/16x16/devices/video-display.png
share/icons/oxygen/16x16/devices/video-projector.png
share/icons/oxygen/16x16/devices/video-television.png
@@ -1616,6 +1627,11 @@ share/icons/oxygen/16x16/mimetypes/application-x-java.png
share/icons/oxygen/16x16/mimetypes/application-x-javascript.png
share/icons/oxygen/16x16/mimetypes/application-x-k3b.png
share/icons/oxygen/16x16/mimetypes/application-x-kcsrc.png
+share/icons/oxygen/16x16/mimetypes/application-x-kexi-connectiondata.png
+share/icons/oxygen/16x16/mimetypes/application-x-kexiproject-shortcut.png
+share/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite.png
+share/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite2.png
+share/icons/oxygen/16x16/mimetypes/application-x-kexiproject-sqlite3.png
share/icons/oxygen/16x16/mimetypes/application-x-kformula.png
share/icons/oxygen/16x16/mimetypes/application-x-kgetlist.png
share/icons/oxygen/16x16/mimetypes/application-x-kontour.png
@@ -1654,6 +1670,8 @@ share/icons/oxygen/16x16/mimetypes/application-x-shockwave-flash.png
share/icons/oxygen/16x16/mimetypes/application-x-siag.png
share/icons/oxygen/16x16/mimetypes/application-x-smb-server.png
share/icons/oxygen/16x16/mimetypes/application-x-smb-workgroup.png
+share/icons/oxygen/16x16/mimetypes/application-x-sqlite2.png
+share/icons/oxygen/16x16/mimetypes/application-x-sqlite3.png
share/icons/oxygen/16x16/mimetypes/application-x-srt.png
share/icons/oxygen/16x16/mimetypes/application-x-srtrip.png
share/icons/oxygen/16x16/mimetypes/application-x-subrip.png
@@ -1773,11 +1791,13 @@ share/icons/oxygen/16x16/mimetypes/x-office-address-book.png
share/icons/oxygen/16x16/mimetypes/x-office-calendar.png
share/icons/oxygen/16x16/mimetypes/x-office-contact.png
share/icons/oxygen/16x16/mimetypes/x-office-document.png
+share/icons/oxygen/16x16/mimetypes/x-office-presentation.png
share/icons/oxygen/16x16/mimetypes/x-office-spreadsheet.png
share/icons/oxygen/16x16/places/bookmarks.png
share/icons/oxygen/16x16/places/certificate-server.png
share/icons/oxygen/16x16/places/document-multiple.png
share/icons/oxygen/16x16/places/favorites.png
+share/icons/oxygen/16x16/places/folder-activities.png
share/icons/oxygen/16x16/places/folder-black.png
share/icons/oxygen/16x16/places/folder-blue.png
share/icons/oxygen/16x16/places/folder-bookmark.png
@@ -2563,12 +2583,12 @@ share/icons/oxygen/22x22/apps/kde-windows.png
share/icons/oxygen/22x22/apps/kde.png
share/icons/oxygen/22x22/apps/kdevelop.png
share/icons/oxygen/22x22/apps/kdf.png
-share/icons/oxygen/22x22/apps/kexi.png
share/icons/oxygen/22x22/apps/kformula.png
share/icons/oxygen/22x22/apps/kgpg.png
share/icons/oxygen/22x22/apps/kig.png
share/icons/oxygen/22x22/apps/kjournal.png
share/icons/oxygen/22x22/apps/klipper.png
+share/icons/oxygen/22x22/apps/kmag.png
share/icons/oxygen/22x22/apps/kmplayer.png
share/icons/oxygen/22x22/apps/knotes.png
share/icons/oxygen/22x22/apps/kolf.png
@@ -2580,7 +2600,6 @@ share/icons/oxygen/22x22/apps/kplato.png
share/icons/oxygen/22x22/apps/kpresenter.png
share/icons/oxygen/22x22/apps/krdc.png
share/icons/oxygen/22x22/apps/krfb.png
-share/icons/oxygen/22x22/apps/krita.png
share/icons/oxygen/22x22/apps/ksnapshot.png
share/icons/oxygen/22x22/apps/ksniffer.png
share/icons/oxygen/22x22/apps/kspread.png
@@ -2600,6 +2619,7 @@ share/icons/oxygen/22x22/apps/office-calendar.png
share/icons/oxygen/22x22/apps/okteta.png
share/icons/oxygen/22x22/apps/oxygen.png
share/icons/oxygen/22x22/apps/partitionmanager.png
+share/icons/oxygen/22x22/apps/picmi.png
share/icons/oxygen/22x22/apps/plasma.png
share/icons/oxygen/22x22/apps/plasmagik.png
share/icons/oxygen/22x22/apps/preferences-contact-list.png
@@ -2747,6 +2767,8 @@ share/icons/oxygen/22x22/devices/phone.png
share/icons/oxygen/22x22/devices/printer.png
share/icons/oxygen/22x22/devices/scanner.png
share/icons/oxygen/22x22/devices/secure-card.png
+share/icons/oxygen/22x22/devices/smartphone.png
+share/icons/oxygen/22x22/devices/tablet.png
share/icons/oxygen/22x22/devices/video-display.png
share/icons/oxygen/22x22/devices/video-projector.png
share/icons/oxygen/22x22/devices/video-television.png
@@ -2913,6 +2935,11 @@ share/icons/oxygen/22x22/mimetypes/application-x-java.png
share/icons/oxygen/22x22/mimetypes/application-x-javascript.png
share/icons/oxygen/22x22/mimetypes/application-x-k3b.png
share/icons/oxygen/22x22/mimetypes/application-x-kcsrc.png
+share/icons/oxygen/22x22/mimetypes/application-x-kexi-connectiondata.png
+share/icons/oxygen/22x22/mimetypes/application-x-kexiproject-shortcut.png
+share/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite.png
+share/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite2.png
+share/icons/oxygen/22x22/mimetypes/application-x-kexiproject-sqlite3.png
share/icons/oxygen/22x22/mimetypes/application-x-kformula.png
share/icons/oxygen/22x22/mimetypes/application-x-kgetlist.png
share/icons/oxygen/22x22/mimetypes/application-x-kontour.png
@@ -2951,6 +2978,8 @@ share/icons/oxygen/22x22/mimetypes/application-x-shockwave-flash.png
share/icons/oxygen/22x22/mimetypes/application-x-siag.png
share/icons/oxygen/22x22/mimetypes/application-x-smb-server.png
share/icons/oxygen/22x22/mimetypes/application-x-smb-workgroup.png
+share/icons/oxygen/22x22/mimetypes/application-x-sqlite2.png
+share/icons/oxygen/22x22/mimetypes/application-x-sqlite3.png
share/icons/oxygen/22x22/mimetypes/application-x-srt.png
share/icons/oxygen/22x22/mimetypes/application-x-srtrip.png
share/icons/oxygen/22x22/mimetypes/application-x-subrip.png
@@ -3073,11 +3102,13 @@ share/icons/oxygen/22x22/mimetypes/x-office-address-book.png
share/icons/oxygen/22x22/mimetypes/x-office-calendar.png
share/icons/oxygen/22x22/mimetypes/x-office-contact.png
share/icons/oxygen/22x22/mimetypes/x-office-document.png
+share/icons/oxygen/22x22/mimetypes/x-office-presentation.png
share/icons/oxygen/22x22/mimetypes/x-office-spreadsheet.png
share/icons/oxygen/22x22/places/bookmarks.png
share/icons/oxygen/22x22/places/certificate-server.png
share/icons/oxygen/22x22/places/document-multiple.png
share/icons/oxygen/22x22/places/favorites.png
+share/icons/oxygen/22x22/places/folder-activities.png
share/icons/oxygen/22x22/places/folder-black.png
share/icons/oxygen/22x22/places/folder-blue.png
share/icons/oxygen/22x22/places/folder-bookmark.png
@@ -3234,24 +3265,22 @@ share/icons/oxygen/256x256/apps/clock.png
share/icons/oxygen/256x256/apps/digikam.png
share/icons/oxygen/256x256/apps/internet-web-browser.png
share/icons/oxygen/256x256/apps/k3b.png
-share/icons/oxygen/256x256/apps/karbon.png
share/icons/oxygen/256x256/apps/kbruch.png
share/icons/oxygen/256x256/apps/kchart.png
share/icons/oxygen/256x256/apps/kde-windows.png
share/icons/oxygen/256x256/apps/kdevelop.png
share/icons/oxygen/256x256/apps/kdf.png
-share/icons/oxygen/256x256/apps/kexi.png
share/icons/oxygen/256x256/apps/kformula.png
share/icons/oxygen/256x256/apps/kgpg.png
share/icons/oxygen/256x256/apps/kig.png
share/icons/oxygen/256x256/apps/kivio.png
+share/icons/oxygen/256x256/apps/kmag.png
share/icons/oxygen/256x256/apps/kmail2.png
share/icons/oxygen/256x256/apps/konqueror.png
share/icons/oxygen/256x256/apps/kontact-import-wizard.png
share/icons/oxygen/256x256/apps/korgac.png
share/icons/oxygen/256x256/apps/kplato.png
share/icons/oxygen/256x256/apps/kpresenter.png
-share/icons/oxygen/256x256/apps/krita.png
share/icons/oxygen/256x256/apps/kspread.png
share/icons/oxygen/256x256/apps/kwalletmanager.png
share/icons/oxygen/256x256/apps/kword.png
@@ -3260,6 +3289,7 @@ share/icons/oxygen/256x256/apps/mameexecutor.png
share/icons/oxygen/256x256/apps/multimedia-volume-control.png
share/icons/oxygen/256x256/apps/oxygen.png
share/icons/oxygen/256x256/apps/partitionmanager.png
+share/icons/oxygen/256x256/apps/picmi.png
share/icons/oxygen/256x256/apps/planner.png
share/icons/oxygen/256x256/apps/preferences-desktop-locale.png
share/icons/oxygen/256x256/apps/preferences-desktop-screensaver.png
@@ -3323,6 +3353,8 @@ share/icons/oxygen/256x256/devices/network-wireless-disconnected.png
share/icons/oxygen/256x256/devices/network-wireless.png
share/icons/oxygen/256x256/devices/printer-laser.png
share/icons/oxygen/256x256/devices/secure-card.png
+share/icons/oxygen/256x256/devices/smartphone.png
+share/icons/oxygen/256x256/devices/tablet.png
share/icons/oxygen/256x256/devices/video-display.png
share/icons/oxygen/256x256/mimetypes/application-epub+zip.png
share/icons/oxygen/256x256/mimetypes/application-illustrator.png
@@ -3419,6 +3451,11 @@ share/icons/oxygen/256x256/mimetypes/application-x-java.png
share/icons/oxygen/256x256/mimetypes/application-x-javascript.png
share/icons/oxygen/256x256/mimetypes/application-x-k3b.png
share/icons/oxygen/256x256/mimetypes/application-x-kcsrc.png
+share/icons/oxygen/256x256/mimetypes/application-x-kexi-connectiondata.png
+share/icons/oxygen/256x256/mimetypes/application-x-kexiproject-shortcut.png
+share/icons/oxygen/256x256/mimetypes/application-x-kexiproject-sqlite.png
+share/icons/oxygen/256x256/mimetypes/application-x-kexiproject-sqlite2.png
+share/icons/oxygen/256x256/mimetypes/application-x-kexiproject-sqlite3.png
share/icons/oxygen/256x256/mimetypes/application-x-kformula.png
share/icons/oxygen/256x256/mimetypes/application-x-kgetlist.png
share/icons/oxygen/256x256/mimetypes/application-x-kontour.png
@@ -3456,6 +3493,8 @@ share/icons/oxygen/256x256/mimetypes/application-x-shockwave-flash.png
share/icons/oxygen/256x256/mimetypes/application-x-siag.png
share/icons/oxygen/256x256/mimetypes/application-x-smb-server.png
share/icons/oxygen/256x256/mimetypes/application-x-smb-workgroup.png
+share/icons/oxygen/256x256/mimetypes/application-x-sqlite2.png
+share/icons/oxygen/256x256/mimetypes/application-x-sqlite3.png
share/icons/oxygen/256x256/mimetypes/application-x-srt.png
share/icons/oxygen/256x256/mimetypes/application-x-srtrip.png
share/icons/oxygen/256x256/mimetypes/application-x-subrip.png
@@ -3573,9 +3612,11 @@ share/icons/oxygen/256x256/mimetypes/x-media-podcast.png
share/icons/oxygen/256x256/mimetypes/x-office-address-book.png
share/icons/oxygen/256x256/mimetypes/x-office-calendar.png
share/icons/oxygen/256x256/mimetypes/x-office-document.png
+share/icons/oxygen/256x256/mimetypes/x-office-presentation.png
share/icons/oxygen/256x256/mimetypes/x-office-spreadsheet.png
share/icons/oxygen/256x256/places/certificate-server.png
share/icons/oxygen/256x256/places/favorites.png
+share/icons/oxygen/256x256/places/folder-activities.png
share/icons/oxygen/256x256/places/folder-black.png
share/icons/oxygen/256x256/places/folder-blue.png
share/icons/oxygen/256x256/places/folder-bookmark.png
@@ -4255,7 +4296,6 @@ share/icons/oxygen/32x32/apps/internet-web-browser.png
share/icons/oxygen/32x32/apps/java.png
share/icons/oxygen/32x32/apps/k3b.png
share/icons/oxygen/32x32/apps/kaffeine.png
-share/icons/oxygen/32x32/apps/karbon.png
share/icons/oxygen/32x32/apps/kblogger.png
share/icons/oxygen/32x32/apps/kbruch.png
share/icons/oxygen/32x32/apps/kbugbuster.png
@@ -4265,13 +4305,13 @@ share/icons/oxygen/32x32/apps/kde-windows.png
share/icons/oxygen/32x32/apps/kde.png
share/icons/oxygen/32x32/apps/kdevelop.png
share/icons/oxygen/32x32/apps/kdf.png
-share/icons/oxygen/32x32/apps/kexi.png
share/icons/oxygen/32x32/apps/kformula.png
share/icons/oxygen/32x32/apps/kgpg.png
share/icons/oxygen/32x32/apps/kig.png
share/icons/oxygen/32x32/apps/kivio.png
share/icons/oxygen/32x32/apps/kjournal.png
share/icons/oxygen/32x32/apps/klipper.png
+share/icons/oxygen/32x32/apps/kmag.png
share/icons/oxygen/32x32/apps/kmplayer.png
share/icons/oxygen/32x32/apps/knewsticker.png
share/icons/oxygen/32x32/apps/knotes.png
@@ -4284,7 +4324,6 @@ share/icons/oxygen/32x32/apps/kplato.png
share/icons/oxygen/32x32/apps/kpresenter.png
share/icons/oxygen/32x32/apps/krdc.png
share/icons/oxygen/32x32/apps/krfb.png
-share/icons/oxygen/32x32/apps/krita.png
share/icons/oxygen/32x32/apps/ksnapshot.png
share/icons/oxygen/32x32/apps/ksniffer.png
share/icons/oxygen/32x32/apps/kspread.png
@@ -4304,6 +4343,7 @@ share/icons/oxygen/32x32/apps/office-calendar.png
share/icons/oxygen/32x32/apps/okteta.png
share/icons/oxygen/32x32/apps/oxygen.png
share/icons/oxygen/32x32/apps/partitionmanager.png
+share/icons/oxygen/32x32/apps/picmi.png
share/icons/oxygen/32x32/apps/plasma.png
share/icons/oxygen/32x32/apps/plasmagik.png
share/icons/oxygen/32x32/apps/preferences-contact-list.png
@@ -4455,6 +4495,8 @@ share/icons/oxygen/32x32/devices/printer-laser.png
share/icons/oxygen/32x32/devices/printer.png
share/icons/oxygen/32x32/devices/scanner.png
share/icons/oxygen/32x32/devices/secure-card.png
+share/icons/oxygen/32x32/devices/smartphone.png
+share/icons/oxygen/32x32/devices/tablet.png
share/icons/oxygen/32x32/devices/video-display.png
share/icons/oxygen/32x32/devices/video-projector.png
share/icons/oxygen/32x32/devices/video-television.png
@@ -4590,6 +4632,11 @@ share/icons/oxygen/32x32/mimetypes/application-x-java.png
share/icons/oxygen/32x32/mimetypes/application-x-javascript.png
share/icons/oxygen/32x32/mimetypes/application-x-k3b.png
share/icons/oxygen/32x32/mimetypes/application-x-kcsrc.png
+share/icons/oxygen/32x32/mimetypes/application-x-kexi-connectiondata.png
+share/icons/oxygen/32x32/mimetypes/application-x-kexiproject-shortcut.png
+share/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite.png
+share/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite2.png
+share/icons/oxygen/32x32/mimetypes/application-x-kexiproject-sqlite3.png
share/icons/oxygen/32x32/mimetypes/application-x-kformula.png
share/icons/oxygen/32x32/mimetypes/application-x-kgetlist.png
share/icons/oxygen/32x32/mimetypes/application-x-kontour.png
@@ -4628,6 +4675,8 @@ share/icons/oxygen/32x32/mimetypes/application-x-shockwave-flash.png
share/icons/oxygen/32x32/mimetypes/application-x-siag.png
share/icons/oxygen/32x32/mimetypes/application-x-smb-server.png
share/icons/oxygen/32x32/mimetypes/application-x-smb-workgroup.png
+share/icons/oxygen/32x32/mimetypes/application-x-sqlite2.png
+share/icons/oxygen/32x32/mimetypes/application-x-sqlite3.png
share/icons/oxygen/32x32/mimetypes/application-x-srt.png
share/icons/oxygen/32x32/mimetypes/application-x-srtrip.png
share/icons/oxygen/32x32/mimetypes/application-x-subrip.png
@@ -4748,11 +4797,13 @@ share/icons/oxygen/32x32/mimetypes/x-office-address-book.png
share/icons/oxygen/32x32/mimetypes/x-office-calendar.png
share/icons/oxygen/32x32/mimetypes/x-office-contact.png
share/icons/oxygen/32x32/mimetypes/x-office-document.png
+share/icons/oxygen/32x32/mimetypes/x-office-presentation.png
share/icons/oxygen/32x32/mimetypes/x-office-spreadsheet.png
share/icons/oxygen/32x32/places/bookmarks.png
share/icons/oxygen/32x32/places/certificate-server.png
share/icons/oxygen/32x32/places/document-multiple.png
share/icons/oxygen/32x32/places/favorites.png
+share/icons/oxygen/32x32/places/folder-activities.png
share/icons/oxygen/32x32/places/folder-black.png
share/icons/oxygen/32x32/places/folder-blue.png
share/icons/oxygen/32x32/places/folder-bookmark.png
@@ -5485,7 +5536,6 @@ share/icons/oxygen/48x48/apps/internet-web-browser.png
share/icons/oxygen/48x48/apps/java.png
share/icons/oxygen/48x48/apps/k3b.png
share/icons/oxygen/48x48/apps/kaffeine.png
-share/icons/oxygen/48x48/apps/karbon.png
share/icons/oxygen/48x48/apps/kblogger.png
share/icons/oxygen/48x48/apps/kbruch.png
share/icons/oxygen/48x48/apps/kbugbuster.png
@@ -5495,13 +5545,13 @@ share/icons/oxygen/48x48/apps/kde-windows.png
share/icons/oxygen/48x48/apps/kde.png
share/icons/oxygen/48x48/apps/kdevelop.png
share/icons/oxygen/48x48/apps/kdf.png
-share/icons/oxygen/48x48/apps/kexi.png
share/icons/oxygen/48x48/apps/kformula.png
share/icons/oxygen/48x48/apps/kgpg.png
share/icons/oxygen/48x48/apps/kig.png
share/icons/oxygen/48x48/apps/kivio.png
share/icons/oxygen/48x48/apps/kjournal.png
share/icons/oxygen/48x48/apps/klipper.png
+share/icons/oxygen/48x48/apps/kmag.png
share/icons/oxygen/48x48/apps/kmplayer.png
share/icons/oxygen/48x48/apps/knewsticker.png
share/icons/oxygen/48x48/apps/knotes.png
@@ -5514,7 +5564,6 @@ share/icons/oxygen/48x48/apps/kplato.png
share/icons/oxygen/48x48/apps/kpresenter.png
share/icons/oxygen/48x48/apps/krdc.png
share/icons/oxygen/48x48/apps/krfb.png
-share/icons/oxygen/48x48/apps/krita.png
share/icons/oxygen/48x48/apps/ksnapshot.png
share/icons/oxygen/48x48/apps/ksniffer.png
share/icons/oxygen/48x48/apps/kspread.png
@@ -5534,6 +5583,7 @@ share/icons/oxygen/48x48/apps/office-calendar.png
share/icons/oxygen/48x48/apps/okteta.png
share/icons/oxygen/48x48/apps/oxygen.png
share/icons/oxygen/48x48/apps/partitionmanager.png
+share/icons/oxygen/48x48/apps/picmi.png
share/icons/oxygen/48x48/apps/plasma.png
share/icons/oxygen/48x48/apps/plasmagik.png
share/icons/oxygen/48x48/apps/preferences-contact-list.png
@@ -5684,6 +5734,8 @@ share/icons/oxygen/48x48/devices/printer-laser.png
share/icons/oxygen/48x48/devices/printer.png
share/icons/oxygen/48x48/devices/scanner.png
share/icons/oxygen/48x48/devices/secure-card.png
+share/icons/oxygen/48x48/devices/smartphone.png
+share/icons/oxygen/48x48/devices/tablet.png
share/icons/oxygen/48x48/devices/video-display.png
share/icons/oxygen/48x48/devices/video-projector.png
share/icons/oxygen/48x48/devices/video-television.png
@@ -5803,6 +5855,11 @@ share/icons/oxygen/48x48/mimetypes/application-x-java.png
share/icons/oxygen/48x48/mimetypes/application-x-javascript.png
share/icons/oxygen/48x48/mimetypes/application-x-k3b.png
share/icons/oxygen/48x48/mimetypes/application-x-kcsrc.png
+share/icons/oxygen/48x48/mimetypes/application-x-kexi-connectiondata.png
+share/icons/oxygen/48x48/mimetypes/application-x-kexiproject-shortcut.png
+share/icons/oxygen/48x48/mimetypes/application-x-kexiproject-sqlite.png
+share/icons/oxygen/48x48/mimetypes/application-x-kexiproject-sqlite2.png
+share/icons/oxygen/48x48/mimetypes/application-x-kexiproject-sqlite3.png
share/icons/oxygen/48x48/mimetypes/application-x-kformula.png
share/icons/oxygen/48x48/mimetypes/application-x-kgetlist.png
share/icons/oxygen/48x48/mimetypes/application-x-kontour.png
@@ -5841,6 +5898,8 @@ share/icons/oxygen/48x48/mimetypes/application-x-shockwave-flash.png
share/icons/oxygen/48x48/mimetypes/application-x-siag.png
share/icons/oxygen/48x48/mimetypes/application-x-smb-server.png
share/icons/oxygen/48x48/mimetypes/application-x-smb-workgroup.png
+share/icons/oxygen/48x48/mimetypes/application-x-sqlite2.png
+share/icons/oxygen/48x48/mimetypes/application-x-sqlite3.png
share/icons/oxygen/48x48/mimetypes/application-x-srt.png
share/icons/oxygen/48x48/mimetypes/application-x-srtrip.png
share/icons/oxygen/48x48/mimetypes/application-x-subrip.png
@@ -5961,11 +6020,13 @@ share/icons/oxygen/48x48/mimetypes/x-office-address-book.png
share/icons/oxygen/48x48/mimetypes/x-office-calendar.png
share/icons/oxygen/48x48/mimetypes/x-office-contact.png
share/icons/oxygen/48x48/mimetypes/x-office-document.png
+share/icons/oxygen/48x48/mimetypes/x-office-presentation.png
share/icons/oxygen/48x48/mimetypes/x-office-spreadsheet.png
share/icons/oxygen/48x48/places/bookmarks.png
share/icons/oxygen/48x48/places/certificate-server.png
share/icons/oxygen/48x48/places/document-multiple.png
share/icons/oxygen/48x48/places/favorites.png
+share/icons/oxygen/48x48/places/folder-activities.png
share/icons/oxygen/48x48/places/folder-add.png
share/icons/oxygen/48x48/places/folder-black.png
share/icons/oxygen/48x48/places/folder-blue.png
@@ -6200,7 +6261,6 @@ share/icons/oxygen/64x64/apps/internet-telephony.png
share/icons/oxygen/64x64/apps/internet-web-browser.png
share/icons/oxygen/64x64/apps/k3b.png
share/icons/oxygen/64x64/apps/kaffeine.png
-share/icons/oxygen/64x64/apps/karbon.png
share/icons/oxygen/64x64/apps/kblogger.png
share/icons/oxygen/64x64/apps/kbruch.png
share/icons/oxygen/64x64/apps/kbugbuster.png
@@ -6210,13 +6270,13 @@ share/icons/oxygen/64x64/apps/kde-windows.png
share/icons/oxygen/64x64/apps/kde.png
share/icons/oxygen/64x64/apps/kdevelop.png
share/icons/oxygen/64x64/apps/kdf.png
-share/icons/oxygen/64x64/apps/kexi.png
share/icons/oxygen/64x64/apps/kformula.png
share/icons/oxygen/64x64/apps/kgpg.png
share/icons/oxygen/64x64/apps/kig.png
share/icons/oxygen/64x64/apps/kivio.png
share/icons/oxygen/64x64/apps/kjournal.png
share/icons/oxygen/64x64/apps/klipper.png
+share/icons/oxygen/64x64/apps/kmag.png
share/icons/oxygen/64x64/apps/kmplayer.png
share/icons/oxygen/64x64/apps/knewsticker.png
share/icons/oxygen/64x64/apps/knotes.png
@@ -6230,7 +6290,6 @@ share/icons/oxygen/64x64/apps/kplato.png
share/icons/oxygen/64x64/apps/kpresenter.png
share/icons/oxygen/64x64/apps/krdc.png
share/icons/oxygen/64x64/apps/krfb.png
-share/icons/oxygen/64x64/apps/krita.png
share/icons/oxygen/64x64/apps/ksnapshot.png
share/icons/oxygen/64x64/apps/ksniffer.png
share/icons/oxygen/64x64/apps/kspread.png
@@ -6249,6 +6308,7 @@ share/icons/oxygen/64x64/apps/office-calendar.png
share/icons/oxygen/64x64/apps/okteta.png
share/icons/oxygen/64x64/apps/oxygen.png
share/icons/oxygen/64x64/apps/partitionmanager.png
+share/icons/oxygen/64x64/apps/picmi.png
share/icons/oxygen/64x64/apps/planner.png
share/icons/oxygen/64x64/apps/plasma.png
share/icons/oxygen/64x64/apps/plasmagik.png
@@ -6388,6 +6448,8 @@ share/icons/oxygen/64x64/devices/phone.png
share/icons/oxygen/64x64/devices/printer-laser.png
share/icons/oxygen/64x64/devices/printer.png
share/icons/oxygen/64x64/devices/scanner.png
+share/icons/oxygen/64x64/devices/smartphone.png
+share/icons/oxygen/64x64/devices/tablet.png
share/icons/oxygen/64x64/devices/video-display.png
share/icons/oxygen/64x64/devices/video-projector.png
share/icons/oxygen/64x64/devices/video-television.png
@@ -6504,6 +6566,11 @@ share/icons/oxygen/64x64/mimetypes/application-x-java.png
share/icons/oxygen/64x64/mimetypes/application-x-javascript.png
share/icons/oxygen/64x64/mimetypes/application-x-k3b.png
share/icons/oxygen/64x64/mimetypes/application-x-kcsrc.png
+share/icons/oxygen/64x64/mimetypes/application-x-kexi-connectiondata.png
+share/icons/oxygen/64x64/mimetypes/application-x-kexiproject-shortcut.png
+share/icons/oxygen/64x64/mimetypes/application-x-kexiproject-sqlite.png
+share/icons/oxygen/64x64/mimetypes/application-x-kexiproject-sqlite2.png
+share/icons/oxygen/64x64/mimetypes/application-x-kexiproject-sqlite3.png
share/icons/oxygen/64x64/mimetypes/application-x-kformula.png
share/icons/oxygen/64x64/mimetypes/application-x-kgetlist.png
share/icons/oxygen/64x64/mimetypes/application-x-kontour.png
@@ -6542,6 +6609,8 @@ share/icons/oxygen/64x64/mimetypes/application-x-shockwave-flash.png
share/icons/oxygen/64x64/mimetypes/application-x-siag.png
share/icons/oxygen/64x64/mimetypes/application-x-smb-server.png
share/icons/oxygen/64x64/mimetypes/application-x-smb-workgroup.png
+share/icons/oxygen/64x64/mimetypes/application-x-sqlite2.png
+share/icons/oxygen/64x64/mimetypes/application-x-sqlite3.png
share/icons/oxygen/64x64/mimetypes/application-x-srt.png
share/icons/oxygen/64x64/mimetypes/application-x-srtrip.png
share/icons/oxygen/64x64/mimetypes/application-x-subrip.png
@@ -6660,11 +6729,13 @@ share/icons/oxygen/64x64/mimetypes/x-media-podcast.png
share/icons/oxygen/64x64/mimetypes/x-office-address-book.png
share/icons/oxygen/64x64/mimetypes/x-office-calendar.png
share/icons/oxygen/64x64/mimetypes/x-office-document.png
+share/icons/oxygen/64x64/mimetypes/x-office-presentation.png
share/icons/oxygen/64x64/mimetypes/x-office-spreadsheet.png
share/icons/oxygen/64x64/places/bookmarks.png
share/icons/oxygen/64x64/places/certificate-server.png
share/icons/oxygen/64x64/places/document-multiple.png
share/icons/oxygen/64x64/places/favorites.png
+share/icons/oxygen/64x64/places/folder-activities.png
share/icons/oxygen/64x64/places/folder-black.png
share/icons/oxygen/64x64/places/folder-blue.png
share/icons/oxygen/64x64/places/folder-bookmark.png
diff --git a/graphics/oxygen-icons/distinfo b/graphics/oxygen-icons/distinfo
index 3bc600b851c..b187e1090bb 100644
--- a/graphics/oxygen-icons/distinfo
+++ b/graphics/oxygen-icons/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2012/06/16 04:45:29 markd Exp $
+$NetBSD: distinfo,v 1.18 2013/04/03 10:51:50 markd Exp $
-SHA1 (oxygen-icons-4.8.4.tar.xz) = 4034b61585db7e8c03f3270d860aa7443f1a6193
-RMD160 (oxygen-icons-4.8.4.tar.xz) = b09007eaeb6c83bac88a28454481838a8f206dbe
-Size (oxygen-icons-4.8.4.tar.xz) = 310955984 bytes
+SHA1 (oxygen-icons-4.10.2.tar.xz) = 8fa10b765c64b52fa4b0d1f8ea6f3dad709d7d6a
+RMD160 (oxygen-icons-4.10.2.tar.xz) = 65f1c31f1f4b9df0592d66eccc56ba7498fd5964
+Size (oxygen-icons-4.10.2.tar.xz) = 277512988 bytes
diff --git a/graphics/svgpart/Makefile b/graphics/svgpart/Makefile
index 6553a152da7..332d8babf90 100644
--- a/graphics/svgpart/Makefile
+++ b/graphics/svgpart/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:22:32 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:12 markd Exp $
DISTNAME= svgpart-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= graphics
COMMENT= KDE svg part
diff --git a/graphics/svgpart/distinfo b/graphics/svgpart/distinfo
index 64a45d0a13e..4c98eb89160 100644
--- a/graphics/svgpart/distinfo
+++ b/graphics/svgpart/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:12 markd Exp $
-SHA1 (svgpart-4.8.4.tar.xz) = 3c202f0a58035c56e7e46a983c254a6284b97ee9
-RMD160 (svgpart-4.8.4.tar.xz) = 0e6251c0de263ccc0ce94b55deac36ba5b92b9c5
-Size (svgpart-4.8.4.tar.xz) = 9344 bytes
+SHA1 (svgpart-4.10.2.tar.xz) = a361a8361fb123cb4b6498dba3b2d88293d88344
+RMD160 (svgpart-4.10.2.tar.xz) = ffcd2bbadfe28acff6827b69d0b26c2e2384e298
+Size (svgpart-4.10.2.tar.xz) = 9184 bytes
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index ece0edb7e03..1ca0516ca1f 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:19:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:56 markd Exp $
DISTNAME= analitza-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= math
COMMENT= KDE library for mathematical features
diff --git a/math/analitza/PLIST b/math/analitza/PLIST
index c614b43d00d..86d234edfa4 100644
--- a/math/analitza/PLIST
+++ b/math/analitza/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 07:30:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:56 markd Exp $
bin/calgebra
include/analitza/abstractlexer.h
include/analitza/analitzaexport.h
@@ -6,6 +6,7 @@ include/analitza/analitzautils.h
include/analitza/analyzer.h
include/analitza/builtinmethods.h
include/analitza/expression.h
+include/analitza/expressionstream.h
include/analitza/expressiontype.h
include/analitza/importqobjectmetatype.h
include/analitza/object.h
@@ -14,23 +15,36 @@ include/analitza/operator.h
include/analitza/value.h
include/analitza/variable.h
include/analitza/variables.h
+include/analitza/vector.h
include/analitzagui/algebrahighlighter.h
include/analitzagui/analitzaguiexport.h
include/analitzagui/expressionedit.h
-include/analitzagui/function.h
-include/analitzagui/functionfactory.h
-include/analitzagui/functionsmodel.h
-include/analitzagui/functionspainter.h
-include/analitzagui/functionsview.h
-include/analitzagui/graph2d.h
include/analitzagui/operatorsmodel.h
+include/analitzagui/plotsview2d.h
+include/analitzagui/plotsview3d.h
include/analitzagui/variablesmodel.h
+include/analitzaplot/analitzaplotexport.h
+include/analitzaplot/functiongraph.h
+include/analitzaplot/planecurve.h
+include/analitzaplot/plotitem.h
+include/analitzaplot/plotsdictionarymodel.h
+include/analitzaplot/plotsfactory.h
+include/analitzaplot/plotsmodel.h
+include/analitzaplot/plotter2d.h
+include/analitzaplot/plotter3d.h
+include/analitzaplot/plottingenums.h
+include/analitzaplot/spacecurve.h
+include/analitzaplot/surface.h
lib/cmake/analitza/AnalitzaConfig.cmake
-lib/cmake/analitza/AnalitzaTargets-relwithdebinfo.cmake
+lib/cmake/analitza/AnalitzaTargets-${TARGET}.cmake
lib/cmake/analitza/AnalitzaTargets.cmake
lib/libanalitza.so
lib/libanalitza.so.4
-lib/libanalitza.so.4.8.0
+lib/libanalitza.so.${PKGVERSION}
lib/libanalitzagui.so
lib/libanalitzagui.so.4
-lib/libanalitzagui.so.4.8.0
+lib/libanalitzagui.so.${PKGVERSION}
+lib/libanalitzaplot.so
+lib/libanalitzaplot.so.4
+lib/libanalitzaplot.so.${PKGVERSION}
+share/kde/apps/libanalitza/plots/basic_curves.plots
diff --git a/math/analitza/distinfo b/math/analitza/distinfo
index c3e45aa89c3..1fc6eb1ee3d 100644
--- a/math/analitza/distinfo
+++ b/math/analitza/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:56 markd Exp $
-SHA1 (analitza-4.8.4.tar.xz) = d3b831730408078c31b686bc49c1d465de5e80da
-RMD160 (analitza-4.8.4.tar.xz) = 269f2e1e947d5d62adcef70dff807ff72b8d6b3f
-Size (analitza-4.8.4.tar.xz) = 146556 bytes
+SHA1 (analitza-4.10.2.tar.xz) = e4acd6859140c3860eead695c2f20195b8df0a4a
+RMD160 (analitza-4.10.2.tar.xz) = fa3145c00385bee8ea2e72e4c2b866d38161b69a
+Size (analitza-4.10.2.tar.xz) = 178632 bytes
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index d0004d31625..4345788ec8f 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:03 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:57 markd Exp $
DISTNAME= cantor-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= math
COMMENT= KDE frontend to mathematical software
diff --git a/math/cantor/PLIST b/math/cantor/PLIST
index 146d502511b..935356f87b7 100644
--- a/math/cantor/PLIST
+++ b/math/cantor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 07:30:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:57 markd Exp $
bin/cantor
include/cantor/animationresult.h
include/cantor/backend.h
@@ -39,7 +39,7 @@ lib/kde4/cantor_variablemanagerplugin.so
lib/kde4/libcantorpart.so
lib/libcantor_config.so
lib/libcantorlibs.so
-lib/libcantorlibs.so.0.0.3
+lib/libcantorlibs.so.0.0.4
lib/libcantorlibs.so.1
share/applications/kde4/cantor.desktop
share/doc/kde/HTML/en/cantor/common
@@ -70,11 +70,13 @@ share/kde/apps/cantor/cantor_runscript_assistant.rc
share/kde/apps/cantor/cantor_scripteditor.rc
share/kde/apps/cantor/cantor_shell.rc
share/kde/apps/cantor/cantor_solve_assistant.rc
+share/kde/apps/cantor/maximabackend/cantor-initmaxima.lisp
share/kde/apps/cantor/maximabackend/keywords.xml
share/kde/apps/cantor/octavebackend/cantor_eigenvectors.m
share/kde/apps/cantor/octavebackend/cantor_plot2d.m
share/kde/apps/cantor/octavebackend/cantor_plot3d.m
share/kde/apps/cantor/octavebackend/cantor_print.m
+share/kde/apps/cantor/sagebackend/keywords.xml
share/kde/apps/cantor/scilabbackend/keywords.xml
share/kde/apps/cantor/xslt/latex.xsl
share/kde/config.kcfg/cantor.kcfg
diff --git a/math/cantor/distinfo b/math/cantor/distinfo
index ed87c8dd629..6da04ac9f9d 100644
--- a/math/cantor/distinfo
+++ b/math/cantor/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:57 markd Exp $
-SHA1 (cantor-4.8.4.tar.xz) = 8e284e632144a92f503092738d19843272d0412e
-RMD160 (cantor-4.8.4.tar.xz) = 3408b33bfd3e3216f9953e3c835f4428c55f65ad
-Size (cantor-4.8.4.tar.xz) = 272996 bytes
+SHA1 (cantor-4.10.2.tar.xz) = 7611cb379889f87908931ba25a2de9072de75e22
+RMD160 (cantor-4.10.2.tar.xz) = c0e01c04a8f4ac266f1d3968d02f344e6c87e05f
+Size (cantor-4.10.2.tar.xz) = 318600 bytes
diff --git a/math/kalgebra/Makefile b/math/kalgebra/Makefile
index 6b0d99539ea..e42ca6f4578 100644
--- a/math/kalgebra/Makefile
+++ b/math/kalgebra/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:58 markd Exp $
DISTNAME= kalgebra-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= math
COMMENT= KDE graph calculator
diff --git a/math/kalgebra/PLIST b/math/kalgebra/PLIST
index a53e45a118e..3a6d0047dca 100644
--- a/math/kalgebra/PLIST
+++ b/math/kalgebra/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 07:30:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:58 markd Exp $
bin/kalgebra
bin/kalgebramobile
+lib/kde4/imports/org/kde/analitza/Graph2D.qml
+lib/kde4/imports/org/kde/analitza/libanalitzadeclarativeplugin.so
+lib/kde4/imports/org/kde/analitza/qmldir
lib/kde4/plasma_applet_kalgebra.so
share/applications/kde4/kalgebra.desktop
share/applications/kde4/kalgebramobile.desktop
@@ -19,23 +22,30 @@ share/icons/hicolor/32x32/apps/kalgebra.png
share/icons/hicolor/48x48/apps/kalgebra.png
share/icons/hicolor/64x64/apps/kalgebra.png
share/icons/hicolor/scalable/apps/kalgebra.svgz
-share/kde/apps/kalgebra/plugins/Console.qml
-share/kde/apps/kalgebra/plugins/Graph2D.qml
-share/kde/apps/kalgebra/plugins/Plot2D.qml
-share/kde/apps/kalgebra/plugins/Tables.qml
-share/kde/apps/kalgebra/plugins/kalgebraconsole.desktop
-share/kde/apps/kalgebra/plugins/kalgebraplot2d.desktop
-share/kde/apps/kalgebra/plugins/kalgebratables.desktop
-share/kde/apps/kalgebra/plugins/widgets/Button.qml
-share/kde/apps/kalgebra/plugins/widgets/CalcButton.qml
-share/kde/apps/kalgebra/plugins/widgets/ExpressionInput.qml
-share/kde/apps/kalgebra/plugins/widgets/KAlgebraMobile.qml
-share/kde/apps/kalgebra/plugins/widgets/KAlgebraPage.qml
-share/kde/apps/kalgebra/plugins/widgets/Keyboard.qml
-share/kde/apps/kalgebra/plugins/widgets/Label.qml
-share/kde/apps/kalgebra/plugins/widgets/RealInput.qml
-share/kde/apps/kalgebra/plugins/widgets/SimpleListView.qml
-share/kde/apps/kalgebra/plugins/widgets/ToolTip.qml
+share/kde/apps/kalgebramobile/plugins/About.qml
+share/kde/apps/kalgebramobile/plugins/Console.qml
+share/kde/apps/kalgebramobile/plugins/Plot2D.qml
+share/kde/apps/kalgebramobile/plugins/Tables.qml
+share/kde/apps/kalgebramobile/plugins/VariablesView.qml
+share/kde/apps/kalgebramobile/plugins/kalgebraabout.desktop
+share/kde/apps/kalgebramobile/plugins/kalgebraconsole.desktop
+share/kde/apps/kalgebramobile/plugins/kalgebraplot2d.desktop
+share/kde/apps/kalgebramobile/plugins/kalgebratables.desktop
+share/kde/apps/kalgebramobile/plugins/kalgebravariables.desktop
+share/kde/apps/kalgebramobile/plugins/widgets/Button.qml
+share/kde/apps/kalgebramobile/plugins/widgets/CalcButton.qml
+share/kde/apps/kalgebramobile/plugins/widgets/ExpressionInput.qml
+share/kde/apps/kalgebramobile/plugins/widgets/KAlgebraMobile.qml
+share/kde/apps/kalgebramobile/plugins/widgets/KAlgebraPage.qml
+share/kde/apps/kalgebramobile/plugins/widgets/Keyboard.qml
+share/kde/apps/kalgebramobile/plugins/widgets/Label.qml
+share/kde/apps/kalgebramobile/plugins/widgets/RealInput.qml
+share/kde/apps/kalgebramobile/plugins/widgets/SimpleListView.qml
+share/kde/apps/kalgebramobile/plugins/widgets/ToolTip.qml
+share/kde/apps/kalgebramobile/plugins/widgets/qmldir
share/kde/apps/katepart/syntax/kalgebra.xml
+share/kde/apps/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/org.kde.graphsplasmoid/contents/ui/main.qml
+share/kde/apps/plasma/plasmoids/org.kde.graphsplasmoid/metadata.desktop
+share/kde4/services/graphsplasmoid.desktop
share/kde4/services/kalgebraplasmoid.desktop
-share/kde4/servicetypes/kalgebrascript.desktop
diff --git a/math/kalgebra/distinfo b/math/kalgebra/distinfo
index 0b83dbb9417..3cdacabf996 100644
--- a/math/kalgebra/distinfo
+++ b/math/kalgebra/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:58 markd Exp $
-SHA1 (kalgebra-4.8.4.tar.xz) = be0bcd290c61713a0365e9eab2ddc8d58f447f34
-RMD160 (kalgebra-4.8.4.tar.xz) = 189031f8f7306e30c2e53e5d13b165a1017131ef
-Size (kalgebra-4.8.4.tar.xz) = 424864 bytes
+SHA1 (kalgebra-4.10.2.tar.xz) = f029006b89aa75e6584836a90832f5130fff49b5
+RMD160 (kalgebra-4.10.2.tar.xz) = 91da1a350016e56a485a404715c4f0957b8a973f
+Size (kalgebra-4.10.2.tar.xz) = 446028 bytes
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index dc70bf0923d..696df979a78 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:24 markd Exp $
DISTNAME= kcalc-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= math
COMMENT= KDE scientific calculator
@@ -10,6 +9,7 @@ COMMENT= KDE scientific calculator
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../devel/gmp/buildlink3.mk"
+.include "../../math/mpfr/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 850e0828aff..a8661629e84 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:31 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:24 markd Exp $
-SHA1 (kcalc-4.8.4.tar.xz) = f1cb6cda210c67fd19eca387df2d2224393d45ef
-RMD160 (kcalc-4.8.4.tar.xz) = b291c9a62b9cd129a936301ec0875581ee8d56f6
-Size (kcalc-4.8.4.tar.xz) = 89360 bytes
+SHA1 (kcalc-4.10.2.tar.xz) = 45f2a3eb557891e3c47a00dafb9ad3bd64bde4d8
+RMD160 (kcalc-4.10.2.tar.xz) = 863148b798a1ab09eb137545fd7ce8ce395ee3c8
+Size (kcalc-4.10.2.tar.xz) = 93980 bytes
+SHA1 (patch-CMakeLists.txt) = 3267b41b6a6a25a18b3dc450747beedb2976b45e
+SHA1 (patch-knumber_knumber_float.cpp) = 413c778069c0d38272e67b00eaca1a76a933e5cb
+SHA1 (patch-knumber_tests_CMakeLists.txt) = 7d159f617903b778e65615cb73a81f40f1d262df
diff --git a/math/kcalc/patches/patch-CMakeLists.txt b/math/kcalc/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..9a98ee0945b
--- /dev/null
+++ b/math/kcalc/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/03 10:52:24 markd Exp $
+
+use mpfr (alternate code doesnt build on BSD)
+
+--- CMakeLists.txt.orig 2013-04-01 23:12:26.000000000 +0000
++++ CMakeLists.txt
+@@ -36,6 +36,9 @@ if(NOT GMP_FOUND)
+ endif()
+ endif(NOT GMP_FOUND)
+
++find_package (MPFR REQUIRED)
++add_definitions (-DKNUMBER_USE_MPFR)
++
+ include(CheckTypeSize)
+ include(CheckFunctionExists)
+ include(CheckIncludeFiles)
diff --git a/math/kcalc/patches/patch-knumber_knumber_float.cpp b/math/kcalc/patches/patch-knumber_knumber_float.cpp
new file mode 100644
index 00000000000..2005cec6fb1
--- /dev/null
+++ b/math/kcalc/patches/patch-knumber_knumber_float.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-knumber_knumber_float.cpp,v 1.1 2013/04/03 10:52:24 markd Exp $
+
+use namespace std for isinf() and isnan()
+
+--- knumber/knumber_float.cpp.orig 2013-03-01 07:05:02.000000000 +0000
++++ knumber/knumber_float.cpp
+@@ -25,6 +25,8 @@ along with this program. If not, see <h
+ #include <QDebug>
+ #include <cmath>
+
++using namespace std;
++
+ // NOTE: these assume IEEE floats..
+ #ifndef HAVE_FUNC_ISINF
+ #define isinf(x) ((x) != 0.0 && (x) + (x) == (x))
diff --git a/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt b/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt
new file mode 100644
index 00000000000..1875ebacb93
--- /dev/null
+++ b/math/kcalc/patches/patch-knumber_tests_CMakeLists.txt
@@ -0,0 +1,12 @@
+$NetBSD: patch-knumber_tests_CMakeLists.txt,v 1.1 2013/04/03 10:52:24 markd Exp $
+
+use mpfr (alternate code doesnt build on BSD)
+
+--- knumber/tests/CMakeLists.txt.orig 2013-03-01 07:05:02.000000000 +0000
++++ knumber/tests/CMakeLists.txt
+@@ -5,4 +5,4 @@ set(knumbertest_SRCS knumbertest.cpp ${l
+
+ kde4_add_unit_test(knumbertest TESTNAME KNumber ${knumbertest_SRCS})
+
+-target_link_libraries(knumbertest ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES})
++target_link_libraries(knumbertest ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES} ${MPFR_LIBRARIES})
diff --git a/meta-pkgs/kde4/Makefile b/meta-pkgs/kde4/Makefile
index c250e5ff683..00a1324ea18 100644
--- a/meta-pkgs/kde4/Makefile
+++ b/meta-pkgs/kde4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2012/10/03 21:56:41 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/03 10:51:43 markd Exp $
-DISTNAME= kde4-4.8.4
-PKGREVISION= 1
+DISTNAME= kde4-4.10.2
CATEGORIES= meta-pkgs x11 kde
MASTER_SITES= # empty
DISTFILES= # empty
@@ -10,77 +9,124 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.kde.org/
COMMENT= "meta-package" for the KDE4 integrated X11 desktop
-DEPENDS+= oxygen-icons-4.8.4{,nb[0-9]*}:../../graphics/oxygen-icons
-DEPENDS+= kdelibs4-4.8.4{,nb[0-9]*}:../../x11/kdelibs4
-DEPENDS+= kdepimlibs4-4.8.4{,nb[0-9]*}:../../misc/kdepimlibs4
-DEPENDS+= kde-runtime4-4.8.4{,nb[0-9]*}:../../x11/kde-runtime4
-DEPENDS+= kde-workspace4-4.8.4{,nb[0-9]*}:../../x11/kde-workspace4
-DEPENDS+= kde-wallpapers4-4.8.4{,nb[0-9]*}:../../misc/kde-wallpapers4
-DEPENDS+= kde-baseapps4-4.8.4{,nb[0-9]*}:../../x11/kde-baseapps4
-DEPENDS+= konsole-4.8.4{,nb[0-9]*}:../../x11/konsole
-DEPENDS+= kaccessible-4.8.4{,nb[0-9]*}:../../misc/kaccessible
-DEPENDS+= kmag-4.8.4{,nb[0-9]*}:../../misc/kmag
-DEPENDS+= kmouth-4.8.4{,nb[0-9]*}:../../misc/kmouth
-DEPENDS+= kmousetool-4.8.4{,nb[0-9]*}:../../misc/kmousetool
-DEPENDS+= kdeadmin4-4.8.4{,nb[0-9]*}:../../misc/kdeadmin4
-DEPENDS+= kdeartwork4-4.8.4{,nb[0-9]*}:../../misc/kdeartwork4
-DEPENDS+= marble-4.8.4{,nb[0-9]*}:../../misc/marble
-DEPENDS+= blinken-4.8.4{,nb[0-9]*}:../../games/blinken
-DEPENDS+= analitza-4.8.4{,nb[0-9]*}:../../math/analitza
-DEPENDS+= cantor-4.8.4{,nb[0-9]*}:../../math/cantor
-DEPENDS+= kalgebra-4.8.4{,nb[0-9]*}:../../math/kalgebra
-DEPENDS+= kalzium-4.8.4{,nb[0-9]*}:../../misc/kalzium
-DEPENDS+= kanagram-4.8.4{,nb[0-9]*}:../../games/kanagram
-DEPENDS+= kbruch-4.8.4{,nb[0-9]*}:../../misc/kbruch
-DEPENDS+= kgeography-4.8.4{,nb[0-9]*}:../../misc/kgeography
-DEPENDS+= khangman-4.8.4{,nb[0-9]*}:../../games/khangman
-DEPENDS+= kig-4.8.4{,nb[0-9]*}:../../misc/kig
-DEPENDS+= kiten-4.8.4{,nb[0-9]*}:../../misc/kiten
-DEPENDS+= klettres-4.8.4{,nb[0-9]*}:../../misc/klettres
-DEPENDS+= kstars-4.8.4{,nb[0-9]*}:../../misc/kstars
-DEPENDS+= ktouch-4.8.4{,nb[0-9]*}:../../misc/ktouch
-DEPENDS+= kturtle-4.8.4{,nb[0-9]*}:../../misc/kturtle
-DEPENDS+= kwordquiz-4.8.4{,nb[0-9]*}:../../misc/kwordquiz
-DEPENDS+= parley-4.8.4{,nb[0-9]*}:../../misc/parley
-DEPENDS+= rocs-4.8.4{,nb[0-9]*}:../../misc/rocs
-DEPENDS+= step-4.8.4{,nb[0-9]*}:../../misc/step
-DEPENDS+= kdegames4-4.8.4{,nb[0-9]*}:../../games/kdegames4
-DEPENDS+= kamera-4.8.4{,nb[0-9]*}:../../graphics/kamera
-DEPENDS+= gwenview-4.8.4{,nb[0-9]*}:../../graphics/gwenview
-DEPENDS+= ksaneplugin-4.8.4{,nb[0-9]*}:../../graphics/ksaneplugin
-DEPENDS+= ksnapshot-4.8.4{,nb[0-9]*}:../../graphics/ksnapshot
-DEPENDS+= kcolorchooser-4.8.4{,nb[0-9]*}:../../graphics/kcolorchooser
-DEPENDS+= kgamma-4.8.4{,nb[0-9]*}:../../graphics/kgamma
-DEPENDS+= kruler-4.8.4{,nb[0-9]*}:../../graphics/kruler
-DEPENDS+= kolourpaint-4.8.4{,nb[0-9]*}:../../graphics/kolourpaint
-DEPENDS+= okular-4.8.4{,nb[0-9]*}:../../print/okular
-DEPENDS+= kdegraphics-mobipocket-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-mobipocket
-DEPENDS+= kdegraphics-strigi-analyzer-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-strigi-analyzer
-DEPENDS+= kdegraphics-thumbnailers-4.8.4{,nb[0-9]*}:../../graphics/kdegraphics-thumbnailers
-DEPENDS+= svgpart-4.8.4{,nb[0-9]*}:../../graphics/svgpart
-DEPENDS+= kdemultimedia4-4.8.4{,nb[0-9]*}:../../multimedia/kdemultimedia4
-DEPENDS+= kdenetwork4-4.8.4{,nb[0-9]*}:../../net/kdenetwork4
+DEPENDS+= oxygen-icons-4.10.2{,nb[0-9]*}:../../graphics/oxygen-icons
+DEPENDS+= kdelibs4-4.10.2{,nb[0-9]*}:../../x11/kdelibs4
+DEPENDS+= kdepimlibs4-4.10.2{,nb[0-9]*}:../../misc/kdepimlibs4
+DEPENDS+= kde-runtime4-4.10.2{,nb[0-9]*}:../../x11/kde-runtime4
+DEPENDS+= kde-workspace4-4.10.2{,nb[0-9]*}:../../x11/kde-workspace4
+DEPENDS+= kde-wallpapers4-4.10.2{,nb[0-9]*}:../../misc/kde-wallpapers4
+DEPENDS+= kde-baseapps4-4.10.2{,nb[0-9]*}:../../x11/kde-baseapps4
+DEPENDS+= konsole-4.10.2{,nb[0-9]*}:../../x11/konsole
+DEPENDS+= kaccessible-4.10.2{,nb[0-9]*}:../../misc/kaccessible
+DEPENDS+= kmag-4.10.2{,nb[0-9]*}:../../misc/kmag
+DEPENDS+= kmouth-4.10.2{,nb[0-9]*}:../../misc/kmouth
+DEPENDS+= kmousetool-4.10.2{,nb[0-9]*}:../../misc/kmousetool
+DEPENDS+= kdeadmin4-4.10.2{,nb[0-9]*}:../../misc/kdeadmin4
+DEPENDS+= kdeartwork4-4.10.2{,nb[0-9]*}:../../misc/kdeartwork4
+DEPENDS+= marble-4.10.2{,nb[0-9]*}:../../misc/marble
+DEPENDS+= blinken-4.10.2{,nb[0-9]*}:../../games/blinken
+DEPENDS+= analitza-4.10.2{,nb[0-9]*}:../../math/analitza
+DEPENDS+= cantor-4.10.2{,nb[0-9]*}:../../math/cantor
+DEPENDS+= kalgebra-4.10.2{,nb[0-9]*}:../../math/kalgebra
+DEPENDS+= kalzium-4.10.2{,nb[0-9]*}:../../misc/kalzium
+DEPENDS+= kanagram-4.10.2{,nb[0-9]*}:../../games/kanagram
+DEPENDS+= kbruch-4.10.2{,nb[0-9]*}:../../misc/kbruch
+DEPENDS+= kgeography-4.10.2{,nb[0-9]*}:../../misc/kgeography
+DEPENDS+= khangman-4.10.2{,nb[0-9]*}:../../games/khangman
+DEPENDS+= kig-4.10.2{,nb[0-9]*}:../../misc/kig
+DEPENDS+= kiten-4.10.2{,nb[0-9]*}:../../misc/kiten
+DEPENDS+= klettres-4.10.2{,nb[0-9]*}:../../misc/klettres
+DEPENDS+= kstars-4.10.2{,nb[0-9]*}:../../misc/kstars
+DEPENDS+= ktouch-4.10.2{,nb[0-9]*}:../../misc/ktouch
+DEPENDS+= kturtle-4.10.2{,nb[0-9]*}:../../misc/kturtle
+DEPENDS+= kwordquiz-4.10.2{,nb[0-9]*}:../../misc/kwordquiz
+DEPENDS+= parley-4.10.2{,nb[0-9]*}:../../misc/parley
+DEPENDS+= rocs-4.10.2{,nb[0-9]*}:../../misc/rocs
+DEPENDS+= step-4.10.2{,nb[0-9]*}:../../misc/step
+#DEPENDS+= kdegames4-4.10.2{,nb[0-9]*}:../../games/kdegames4
+DEPENDS+= bomber-4.10.2{,nb[0-9]*}:../../games/bomber
+DEPENDS+= bovo-4.10.2{,nb[0-9]*}:../../games/bovo
+DEPENDS+= granatier-4.10.2{,nb[0-9]*}:../../games/granatier
+DEPENDS+= kajongg-4.10.2{,nb[0-9]*}:../../games/kajongg
+DEPENDS+= kapman-4.10.2{,nb[0-9]*}:../../games/kapman
+DEPENDS+= katomic-4.10.2{,nb[0-9]*}:../../games/katomic
+DEPENDS+= kblackbox-4.10.2{,nb[0-9]*}:../../games/kblackbox
+DEPENDS+= kblocks-4.10.2{,nb[0-9]*}:../../games/kblocks
+DEPENDS+= kbounce-4.10.2{,nb[0-9]*}:../../games/kbounce
+DEPENDS+= kbreakout-4.10.2{,nb[0-9]*}:../../games/kbreakout
+DEPENDS+= kdiamond-4.10.2{,nb[0-9]*}:../../games/kdiamond
+DEPENDS+= kfourinline-4.10.2{,nb[0-9]*}:../../games/kfourinline
+DEPENDS+= kgoldrunner-4.10.2{,nb[0-9]*}:../../games/kgoldrunner
+DEPENDS+= kigo-4.10.2{,nb[0-9]*}:../../games/kigo
+DEPENDS+= killbots-4.10.2{,nb[0-9]*}:../../games/killbots
+DEPENDS+= kiriki-4.10.2{,nb[0-9]*}:../../games/kiriki
+DEPENDS+= kjumpingcube-4.10.2{,nb[0-9]*}:../../games/kjumpingcube
+DEPENDS+= klickety-4.10.2{,nb[0-9]*}:../../games/klickety
+DEPENDS+= klines-4.10.2{,nb[0-9]*}:../../games/klines
+DEPENDS+= kmahjongg-4.10.2{,nb[0-9]*}:../../games/kmahjongg
+DEPENDS+= kmines-4.10.2{,nb[0-9]*}:../../games/kmines
+DEPENDS+= knavalbattle-4.10.2{,nb[0-9]*}:../../games/knavalbattle
+DEPENDS+= knetwalk-4.10.2{,nb[0-9]*}:../../games/knetwalk
+DEPENDS+= kolf-4.10.2{,nb[0-9]*}:../../games/kolf
+DEPENDS+= kollision-4.10.2{,nb[0-9]*}:../../games/kollision
+DEPENDS+= konquest-4.10.2{,nb[0-9]*}:../../games/konquest
+DEPENDS+= kpat-4.10.2{,nb[0-9]*}:../../games/kpat
+DEPENDS+= kreversi-4.10.2{,nb[0-9]*}:../../games/kreversi
+DEPENDS+= kshisen-4.10.2{,nb[0-9]*}:../../games/kshisen
+DEPENDS+= ksirk-4.10.2{,nb[0-9]*}:../../games/ksirk
+DEPENDS+= ksnakeduel-4.10.2{,nb[0-9]*}:../../games/ksnakeduel
+DEPENDS+= kspaceduel-4.10.2{,nb[0-9]*}:../../games/kspaceduel
+DEPENDS+= ksquares-4.10.2{,nb[0-9]*}:../../games/ksquares
+DEPENDS+= ksudoku-4.10.2{,nb[0-9]*}:../../games/ksudoku
+DEPENDS+= ktuberling-4.10.2{,nb[0-9]*}:../../games/ktuberling
+DEPENDS+= kubrick-4.10.2{,nb[0-9]*}:../../games/kubrick
+DEPENDS+= lskat-4.10.2{,nb[0-9]*}:../../games/lskat
+DEPENDS+= palapeli-4.10.2{,nb[0-9]*}:../../games/palapeli
+DEPENDS+= picmi-4.10.2{,nb[0-9]*}:../../games/picmi
+DEPENDS+= kamera-4.10.2{,nb[0-9]*}:../../graphics/kamera
+DEPENDS+= kde-base-artwork-4.10.2{,nb[0-9]*}:../../graphics/kde-base-artwork
+DEPENDS+= gwenview-4.10.2{,nb[0-9]*}:../../graphics/gwenview
+DEPENDS+= ksaneplugin-4.10.2{,nb[0-9]*}:../../graphics/ksaneplugin
+DEPENDS+= ksnapshot-4.10.2{,nb[0-9]*}:../../graphics/ksnapshot
+DEPENDS+= kcolorchooser-4.10.2{,nb[0-9]*}:../../graphics/kcolorchooser
+DEPENDS+= kgamma-4.10.2{,nb[0-9]*}:../../graphics/kgamma
+DEPENDS+= kruler-4.10.2{,nb[0-9]*}:../../graphics/kruler
+DEPENDS+= kolourpaint-4.10.2{,nb[0-9]*}:../../graphics/kolourpaint
+DEPENDS+= okular-4.10.2{,nb[0-9]*}:../../print/okular
+DEPENDS+= kdegraphics-mobipocket-4.10.2{,nb[0-9]*}:../../graphics/kdegraphics-mobipocket
+DEPENDS+= kdegraphics-strigi-analyzer-4.10.2{,nb[0-9]*}:../../graphics/kdegraphics-strigi-analyzer
+DEPENDS+= kdegraphics-thumbnailers-4.10.2{,nb[0-9]*}:../../graphics/kdegraphics-thumbnailers
+DEPENDS+= svgpart-4.10.2{,nb[0-9]*}:../../graphics/svgpart
+#DEPENDS+= kdemultimedia4-4.10.2{,nb[0-9]*}:../../multimedia/kdemultimedia4
+DEPENDS+= audiocd-kio-4.10.2{,nb[0-9]*}:../../multimedia/audiocd-kio
+DEPENDS+= dragon-4.10.2{,nb[0-9]*}:../../multimedia/dragon
+DEPENDS+= ffmpegthumbs-4.10.2{,nb[0-9]*}:../../multimedia/ffmpegthumbs
+DEPENDS+= juk-4.10.2{,nb[0-9]*}:../../multimedia/juk
+DEPENDS+= kmix-4.10.2{,nb[0-9]*}:../../multimedia/kmix
+DEPENDS+= kscd-4.10.2{,nb[0-9]*}:../../multimedia/kscd
+DEPENDS+= mplayerthumbs-4.10.2{,nb[0-9]*}:../../multimedia/mplayerthumbs
+DEPENDS+= kdenetwork4-4.10.2{,nb[0-9]*}:../../net/kdenetwork4
DEPENDS+= kdepim4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim4
DEPENDS+= kdepim-runtime4-4.4.11.1{,nb[0-9]*}:../../misc/kdepim-runtime4
-DEPENDS+= kdeplasma-addons4-4.8.4{,nb[0-9]*}:../../misc/kdeplasma-addons4
-DEPENDS+= kdesdk4-4.8.4{,nb[0-9]*}:../../devel/kdesdk4
-DEPENDS+= kate-4.8.4{,nb[0-9]*}:../../editors/kate
-DEPENDS+= kdetoys4-4.8.4{,nb[0-9]*}:../../games/kdetoys4
-DEPENDS+= ark-4.8.4{,nb[0-9]*}:../../archivers/ark
-DEPENDS+= filelight-4.8.4{,nb[0-9]*}:../../sysutils/filelight
-DEPENDS+= kcalc-4.8.4{,nb[0-9]*}:../../math/kcalc
-DEPENDS+= kcharselect-4.8.4{,nb[0-9]*}:../../misc/kcharselect
-DEPENDS+= kdf-4.8.4{,nb[0-9]*}:../../sysutils/kdf
-DEPENDS+= kfloppy-4.8.4{,nb[0-9]*}:../../sysutils/kfloppy
-DEPENDS+= kremotecontrol-4.8.4{,nb[0-9]*}:../../misc/kremotecontrol
-DEPENDS+= ksecrets-4.8.4{,nb[0-9]*}:../../security/ksecrets
-DEPENDS+= ktimer-4.8.4{,nb[0-9]*}:../../time/ktimer
-DEPENDS+= kwallet-4.8.4{,nb[0-9]*}:../../security/kwallet
-DEPENDS+= kgpg-4.8.4{,nb[0-9]*}:../../security/kgpg
-DEPENDS+= printer-applet-4.8.4{,nb[0-9]*}:../../print/printer-applet
-DEPENDS+= superkaramba-4.8.4{,nb[0-9]*}:../../misc/superkaramba
-DEPENDS+= sweeper-4.8.4{,nb[0-9]*}:../../misc/sweeper
-DEPENDS+= kdewebdev4-4.8.4{,nb[0-9]*}:../../www/kdewebdev4
+DEPENDS+= kdeplasma-addons4-4.10.2{,nb[0-9]*}:../../misc/kdeplasma-addons4
+DEPENDS+= kdesdk4-4.10.2{,nb[0-9]*}:../../devel/kdesdk4
+DEPENDS+= kate-4.10.2{,nb[0-9]*}:../../editors/kate
+DEPENDS+= kdetoys4-4.10.2{,nb[0-9]*}:../../games/kdetoys4
+DEPENDS+= ark-4.10.2{,nb[0-9]*}:../../archivers/ark
+DEPENDS+= filelight-4.10.2{,nb[0-9]*}:../../sysutils/filelight
+DEPENDS+= kcalc-4.10.2{,nb[0-9]*}:../../math/kcalc
+DEPENDS+= kcharselect-4.10.2{,nb[0-9]*}:../../misc/kcharselect
+DEPENDS+= kdf-4.10.2{,nb[0-9]*}:../../sysutils/kdf
+DEPENDS+= kfloppy-4.10.2{,nb[0-9]*}:../../sysutils/kfloppy
+DEPENDS+= kremotecontrol-4.10.2{,nb[0-9]*}:../../misc/kremotecontrol
+#DEPENDS+= ksecrets-4.10.2{,nb[0-9]*}:../../security/ksecrets
+DEPENDS+= ktimer-4.10.2{,nb[0-9]*}:../../time/ktimer
+DEPENDS+= kwallet-4.10.2{,nb[0-9]*}:../../security/kwallet
+DEPENDS+= kgpg-4.10.2{,nb[0-9]*}:../../security/kgpg
+#DEPENDS+= printer-applet-4.10.2{,nb[0-9]*}:../../print/printer-applet
+DEPENDS+= superkaramba-4.10.2{,nb[0-9]*}:../../misc/superkaramba
+DEPENDS+= sweeper-4.10.2{,nb[0-9]*}:../../misc/sweeper
+DEPENDS+= kdewebdev4-4.10.2{,nb[0-9]*}:../../www/kdewebdev4
META_PACKAGE= yes
diff --git a/meta-pkgs/kde4/Makefile.kde4 b/meta-pkgs/kde4/Makefile.kde4
index 9a7ae99320a..0956fe7ce6c 100644
--- a/meta-pkgs/kde4/Makefile.kde4
+++ b/meta-pkgs/kde4/Makefile.kde4
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.kde4,v 1.17 2012/09/11 23:26:14 asau Exp $
+# $NetBSD: Makefile.kde4,v 1.18 2013/04/03 10:51:43 markd Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# KDE4-distributed packages (they all share common configure and build
# settings).
CATEGORIES+= kde
-_KDE_VERSION= 4.8.4
-MASTER_SITE_KDE_I18N= ${MASTER_SITE_KDE:=4.8.4/src/kde-l10n/}
-MASTER_SITES?= ${MASTER_SITE_KDE:=4.8.4/src/}
+_KDE_VERSION= 4.10.2
+MASTER_SITE_KDE_I18N= ${MASTER_SITE_KDE:=4.10.2/src/kde-l10n/}
+MASTER_SITES?= ${MASTER_SITE_KDE:=4.10.2/src/}
EXTRACT_SUFX?= .tar.xz
EXTRACT_USING= gtar
@@ -24,5 +24,10 @@ USE_CMAKE= yes
CMAKE_ARG_PATH= ..
CONFIGURE_DIRS= _KDE_build
+# eventually allow CMAKE_BUILD_TYPE to be overridden
+# set for current default
+TARGET_NAME= relwithdebinfo
+PLIST_SUBST+= TARGETS=${TARGET_NAME}
+
pre-configure:
${MKDIR} ${WRKSRC}/_KDE_build
diff --git a/misc/kaccessible/Makefile b/misc/kaccessible/Makefile
index 4096774d8ea..1ab388a9b04 100644
--- a/misc/kaccessible/Makefile
+++ b/misc/kaccessible/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:52 markd Exp $
DISTNAME= kaccessible-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= Provides accessibility services like focus tracking for KDE
diff --git a/misc/kaccessible/distinfo b/misc/kaccessible/distinfo
index f31007501b0..365889e77fc 100644
--- a/misc/kaccessible/distinfo
+++ b/misc/kaccessible/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:52 markd Exp $
-SHA1 (kaccessible-4.8.4.tar.xz) = d467fa3857b2c5a2aa3a5421b5d7c74fe3c7f981
-RMD160 (kaccessible-4.8.4.tar.xz) = ca1e48d07921a5b2a117cd054f3cb75ce1aef895
-Size (kaccessible-4.8.4.tar.xz) = 21040 bytes
+SHA1 (kaccessible-4.10.2.tar.xz) = 453235676a1991e5f448497f8aa61d0e7ddd54f2
+RMD160 (kaccessible-4.10.2.tar.xz) = d7e9a45180349cc9874ed7ffd616c0ed752a2722
+Size (kaccessible-4.10.2.tar.xz) = 20860 bytes
diff --git a/misc/kalzium/Makefile b/misc/kalzium/Makefile
index 4ea548a2cb4..ec9c7b3adf1 100644
--- a/misc/kalzium/Makefile
+++ b/misc/kalzium/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:58 markd Exp $
DISTNAME= kalzium-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= periodic table of elements
diff --git a/misc/kalzium/PLIST b/misc/kalzium/PLIST
index 506727bc352..0531521bab0 100644
--- a/misc/kalzium/PLIST
+++ b/misc/kalzium/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 08:51:13 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:58 markd Exp $
bin/kalzium
include/libkdeedu/chemicaldataobject.h
include/libkdeedu/element.h
@@ -19,9 +19,10 @@ lib/kde4/plasma_applet_molmassCalculator.so
lib/kde4/plasma_engine_kalzium.so
lib/libscience.so
lib/libscience.so.4
-lib/libscience.so.4.8.0
+lib/libscience.so.${PKGVERSION}
man/man1/kalzium.1
share/applications/kde4/kalzium.desktop
+share/applications/kde4/kalzium_cml.desktop
share/doc/kde/HTML/en/kalzium/common
share/doc/kde/HTML/en/kalzium/gradient.png
share/doc/kde/HTML/en/kalzium/index.cache.bz2
@@ -234,6 +235,8 @@ share/kde/apps/kalzium/data/molecules/2-thioethanol.cml
share/kde/apps/kalzium/data/molecules/2_2_2-trifluoroethanol.cml
share/kde/apps/kalzium/data/molecules/but-2-yne-1_4-diol.cml
share/kde/apps/kalzium/data/molecules/butane.cml
+share/kde/apps/kalzium/data/molecules/carbon_dioxide.cml
+share/kde/apps/kalzium/data/molecules/carbon_monoxide.cml
share/kde/apps/kalzium/data/molecules/ethane-1_2-diol.cml
share/kde/apps/kalzium/data/molecules/ethane.cml
share/kde/apps/kalzium/data/molecules/ethanol.cml
@@ -244,6 +247,7 @@ share/kde/apps/kalzium/data/molecules/propan-1-ol.cml
share/kde/apps/kalzium/data/molecules/propan-2-ol.cml
share/kde/apps/kalzium/data/molecules/propane.cml
share/kde/apps/kalzium/data/molecules/thiophene.cml
+share/kde/apps/kalzium/data/molecules/water.cml
share/kde/apps/kalzium/data/toolpics/abzug.jpg
share/kde/apps/kalzium/data/toolpics/becherglas.jpg
share/kde/apps/kalzium/data/toolpics/brechungsmesser.jpg
@@ -393,6 +397,7 @@ share/kde/apps/kalzium/icons/hicolor/scalable/actions/statematter.svgz
share/kde/apps/kalzium/icons/hicolor/scalable/actions/timeline.svgz
share/kde/apps/kalzium/icons/hicolor/scalable/actions/tooltip.svgz
share/kde/apps/kalzium/kalziumui.rc
+share/kde/apps/kalzium/qml/detailview.qml
share/kde/apps/libkdeedu/data/elements.xml
share/kde/apps/libkdeedu/data/isotopes.xml
share/kde/apps/libkdeedu/data/spectra.xml
diff --git a/misc/kalzium/distinfo b/misc/kalzium/distinfo
index ba6e2cc2990..7feb16c4107 100644
--- a/misc/kalzium/distinfo
+++ b/misc/kalzium/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:58 markd Exp $
-SHA1 (kalzium-4.8.4.tar.xz) = 28ed27164680a28e478cc6e0a13c918bc2119dc2
-RMD160 (kalzium-4.8.4.tar.xz) = 96c3f92d2299990bdfb1b502c28bf7c01d9963da
-Size (kalzium-4.8.4.tar.xz) = 3690120 bytes
+SHA1 (kalzium-4.10.2.tar.xz) = bf4c5b19905d83dede215b672d6b2911eb6d57cc
+RMD160 (kalzium-4.10.2.tar.xz) = 052386be65257bfd6ab6359ee22640b25e21ec7d
+Size (kalzium-4.10.2.tar.xz) = 3719308 bytes
diff --git a/misc/kbruch/Makefile b/misc/kbruch/Makefile
index 74cd4a8446e..db2a29b6b2f 100644
--- a/misc/kbruch/Makefile
+++ b/misc/kbruch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:59 markd Exp $
DISTNAME= kbruch-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE exercise fractions
diff --git a/misc/kbruch/distinfo b/misc/kbruch/distinfo
index b3fbbd95cfe..d3ee017eefc 100644
--- a/misc/kbruch/distinfo
+++ b/misc/kbruch/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2013/01/15 15:24:19 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:51:59 markd Exp $
-SHA1 (kbruch-4.8.4.tar.xz) = 40c24efddc30441a8de2ec315e1933ca429da14b
-RMD160 (kbruch-4.8.4.tar.xz) = a22e4937c53375fc3d71a1c7cf5f04006b7d178c
-Size (kbruch-4.8.4.tar.xz) = 910148 bytes
+SHA1 (kbruch-4.10.2.tar.xz) = 2ba86ec27e9890734dc6a74528b6082f31caa8aa
+RMD160 (kbruch-4.10.2.tar.xz) = 71d530599c988839175b825ddd52ff8488a5fffb
+Size (kbruch-4.10.2.tar.xz) = 908364 bytes
SHA1 (patch-src_FractionPainter.cpp) = 6fe40215175a13363993cc5fca708031e76b72a0
SHA1 (patch-src_fractionbasewidget.cpp) = 292fb8c4f793d3c33866916a1852d351c7ab1e54
SHA1 (patch-src_ratiowidget.cpp) = e3a53034a66623a307a2b957f26e5b47e9b540e9
diff --git a/misc/kcharselect/Makefile b/misc/kcharselect/Makefile
index e76fa279ada..d4f49aed282 100644
--- a/misc/kcharselect/Makefile
+++ b/misc/kcharselect/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:17 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:14 markd Exp $
DISTNAME= kcharselect-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE character selector
diff --git a/misc/kcharselect/PLIST b/misc/kcharselect/PLIST
index 1e20cec416b..eb1534e2ef1 100644
--- a/misc/kcharselect/PLIST
+++ b/misc/kcharselect/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 06:35:27 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:14 markd Exp $
bin/kcharselect
share/applications/kde4/KCharSelect.desktop
share/doc/kde/HTML/en/kcharselect/common
@@ -6,4 +6,3 @@ share/doc/kde/HTML/en/kcharselect/index.cache.bz2
share/doc/kde/HTML/en/kcharselect/index.docbook
share/doc/kde/HTML/en/kcharselect/kcharselect.png
share/kde/apps/kcharselect/kcharselectui.rc
-share/kde/apps/kconf_update/kcharselect.upd
diff --git a/misc/kcharselect/distinfo b/misc/kcharselect/distinfo
index 7f905e3407d..ec7ece4d85d 100644
--- a/misc/kcharselect/distinfo
+++ b/misc/kcharselect/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:14 markd Exp $
-SHA1 (kcharselect-4.8.4.tar.xz) = 0e00a25ca3c813ab335cd12ff0ec4b1f22c8076c
-RMD160 (kcharselect-4.8.4.tar.xz) = 1523d2803f25590996c6f50aafd72b703ea0c67f
-Size (kcharselect-4.8.4.tar.xz) = 86828 bytes
+SHA1 (kcharselect-4.10.2.tar.xz) = 2e5b06c4be689097f3999ff772bc12373fa81e7c
+RMD160 (kcharselect-4.10.2.tar.xz) = 764445b135bef9e8d3fae6e8bedc8f4a7f3f5ee5
+Size (kcharselect-4.10.2.tar.xz) = 86448 bytes
diff --git a/misc/kde-wallpapers4/Makefile b/misc/kde-wallpapers4/Makefile
index a9089ed93a9..14e0edb5eff 100644
--- a/misc/kde-wallpapers4/Makefile
+++ b/misc/kde-wallpapers4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:17 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:48 markd Exp $
DISTNAME= kde-wallpapers-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= Wallpapers for the KDE integrated X11 desktop
diff --git a/misc/kde-wallpapers4/PLIST b/misc/kde-wallpapers4/PLIST
index 4d453a53a35..097c8838040 100644
--- a/misc/kde-wallpapers4/PLIST
+++ b/misc/kde-wallpapers4/PLIST
@@ -1,10 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 00:28:08 markd Exp $
-share/kde/wallpapers/Air/contents/images/1280x1024.jpg
-share/kde/wallpapers/Air/contents/images/1600x1200.jpg
-share/kde/wallpapers/Air/contents/images/1920x1080.jpg
-share/kde/wallpapers/Air/contents/images/1920x1200.jpg
-share/kde/wallpapers/Air/contents/screenshot.png
-share/kde/wallpapers/Air/metadata.desktop
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:48 markd Exp $
share/kde/wallpapers/Ariya/contents/images/1024x768.png
share/kde/wallpapers/Ariya/contents/images/1280x1024.png
share/kde/wallpapers/Ariya/contents/images/1280x720.png
@@ -21,6 +15,9 @@ share/kde/wallpapers/Ariya/contents/images/640x480.png
share/kde/wallpapers/Ariya/contents/images/800x600.png
share/kde/wallpapers/Ariya/contents/screenshot.png
share/kde/wallpapers/Ariya/metadata.desktop
+share/kde/wallpapers/Auros/contents/images/5408x3464.png
+share/kde/wallpapers/Auros/contents/screenshot.png
+share/kde/wallpapers/Auros/metadata.desktop
share/kde/wallpapers/Autumn/contents/images/1280x1024.jpg
share/kde/wallpapers/Autumn/contents/images/1600x1200.jpg
share/kde/wallpapers/Autumn/contents/images/1920x1080.jpg
@@ -46,11 +43,12 @@ share/kde/wallpapers/Castilla_Sky/contents/images/2560x1440.jpg
share/kde/wallpapers/Castilla_Sky/contents/images/2560x1600.jpg
share/kde/wallpapers/Castilla_Sky/contents/screenshot.png
share/kde/wallpapers/Castilla_Sky/metadata.desktop
-share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1280x1024.jpg
-share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1600x1200.jpg
-share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1920x1200.jpg
-share/kde/wallpapers/Finally_Summer_in_Germany/contents/screenshot.png
-share/kde/wallpapers/Finally_Summer_in_Germany/metadata.desktop
+share/kde/wallpapers/Elarun/contents/images/2560x1600.png
+share/kde/wallpapers/Elarun/contents/screenshot.png
+share/kde/wallpapers/Elarun/metadata.desktop
+share/kde/wallpapers/Flores/contents/images/1920x1278.jpg
+share/kde/wallpapers/Flores/contents/screenshot.png
+share/kde/wallpapers/Flores/metadata.desktop
share/kde/wallpapers/Flying_Field/contents/images/1600x1200.jpg
share/kde/wallpapers/Flying_Field/contents/images/1920x1080.jpg
share/kde/wallpapers/Flying_Field/contents/images/1920x1200.jpg
@@ -65,11 +63,6 @@ share/kde/wallpapers/Fog_on_the_West_Lake/contents/images/3840x2160.jpg
share/kde/wallpapers/Fog_on_the_West_Lake/contents/images/3840x2400.jpg
share/kde/wallpapers/Fog_on_the_West_Lake/contents/screenshot.png
share/kde/wallpapers/Fog_on_the_West_Lake/metadata.desktop
-share/kde/wallpapers/Fresh_Morning/contents/images/1280x1024.jpg
-share/kde/wallpapers/Fresh_Morning/contents/images/1600x1200.jpg
-share/kde/wallpapers/Fresh_Morning/contents/images/1920x1200.jpg
-share/kde/wallpapers/Fresh_Morning/contents/screenshot.png
-share/kde/wallpapers/Fresh_Morning/metadata.desktop
share/kde/wallpapers/Grass/contents/images/1280x1024.jpg
share/kde/wallpapers/Grass/contents/images/1600x1200.jpg
share/kde/wallpapers/Grass/contents/images/1920x1080.jpg
@@ -97,8 +90,6 @@ share/kde/wallpapers/Media_Life/contents/images/1680x1050.jpg
share/kde/wallpapers/Media_Life/contents/images/1920x1200.jpg
share/kde/wallpapers/Media_Life/contents/screenshot.png
share/kde/wallpapers/Media_Life/metadata.desktop
-share/kde/wallpapers/Plasmalicious/contents/images/1280x1024.jpg
-share/kde/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
-share/kde/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
-share/kde/wallpapers/Plasmalicious/contents/screenshot.png
-share/kde/wallpapers/Plasmalicious/metadata.desktop
+share/kde/wallpapers/Prato/contents/images/4386x2920.jpg
+share/kde/wallpapers/Prato/contents/screenshot.png
+share/kde/wallpapers/Prato/metadata.desktop
diff --git a/misc/kde-wallpapers4/distinfo b/misc/kde-wallpapers4/distinfo
index e623e5f8fd0..51f51c2c734 100644
--- a/misc/kde-wallpapers4/distinfo
+++ b/misc/kde-wallpapers4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:48 markd Exp $
-SHA1 (kde-wallpapers-4.8.4.tar.xz) = da11aa057c5b836ee026634bb61565244d614682
-RMD160 (kde-wallpapers-4.8.4.tar.xz) = a61241d0a45a5ef77b1a9eb5717440062f0685b4
-Size (kde-wallpapers-4.8.4.tar.xz) = 77372404 bytes
+SHA1 (kde-wallpapers-4.10.2.tar.xz) = 5919c022631560f32fb660d2ac6cb4ea2017389a
+RMD160 (kde-wallpapers-4.10.2.tar.xz) = 58cbaea1be1f4ed78c5a67efbd3adb2132dcf8dd
+Size (kde-wallpapers-4.10.2.tar.xz) = 90661772 bytes
diff --git a/misc/kdeadmin4/Makefile b/misc/kdeadmin4/Makefile
index eb06f4ce47f..815de01f6c6 100644
--- a/misc/kdeadmin4/Makefile
+++ b/misc/kdeadmin4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.38 2013/02/16 11:23:18 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2013/04/03 10:51:53 markd Exp $
DISTNAME= kdeadmin-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 11
CATEGORIES= misc
COMMENT= System administration tools for the KDE integrated X11 desktop
diff --git a/misc/kdeadmin4/PLIST b/misc/kdeadmin4/PLIST
index 634fc2a4cdc..cfcfcef5942 100644
--- a/misc/kdeadmin4/PLIST
+++ b/misc/kdeadmin4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/06/16 04:45:35 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/04/03 10:51:54 markd Exp $
bin/ksystemlog
bin/kuser
lib/kde4/kcm_cron.so
@@ -20,20 +20,6 @@ share/doc/kde/HTML/en/kuser/common
share/doc/kde/HTML/en/kuser/index.cache.bz2
share/doc/kde/HTML/en/kuser/index.docbook
share/doc/kde/HTML/en/kuser/kuser.png
-share/doc/kde/HTML/en/system-config-printer-kde/common
-share/doc/kde/HTML/en/system-config-printer-kde/index.cache.bz2
-share/doc/kde/HTML/en/system-config-printer-kde/index.docbook
-share/doc/kde/HTML/en/system-config-printer-kde/new-class.png
-share/doc/kde/HTML/en/system-config-printer-kde/new-details.png
-share/doc/kde/HTML/en/system-config-printer-kde/new-driver.png
-share/doc/kde/HTML/en/system-config-printer-kde/new-manufacturer.png
-share/doc/kde/HTML/en/system-config-printer-kde/new-uri.png
-share/doc/kde/HTML/en/system-config-printer-kde/new.png
-share/doc/kde/HTML/en/system-config-printer-kde/printer-job-options.png
-share/doc/kde/HTML/en/system-config-printer-kde/printer-options.png
-share/doc/kde/HTML/en/system-config-printer-kde/printer-policies.png
-share/doc/kde/HTML/en/system-config-printer-kde/printer-settings.png
-share/doc/kde/HTML/en/system-config-printer-kde/server.png
share/icons/hicolor/128x128/apps/kuser.png
share/icons/hicolor/16x16/apps/kuser.png
share/icons/hicolor/22x22/apps/kuser.png
diff --git a/misc/kdeadmin4/distinfo b/misc/kdeadmin4/distinfo
index 88a65c077ea..97302b161ae 100644
--- a/misc/kdeadmin4/distinfo
+++ b/misc/kdeadmin4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2012/06/16 04:45:35 markd Exp $
+$NetBSD: distinfo,v 1.18 2013/04/03 10:51:54 markd Exp $
-SHA1 (kdeadmin-4.8.4.tar.xz) = b825e40b29b4ae684265cb13b7935737d7ae6d68
-RMD160 (kdeadmin-4.8.4.tar.xz) = adabe82678e84cef51dc7a0b1219cab165742d4c
-Size (kdeadmin-4.8.4.tar.xz) = 1169564 bytes
+SHA1 (kdeadmin-4.10.2.tar.xz) = 885f63b846e9e8d1485c9261544efb2ab0eea58e
+RMD160 (kdeadmin-4.10.2.tar.xz) = 9613eb14c71b5f5f50a25c412e05e8ab77c1a30a
+Size (kdeadmin-4.10.2.tar.xz) = 676368 bytes
diff --git a/misc/kdeartwork4/Makefile b/misc/kdeartwork4/Makefile
index fe3cc0eda64..1519ec296a5 100644
--- a/misc/kdeartwork4/Makefile
+++ b/misc/kdeartwork4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2013/02/16 11:23:19 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/04/03 10:51:54 markd Exp $
DISTNAME= kdeartwork-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= Artwork for the KDE integrated X11 desktop
diff --git a/misc/kdeartwork4/PLIST b/misc/kdeartwork4/PLIST
index 9b1ca9f42ea..ccdd99092d9 100644
--- a/misc/kdeartwork4/PLIST
+++ b/misc/kdeartwork4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/03/19 20:50:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/04/03 10:51:55 markd Exp $
bin/kbanner.kss
bin/kblob.kss
bin/kclock.kss
@@ -5910,21 +5910,6 @@ share/icons/nuvola/scalable/status/dialog-authentication.svg
share/icons/nuvola/scalable/status/dialog-information.svg
share/icons/nuvola/scalable/status/dialog-warning.svg
share/icons/nuvola/scalable/status/user-trash-full.svg
-share/kde/apps/aurorae/themes/Air-Oxygen/air-oxygenrc
-share/kde/apps/aurorae/themes/Air-Oxygen/close.svgz
-share/kde/apps/aurorae/themes/Air-Oxygen/decoration.svgz
-share/kde/apps/aurorae/themes/Air-Oxygen/maximize.svgz
-share/kde/apps/aurorae/themes/Air-Oxygen/metadata.desktop
-share/kde/apps/aurorae/themes/Air-Oxygen/minimize.svgz
-share/kde/apps/aurorae/themes/Air-Oxygen/restore.svgz
-share/kde/apps/aurorae/themes/Oxygen/Oxygenrc
-share/kde/apps/aurorae/themes/Oxygen/close.svgz
-share/kde/apps/aurorae/themes/Oxygen/decoration.svgz
-share/kde/apps/aurorae/themes/Oxygen/help.svgz
-share/kde/apps/aurorae/themes/Oxygen/maximize.svgz
-share/kde/apps/aurorae/themes/Oxygen/metadata.desktop
-share/kde/apps/aurorae/themes/Oxygen/minimize.svgz
-share/kde/apps/aurorae/themes/Oxygen/restore.svgz
share/kde/apps/color-schemes/CherryBlossom.colors
share/kde/apps/color-schemes/Chrome.colors
share/kde/apps/color-schemes/Desert.colors
@@ -5983,11 +5968,40 @@ share/kde/apps/desktoptheme/Aya/widgets/systemtray.svgz
share/kde/apps/desktoptheme/Aya/widgets/tasks.svgz
share/kde/apps/desktoptheme/Aya/widgets/tooltip.svgz
share/kde/apps/desktoptheme/Aya/widgets/translucentbackground.svgz
+share/kde/apps/desktoptheme/Produkt/colors
share/kde/apps/desktoptheme/Produkt/dialogs/background.svgz
share/kde/apps/desktoptheme/Produkt/dialogs/kickoff.svgz
share/kde/apps/desktoptheme/Produkt/dialogs/krunner.svgz
share/kde/apps/desktoptheme/Produkt/dialogs/shutdowndialog.svgz
+share/kde/apps/desktoptheme/Produkt/icons/amarok.svgz
+share/kde/apps/desktoptheme/Produkt/icons/audio.svgz
+share/kde/apps/desktoptheme/Produkt/icons/battery.svgz
+share/kde/apps/desktoptheme/Produkt/icons/device.svgz
+share/kde/apps/desktoptheme/Produkt/icons/edit-paste.svgz
+share/kde/apps/desktoptheme/Produkt/icons/kget.svgz
+share/kde/apps/desktoptheme/Produkt/icons/klipper.svgz
+share/kde/apps/desktoptheme/Produkt/icons/konv_message.svgz
+share/kde/apps/desktoptheme/Produkt/icons/konversation.svgz
+share/kde/apps/desktoptheme/Produkt/icons/kopete-alt.svgz
+share/kde/apps/desktoptheme/Produkt/icons/kopete.svgz
+share/kde/apps/desktoptheme/Produkt/icons/korgac.svgz
+share/kde/apps/desktoptheme/Produkt/icons/ktorrent.svgz
+share/kde/apps/desktoptheme/Produkt/icons/kubuntu-start.svgz
+share/kde/apps/desktoptheme/Produkt/icons/nepomuk.svgz
+share/kde/apps/desktoptheme/Produkt/icons/network.svgz
+share/kde/apps/desktoptheme/Produkt/icons/notification.svgz
+share/kde/apps/desktoptheme/Produkt/icons/preferences.svgz
+share/kde/apps/desktoptheme/Produkt/icons/printer.svgz
+share/kde/apps/desktoptheme/Produkt/icons/quickaccess.svgz
+share/kde/apps/desktoptheme/Produkt/icons/wallet.svgz
share/kde/apps/desktoptheme/Produkt/metadata.desktop
+share/kde/apps/desktoptheme/Produkt/translucent/dialogs/background.svgz
+share/kde/apps/desktoptheme/Produkt/translucent/dialogs/krunner.svgz
+share/kde/apps/desktoptheme/Produkt/translucent/dialogs/shutdowndialog.svgz
+share/kde/apps/desktoptheme/Produkt/translucent/widgets/background.svgz
+share/kde/apps/desktoptheme/Produkt/translucent/widgets/clock.svgz
+share/kde/apps/desktoptheme/Produkt/translucent/widgets/panel-background.svgz
+share/kde/apps/desktoptheme/Produkt/translucent/widgets/tooltip.svgz
share/kde/apps/desktoptheme/Produkt/widgets/action-overlays.svgz
share/kde/apps/desktoptheme/Produkt/widgets/arrows.svgz
share/kde/apps/desktoptheme/Produkt/widgets/background.svgz
@@ -6067,7 +6081,31 @@ share/kde/apps/desktoptheme/slim-glow/colors
share/kde/apps/desktoptheme/slim-glow/dialogs/background.svgz
share/kde/apps/desktoptheme/slim-glow/dialogs/krunner.svgz
share/kde/apps/desktoptheme/slim-glow/dialogs/shutdowndialog.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/amarok.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/audio.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/battery.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/device.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/kget.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/kgpg.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/klipper.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/konv_message.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/konversation.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/kopete.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/korgac.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/kpackagekit.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/ktorrent.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/location.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/mail.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/nepomuk.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/network.svgz
share/kde/apps/desktoptheme/slim-glow/icons/notification.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/preferences.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/presence-applet.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/printer.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/quassel.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/slc.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/wallet.svgz
+share/kde/apps/desktoptheme/slim-glow/icons/weather.svgz
share/kde/apps/desktoptheme/slim-glow/metadata.desktop
share/kde/apps/desktoptheme/slim-glow/opaque/dialogs/background.svgz
share/kde/apps/desktoptheme/slim-glow/opaque/dialogs/kickoff.svgz
@@ -6092,9 +6130,11 @@ share/kde/apps/desktoptheme/slim-glow/widgets/lineedit.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/notes.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/panel-background.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/picture-frame-default.svgz
+share/kde/apps/desktoptheme/slim-glow/widgets/plot-background.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/scrollbar.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/systemtray.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/tasks.svgz
+share/kde/apps/desktoptheme/slim-glow/widgets/toolbox.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/tooltip.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/translucentbackground.svgz
share/kde/apps/desktoptheme/slim-glow/widgets/viewitem.svgz
@@ -6128,11 +6168,17 @@ share/kde/wallpapers/Aghi/contents/images/1920x1200.jpg
share/kde/wallpapers/Aghi/contents/images/800x600.jpg
share/kde/wallpapers/Aghi/contents/screenshot.jpg
share/kde/wallpapers/Aghi/metadata.desktop
+share/kde/wallpapers/Air/contents/images/1280x1024.jpg
+share/kde/wallpapers/Air/contents/images/1600x1200.jpg
+share/kde/wallpapers/Air/contents/images/1920x1080.jpg
+share/kde/wallpapers/Air/contents/images/1920x1200.jpg
+share/kde/wallpapers/Air/contents/screenshot.png
+share/kde/wallpapers/Air/metadata.desktop
share/kde/wallpapers/Atra_Dot/contents/images/1280x1024.jpg
share/kde/wallpapers/Atra_Dot/contents/images/1600x1200.jpg
share/kde/wallpapers/Atra_Dot/contents/images/1920x1080.jpg
share/kde/wallpapers/Atra_Dot/contents/images/1920x1200.jpg
-share/kde/wallpapers/Atra_Dot/contents/screnshot.jpg
+share/kde/wallpapers/Atra_Dot/contents/screenshot.jpg
share/kde/wallpapers/Atra_Dot/metadata.desktop
share/kde/wallpapers/Autumn/contents/images/3008x2000.jpg
share/kde/wallpapers/Beach_Reflecting_Clouds/contents/images/1280x1024.jpg
@@ -6210,7 +6256,7 @@ share/kde/wallpapers/Evening/contents/images/1280x1024.jpg
share/kde/wallpapers/Evening/contents/images/1600x1200.jpg
share/kde/wallpapers/Evening/contents/images/1920x1080.jpg
share/kde/wallpapers/Evening/contents/images/1920x1200.jpg
-share/kde/wallpapers/Evening/contents/screnshot.jpg
+share/kde/wallpapers/Evening/contents/screenshot.jpg
share/kde/wallpapers/Evening/metadata.desktop
share/kde/wallpapers/Field/contents/images/1280x1024.jpg
share/kde/wallpapers/Field/contents/images/1600x1200.jpg
@@ -6223,11 +6269,21 @@ share/kde/wallpapers/Fields_of_Peace/contents/images/1600x1200.JPG
share/kde/wallpapers/Fields_of_Peace/contents/images/1920x1200.JPG
share/kde/wallpapers/Fields_of_Peace/contents/screenshot.png
share/kde/wallpapers/Fields_of_Peace/metadata.desktop
+share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1280x1024.jpg
+share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1600x1200.jpg
+share/kde/wallpapers/Finally_Summer_in_Germany/contents/images/1920x1200.jpg
+share/kde/wallpapers/Finally_Summer_in_Germany/contents/screenshot.png
+share/kde/wallpapers/Finally_Summer_in_Germany/metadata.desktop
share/kde/wallpapers/Flower_drops/contents/images/1280x1024.jpg
share/kde/wallpapers/Flower_drops/contents/images/1600x1200.jpg
share/kde/wallpapers/Flower_drops/contents/images/1920x1200.jpg
share/kde/wallpapers/Flower_drops/contents/screenshot.png
share/kde/wallpapers/Flower_drops/metadata.desktop
+share/kde/wallpapers/Fresh_Morning/contents/images/1280x1024.jpg
+share/kde/wallpapers/Fresh_Morning/contents/images/1600x1200.jpg
+share/kde/wallpapers/Fresh_Morning/contents/images/1920x1200.jpg
+share/kde/wallpapers/Fresh_Morning/contents/screenshot.png
+share/kde/wallpapers/Fresh_Morning/metadata.desktop
share/kde/wallpapers/Golden_Ripples/contents/images/1280x1024.jpg
share/kde/wallpapers/Golden_Ripples/contents/images/1600x1200.jpg
share/kde/wallpapers/Golden_Ripples/contents/images/1920x1200.jpg
@@ -6287,8 +6343,13 @@ share/kde/wallpapers/Midnight_in_Karelia/contents/images/1280x1024.jpg
share/kde/wallpapers/Midnight_in_Karelia/contents/images/1600x1200.jpg
share/kde/wallpapers/Midnight_in_Karelia/contents/images/1920x1080.jpg
share/kde/wallpapers/Midnight_in_Karelia/contents/images/1920x1200.jpg
-share/kde/wallpapers/Midnight_in_Karelia/contents/screnshot.jpg
+share/kde/wallpapers/Midnight_in_Karelia/contents/screenshot.jpg
share/kde/wallpapers/Midnight_in_Karelia/metadata.desktop
+share/kde/wallpapers/Plasmalicious/contents/images/1280x1024.jpg
+share/kde/wallpapers/Plasmalicious/contents/images/1600x1200.jpg
+share/kde/wallpapers/Plasmalicious/contents/images/1920x1200.jpg
+share/kde/wallpapers/Plasmalicious/contents/screenshot.png
+share/kde/wallpapers/Plasmalicious/metadata.desktop
share/kde/wallpapers/Quadros/contents/images/1024x768.jpg
share/kde/wallpapers/Quadros/contents/images/1280x1024.jpg
share/kde/wallpapers/Quadros/contents/images/1280x800.jpg
@@ -6313,7 +6374,7 @@ share/kde/wallpapers/Spring_Sunray/contents/images/1280x1024.jpg
share/kde/wallpapers/Spring_Sunray/contents/images/1600x1200.jpg
share/kde/wallpapers/Spring_Sunray/contents/images/1920x1080.jpg
share/kde/wallpapers/Spring_Sunray/contents/images/1920x1200.jpg
-share/kde/wallpapers/Spring_Sunray/contents/screnshot.jpg
+share/kde/wallpapers/Spring_Sunray/contents/screenshot.jpg
share/kde/wallpapers/Spring_Sunray/metadata.desktop
share/kde/wallpapers/Storm/contents/contents.png
share/kde/wallpapers/Storm/contents/images/1600x1200.jpg
diff --git a/misc/kdeartwork4/distinfo b/misc/kdeartwork4/distinfo
index b3229d7fd85..188a128443e 100644
--- a/misc/kdeartwork4/distinfo
+++ b/misc/kdeartwork4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2012/06/16 04:45:34 markd Exp $
+$NetBSD: distinfo,v 1.18 2013/04/03 10:51:55 markd Exp $
-SHA1 (kdeartwork-4.8.4.tar.xz) = c7e15538d3141af8673d16f498c6af7bff62a87f
-RMD160 (kdeartwork-4.8.4.tar.xz) = d02e90c45d762fd35aa7d833bd1f4dbd41237c0c
-Size (kdeartwork-4.8.4.tar.xz) = 140388032 bytes
+SHA1 (kdeartwork-4.10.2.tar.xz) = 000146f17a31d1257959e274f952e5a2f55f0a00
+RMD160 (kdeartwork-4.10.2.tar.xz) = fff54ce3399973862cbfc352b75afb4a5698cb0b
+Size (kdeartwork-4.10.2.tar.xz) = 143473616 bytes
SHA1 (patch-aa) = 9007028225dded2490e3181f853c17985bae9509
diff --git a/misc/kdepim-runtime4/Makefile b/misc/kdepim-runtime4/Makefile
index aa8489ee2d7..18832275b73 100644
--- a/misc/kdepim-runtime4/Makefile
+++ b/misc/kdepim-runtime4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.38 2013/02/16 11:23:19 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2013/04/03 10:52:20 markd Exp $
#DISTNAME= kdepim-runtime-${_KDE_VERSION}
DISTNAME= kdepim-runtime-4.4.11.1
PKGNAME= ${DISTNAME:S/-4/4-4/}
MASTER_SITES= ${MASTER_SITE_KDE:=kdepim-4.4.11.1/src/}
-PKGREVISION= 13
+PKGREVISION= 14
CATEGORIES= misc
COMMENT= Runtime requirements for the KDE PIM tools
EXTRACT_SUFX= .tar.bz2
diff --git a/misc/kdepim-runtime4/PLIST b/misc/kdepim-runtime4/PLIST
index 91f317315e3..efcee4dcf07 100644
--- a/misc/kdepim-runtime4/PLIST
+++ b/misc/kdepim-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/03/19 21:01:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/04/03 10:52:20 markd Exp $
bin/akonadi2xml
bin/akonadi_birthdays_resource
bin/akonadi_contacts_resource
@@ -41,16 +41,16 @@ lib/kde4/kcm_akonadi_server.so
lib/kde4/kio_akonadi.so
lib/libakonadi-xml.so
lib/libakonadi-xml.so.4
-lib/libakonadi-xml.so.4.8.0
+lib/libakonadi-xml.so.4.10.2
lib/libkdepim-copy.so
lib/libkdepim-copy.so.4
-lib/libkdepim-copy.so.4.8.0
+lib/libkdepim-copy.so.4.10.2
lib/libmaildir.so
lib/libmaildir.so.4
-lib/libmaildir.so.4.8.0
+lib/libmaildir.so.4.10.2
lib/libmbox.so
lib/libmbox.so.4
-lib/libmbox.so.4.8.0
+lib/libmbox.so.4.10.2
share/akonadi/agents/birthdaysresource.desktop
share/akonadi/agents/contactsresource.desktop
share/akonadi/agents/icalresource.desktop
diff --git a/misc/kdepim4/Makefile b/misc/kdepim4/Makefile
index 6205548ef8a..32dafd35f75 100644
--- a/misc/kdepim4/Makefile
+++ b/misc/kdepim4/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.46 2013/02/16 11:23:20 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2013/04/03 10:52:19 markd Exp $
#DISTNAME= kdepim-${_KDE_VERSION}
DISTNAME= kdepim-4.4.11.1
PKGNAME= ${DISTNAME:S/-4/4-4/}
MASTER_SITES= ${MASTER_SITE_KDE:=kdepim-4.4.11.1/src/}
-PKGREVISION= 15
+PKGREVISION= 16
CATEGORIES= misc
COMMENT= Personal Information Management tools for the KDE desktop
EXTRACT_SUFX= .tar.bz2
@@ -66,6 +66,7 @@ BUILDLINK_DEPMETHOD.qt4-tools=full
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../security/libassuan2/buildlink3.mk"
.include "../../security/qca2/buildlink3.mk"
diff --git a/misc/kdepim4/PLIST b/misc/kdepim4/PLIST
index 8f24a784838..452ca603461 100644
--- a/misc/kdepim4/PLIST
+++ b/misc/kdepim4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2012/03/19 21:01:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/04/03 10:52:19 markd Exp $
bin/akonadiconsole
bin/akregator
bin/akregatorstorageexporter
@@ -102,68 +102,68 @@ lib/kde4/ktimetrackerpart.so
lib/kde4/plugins/designer/kdepimwidgets.so
lib/libakonadi-kcal_next.so
lib/libakonadi-kcal_next.so.4
-lib/libakonadi-kcal_next.so.4.8.0
+lib/libakonadi-kcal_next.so.4.10.2
lib/libakonadi_next.so
lib/libakonadi_next.so.4
-lib/libakonadi_next.so.4.8.0
+lib/libakonadi_next.so.4.10.2
lib/libakregatorinterfaces.so
lib/libakregatorinterfaces.so.4
-lib/libakregatorinterfaces.so.4.8.0
+lib/libakregatorinterfaces.so.4.10.2
lib/libakregatorprivate.so.4
-lib/libakregatorprivate.so.4.8.0
+lib/libakregatorprivate.so.4.10.2
lib/libgwsoap.so
lib/libgwsoap.so.4
-lib/libgwsoap.so.4.8.0
+lib/libgwsoap.so.4.10.2
lib/libkabc_groupdav.so
lib/libkabc_groupdav.so.4
-lib/libkabc_groupdav.so.4.8.0
+lib/libkabc_groupdav.so.4.10.2
lib/libkabc_slox.so
lib/libkabc_slox.so.4
-lib/libkabc_slox.so.4.8.0
+lib/libkabc_slox.so.4.10.2
lib/libkabcgroupwise.so
lib/libkabcgroupwise.so.4
-lib/libkabcgroupwise.so.4.8.0
+lib/libkabcgroupwise.so.4.10.2
lib/libkabckolab.so
lib/libkabckolab.so.4
-lib/libkabckolab.so.4.8.0
+lib/libkabckolab.so.4.10.2
lib/libkaddressbookprivate.so.4
-lib/libkaddressbookprivate.so.4.8.0
+lib/libkaddressbookprivate.so.4.10.2
lib/libkalarm_calendar.so
lib/libkalarm_calendar.so.4
-lib/libkalarm_calendar.so.4.8.0
+lib/libkalarm_calendar.so.4.10.2
lib/libkalarm_resources.so
lib/libkalarm_resources.so.4
-lib/libkalarm_resources.so.4.8.0
+lib/libkalarm_resources.so.4.10.2
lib/libkcal_groupdav.so
lib/libkcal_groupdav.so.4
-lib/libkcal_groupdav.so.4.8.0
+lib/libkcal_groupdav.so.4.10.2
lib/libkcal_resourceblog.so
lib/libkcal_resourceblog.so.4
-lib/libkcal_resourceblog.so.4.8.0
+lib/libkcal_resourceblog.so.4.10.2
lib/libkcal_resourceremote.so
lib/libkcal_resourceremote.so.4
-lib/libkcal_resourceremote.so.4.8.0
+lib/libkcal_resourceremote.so.4.10.2
lib/libkcal_slox.so
lib/libkcal_slox.so.4
-lib/libkcal_slox.so.4.8.0
+lib/libkcal_slox.so.4.10.2
lib/libkcalgroupwise.so
lib/libkcalgroupwise.so.4
-lib/libkcalgroupwise.so.4.8.0
+lib/libkcalgroupwise.so.4.10.2
lib/libkcalkolab.so
lib/libkcalkolab.so.4
-lib/libkcalkolab.so.4.8.0
+lib/libkcalkolab.so.4.10.2
lib/libkdepim.so
lib/libkdepim.so.4
-lib/libkdepim.so.4.8.0
+lib/libkdepim.so.4.10.2
lib/libkgroupwarebase.so
lib/libkgroupwarebase.so.4
-lib/libkgroupwarebase.so.4.8.0
+lib/libkgroupwarebase.so.4.10.2
lib/libkgroupwaredav.so
lib/libkgroupwaredav.so.4
-lib/libkgroupwaredav.so.4.8.0
+lib/libkgroupwaredav.so.4.10.2
lib/libkleo.so
lib/libkleo.so.4
-lib/libkleo.so.4.8.0
+lib/libkleo.so.4.10.2
lib/libkleopatraclientcore.so
lib/libkleopatraclientcore.so.0
lib/libkleopatraclientcore.so.0.2.1
@@ -171,53 +171,53 @@ lib/libkleopatraclientgui.so
lib/libkleopatraclientgui.so.0
lib/libkleopatraclientgui.so.0.2.1
lib/libkmailprivate.so.4
-lib/libkmailprivate.so.4.8.0
+lib/libkmailprivate.so.4.10.2
lib/libknodecommon.so
lib/libknodecommon.so.4
-lib/libknodecommon.so.4.8.0
+lib/libknodecommon.so.4.10.2
lib/libknoteskolab.so
lib/libknoteskolab.so.4
-lib/libknoteskolab.so.4.8.0
+lib/libknoteskolab.so.4.10.2
lib/libkontactprivate.so.4
-lib/libkontactprivate.so.4.8.0
+lib/libkontactprivate.so.4.10.2
lib/libkorg_stdprinting.so
lib/libkorg_stdprinting.so.4
-lib/libkorg_stdprinting.so.4.8.0
+lib/libkorg_stdprinting.so.4.10.2
lib/libkorganizer_calendar.so
lib/libkorganizer_calendar.so.4
-lib/libkorganizer_calendar.so.4.8.0
+lib/libkorganizer_calendar.so.4.10.2
lib/libkorganizer_core.so
lib/libkorganizer_core.so.4
-lib/libkorganizer_core.so.4.8.0
+lib/libkorganizer_core.so.4.10.2
lib/libkorganizer_eventviewer.so
lib/libkorganizer_eventviewer.so.4
-lib/libkorganizer_eventviewer.so.4.8.0
+lib/libkorganizer_eventviewer.so.4.10.2
lib/libkorganizer_interfaces.so
lib/libkorganizer_interfaces.so.4
-lib/libkorganizer_interfaces.so.4.8.0
+lib/libkorganizer_interfaces.so.4.10.2
lib/libkorganizerprivate.so.4
-lib/libkorganizerprivate.so.4.8.0
+lib/libkorganizerprivate.so.4.10.2
lib/libkpgp.so
lib/libkpgp.so.4
-lib/libkpgp.so.4.8.0
+lib/libkpgp.so.4.10.2
lib/libksieve.so
lib/libksieve.so.4
-lib/libksieve.so.4.8.0
+lib/libksieve.so.4.10.2
lib/libkslox.so
lib/libkslox.so.4
-lib/libkslox.so.4.8.0
+lib/libkslox.so.4.10.2
lib/libmessagecore.so
lib/libmessagecore.so.4
-lib/libmessagecore.so.4.8.0
+lib/libmessagecore.so.4.10.2
lib/libmessagelist.so
lib/libmessagelist.so.4
-lib/libmessagelist.so.4.8.0
+lib/libmessagelist.so.4.10.2
lib/libmessageviewer.so
lib/libmessageviewer.so.0
lib/libmessageviewer.so.0.1.0
lib/libmimelib.so
lib/libmimelib.so.4
-lib/libmimelib.so.4.8.0
+lib/libmimelib.so.4.10.2
lib/strigi/strigiea_ics.so
lib/strigi/strigiea_vcf.so
man/man1/kabcclient.1
diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 343e995b0eb..0cba9ae55c4 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2013/02/16 11:19:55 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2013/04/03 10:51:47 markd Exp $
DISTNAME= kdepimlibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 13
CATEGORIES= misc
COMMENT= Support libraries for PIM for the KDE integrated X11 desktop
@@ -12,7 +11,7 @@ CMAKE_DEPENDENCIES_REWRITE= _KDE_build/KDEPimLibsDependencies.cmake
REPLACE_PERL+= mailtransport/kconf_update/migrate-transports.pl
-BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.5.52
+BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.8.51
.include "../../meta-pkgs/kde4/kde4.mk"
@@ -21,7 +20,9 @@ BUILDLINK_API_DEPENDS.akonadi+= akonadi>=1.5.52
.if ${OPSYS} == "Linux"
.include "../../devel/libuuid/buildlink3.mk"
.endif
+.include "../../devel/qjson/buildlink3.mk"
.include "../../mail/akonadi/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../security/cyrus-sasl/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../time/libical/buildlink3.mk"
diff --git a/misc/kdepimlibs4/PLIST b/misc/kdepimlibs4/PLIST
index e38115b2cec..7be0be55d9e 100644
--- a/misc/kdepimlibs4/PLIST
+++ b/misc/kdepimlibs4/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2012/04/15 05:54:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/04/03 10:51:47 markd Exp $
+bin/akonadi_benchmarker
+bin/akonaditest
include/KDE/Akonadi/AgentBase
+include/KDE/Akonadi/AgentFactory
include/KDE/Akonadi/AgentFilterProxyModel
include/KDE/Akonadi/AgentInstance
include/KDE/Akonadi/AgentInstanceCreateJob
@@ -13,6 +16,8 @@ include/KDE/Akonadi/AgentTypeWidget
include/KDE/Akonadi/Attribute
include/KDE/Akonadi/AttributeFactory
include/KDE/Akonadi/CachePolicy
+include/KDE/Akonadi/Calendar/FreeBusyProviderBase
+include/KDE/Akonadi/Calendar/StandardCalendarActionManager
include/KDE/Akonadi/ChangeRecorder
include/KDE/Akonadi/Collection
include/KDE/Akonadi/CollectionAttributesSynchronizationJob
@@ -26,6 +31,7 @@ include/KDE/Akonadi/CollectionFetchScope
include/KDE/Akonadi/CollectionFilterProxyModel
include/KDE/Akonadi/CollectionModel
include/KDE/Akonadi/CollectionModifyJob
+include/KDE/Akonadi/CollectionMoveJob
include/KDE/Akonadi/CollectionPropertiesDialog
include/KDE/Akonadi/CollectionPropertiesPage
include/KDE/Akonadi/CollectionRequester
@@ -58,11 +64,15 @@ include/KDE/Akonadi/Contact/StandardContactActionManager
include/KDE/Akonadi/Contact/StandardContactFormatter
include/KDE/Akonadi/Contact/StandardContactGroupFormatter
include/KDE/Akonadi/Control
+include/KDE/Akonadi/DBusConnectionPool
include/KDE/Akonadi/ETMViewStateSaver
include/KDE/Akonadi/Entity
include/KDE/Akonadi/EntityDisplayAttribute
+include/KDE/Akonadi/EntityHiddenAttribute
include/KDE/Akonadi/EntityListView
include/KDE/Akonadi/EntityMimeTypeFilterModel
+include/KDE/Akonadi/EntityOrderProxyModel
+include/KDE/Akonadi/EntityRightsFilterModel
include/KDE/Akonadi/EntityTreeModel
include/KDE/Akonadi/EntityTreeView
include/KDE/Akonadi/Exception
@@ -84,20 +94,29 @@ include/KDE/Akonadi/Job
include/KDE/Akonadi/KCal/FreeBusyProviderBase
include/KDE/Akonadi/KCal/IncidenceMimeTypeVisitor
include/KDE/Akonadi/KMime/AddressAttribute
+include/KDE/Akonadi/KMime/MessageFlags
include/KDE/Akonadi/KMime/MessageFolderAttribute
include/KDE/Akonadi/KMime/MessageModel
+include/KDE/Akonadi/KMime/MessageParts
+include/KDE/Akonadi/KMime/MessageStatus
include/KDE/Akonadi/KMime/MessageThreaderProxyModel
include/KDE/Akonadi/KMime/MessageThreadingAttribute
+include/KDE/Akonadi/KMime/RemoveDuplicatesJob
include/KDE/Akonadi/KMime/SpecialMailCollections
include/KDE/Akonadi/KMime/SpecialMailCollectionsRequestJob
include/KDE/Akonadi/LinkJob
include/KDE/Akonadi/MimeTypeChecker
include/KDE/Akonadi/Monitor
include/KDE/Akonadi/PreprocessorBase
+include/KDE/Akonadi/RecursiveCollectionFilterProxyModel
+include/KDE/Akonadi/RecursiveItemFetchJob
include/KDE/Akonadi/ResourceBase
include/KDE/Akonadi/SearchCreateJob
include/KDE/Akonadi/ServerManager
include/KDE/Akonadi/Session
+include/KDE/Akonadi/SocialUtils/ImageProvider
+include/KDE/Akonadi/SocialUtils/SocialFeedItem
+include/KDE/Akonadi/SocialUtils/SocialNetworkAttributes
include/KDE/Akonadi/StandardActionManager
include/KDE/Akonadi/TransactionBeginJob
include/KDE/Akonadi/TransactionCommitJob
@@ -328,6 +347,14 @@ include/KDE/KPIMIdentities/IdentityManager
include/KDE/KPIMIdentities/Signature
include/KDE/KPIMIdentities/SignatureConfigurator
include/KDE/KPIMTextEdit/EMailQuoteHighlighter
+include/KDE/KPIMTextEdit/EmoticonTextEditAction
+include/KDE/KPIMTextEdit/HtmlHighlighter
+include/KDE/KPIMTextEdit/InsertHtmlDialog
+include/KDE/KPIMTextEdit/InsertImageDialog
+include/KDE/KPIMTextEdit/InsertImageWidget
+include/KDE/KPIMTextEdit/InsertTableDialog
+include/KDE/KPIMTextEdit/InsertTableWidget
+include/KDE/KPIMTextEdit/TableFormatDialog
include/KDE/KPIMTextEdit/TextEdit
include/KDE/KPIMUtils/Email
include/KDE/KPIMUtils/KFileIO
@@ -344,6 +371,7 @@ include/KDE/KResources/Resource
include/KDE/KResources/SelectDialog
include/KDE/KTNEF/Formatter
include/KDE/KTNEF/KTNEFAttach
+include/KDE/KTNEF/KTNEFDefs
include/KDE/KTNEF/KTNEFMessage
include/KDE/KTNEF/KTNEFParser
include/KDE/KTNEF/KTNEFProperty
@@ -514,6 +542,7 @@ include/akonadi/kmime/messageparts.h
include/akonadi/kmime/messagestatus.h
include/akonadi/kmime/messagethreaderproxymodel.h
include/akonadi/kmime/messagethreadingattribute.h
+include/akonadi/kmime/removeduplicatesjob.h
include/akonadi/kmime/specialmailcollections.h
include/akonadi/kmime/specialmailcollectionsrequestjob.h
include/akonadi/kmime/standardmailactionmanager.h
@@ -537,6 +566,10 @@ include/akonadi/searchcreatejob.h
include/akonadi/selectionproxymodel.h
include/akonadi/servermanager.h
include/akonadi/session.h
+include/akonadi/socialutils/imageprovider.h
+include/akonadi/socialutils/libakonadisocialutils_export.h
+include/akonadi/socialutils/socialfeeditem.h
+include/akonadi/socialutils/socialnetworkattributes.h
include/akonadi/specialcollections.h
include/akonadi/specialcollectionsrequestjob.h
include/akonadi/standardactionmanager.h
@@ -791,6 +824,8 @@ include/kimap/setquotajob.h
include/kimap/storejob.h
include/kimap/subscribejob.h
include/kimap/unsubscribejob.h
+include/kimaptest/fakeserver.h
+include/kimaptest/mockjob.h
include/kldap/ber.h
include/kldap/kldap_export.h
include/kldap/ldapattributeproxymodel.h
@@ -836,7 +871,14 @@ include/kpimidentities/kpimidentities_export.h
include/kpimidentities/signature.h
include/kpimidentities/signatureconfigurator.h
include/kpimtextedit/emailquotehighlighter.h
+include/kpimtextedit/emoticontexteditaction.h
+include/kpimtextedit/htmlhighlighter.h
+include/kpimtextedit/inserthtmldialog.h
+include/kpimtextedit/insertimagedialog.h
+include/kpimtextedit/insertimagewidget.h
+include/kpimtextedit/inserttabledialog.h
include/kpimtextedit/kpimtextedit_export.h
+include/kpimtextedit/tableformatdialog.h
include/kpimtextedit/textedit.h
include/kpimtextedit/textutils.h
include/kpimutils/email.h
@@ -961,12 +1003,13 @@ include/syndication/specificitem.h
include/syndication/specificitemvisitor.h
include/syndication/syndication.h
include/syndication/tools.h
-lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix-relwithdebinfo.cmake
+lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix-${TARGET}.cmake
lib/cmake/KdepimLibs/KDEPimLibsLibraryTargetsWithPrefix.cmake
lib/cmake/KdepimLibs/KdepimLibsConfig.cmake
lib/cmake/KdepimLibs/KdepimLibsConfigVersion.cmake
lib/gpgmepp/GpgmeppConfig.cmake
lib/gpgmepp/GpgmeppLibraryDepends.cmake
+lib/kde4/akonadi_serializer_socialfeeditem.so
lib/kde4/kabc_directory.so
lib/kde4/kabc_file.so
lib/kde4/kabc_ldapkio.so
@@ -987,25 +1030,28 @@ lib/kde4/kio_smtp.so
lib/kde4/plugins/designer/kholidayswidgets.so
lib/libakonadi-calendar.so
lib/libakonadi-calendar.so.4
-lib/libakonadi-calendar.so.4.8.0
+lib/libakonadi-calendar.so.${PKGVERSION}
lib/libakonadi-contact.so
lib/libakonadi-contact.so.4
-lib/libakonadi-contact.so.4.8.0
+lib/libakonadi-contact.so.${PKGVERSION}
lib/libakonadi-kabc.so
lib/libakonadi-kabc.so.4
-lib/libakonadi-kabc.so.4.8.0
+lib/libakonadi-kabc.so.${PKGVERSION}
lib/libakonadi-kcal.so
lib/libakonadi-kcal.so.4
-lib/libakonadi-kcal.so.4.8.0
+lib/libakonadi-kcal.so.${PKGVERSION}
lib/libakonadi-kde.so
lib/libakonadi-kde.so.4
-lib/libakonadi-kde.so.4.8.0
+lib/libakonadi-kde.so.${PKGVERSION}
lib/libakonadi-kmime.so
lib/libakonadi-kmime.so.4
-lib/libakonadi-kmime.so.4.8.0
+lib/libakonadi-kmime.so.${PKGVERSION}
lib/libakonadi-notes.so
lib/libakonadi-notes.so.4
-lib/libakonadi-notes.so.4.8.0
+lib/libakonadi-notes.so.${PKGVERSION}
+lib/libakonadi-socialutils.so
+lib/libakonadi-socialutils.so.4
+lib/libakonadi-socialutils.so.${PKGVERSION}
lib/libgpgme++-pthread.so
lib/libgpgme++-pthread.so.2
lib/libgpgme++-pthread.so.2.8.0
@@ -1014,73 +1060,74 @@ lib/libgpgme++.so.2
lib/libgpgme++.so.2.8.0
lib/libkabc.so
lib/libkabc.so.4
-lib/libkabc.so.4.8.0
+lib/libkabc.so.${PKGVERSION}
lib/libkabc_file_core.so
lib/libkabc_file_core.so.4
-lib/libkabc_file_core.so.4.8.0
+lib/libkabc_file_core.so.${PKGVERSION}
lib/libkalarmcal.so
lib/libkalarmcal.so.2
lib/libkalarmcal.so.2.7.0
lib/libkblog.so
lib/libkblog.so.4
-lib/libkblog.so.4.8.0
+lib/libkblog.so.${PKGVERSION}
lib/libkcal.so
lib/libkcal.so.4
-lib/libkcal.so.4.8.0
+lib/libkcal.so.${PKGVERSION}
lib/libkcalcore.so
lib/libkcalcore.so.4
-lib/libkcalcore.so.4.8.0
+lib/libkcalcore.so.${PKGVERSION}
lib/libkcalutils.so
lib/libkcalutils.so.4
-lib/libkcalutils.so.4.8.0
+lib/libkcalutils.so.${PKGVERSION}
lib/libkholidays.so
lib/libkholidays.so.4
-lib/libkholidays.so.4.8.0
+lib/libkholidays.so.${PKGVERSION}
lib/libkimap.so
lib/libkimap.so.4
-lib/libkimap.so.4.8.0
+lib/libkimap.so.${PKGVERSION}
+lib/libkimaptest.a
lib/libkldap.so
lib/libkldap.so.4
-lib/libkldap.so.4.8.0
+lib/libkldap.so.${PKGVERSION}
lib/libkmbox.so
lib/libkmbox.so.4
-lib/libkmbox.so.4.8.0
+lib/libkmbox.so.${PKGVERSION}
lib/libkmime.so
lib/libkmime.so.4
-lib/libkmime.so.4.8.0
+lib/libkmime.so.${PKGVERSION}
lib/libkontactinterface.so
lib/libkontactinterface.so.4
-lib/libkontactinterface.so.4.8.0
+lib/libkontactinterface.so.${PKGVERSION}
lib/libkpimidentities.so
lib/libkpimidentities.so.4
-lib/libkpimidentities.so.4.8.0
+lib/libkpimidentities.so.${PKGVERSION}
lib/libkpimtextedit.so
lib/libkpimtextedit.so.4
-lib/libkpimtextedit.so.4.8.0
+lib/libkpimtextedit.so.${PKGVERSION}
lib/libkpimutils.so
lib/libkpimutils.so.4
-lib/libkpimutils.so.4.8.0
+lib/libkpimutils.so.${PKGVERSION}
lib/libkresources.so
lib/libkresources.so.4
-lib/libkresources.so.4.8.0
+lib/libkresources.so.${PKGVERSION}
lib/libktnef.so
lib/libktnef.so.4
-lib/libktnef.so.4.8.0
+lib/libktnef.so.${PKGVERSION}
lib/libkxmlrpcclient.so
lib/libkxmlrpcclient.so.4
-lib/libkxmlrpcclient.so.4.8.0
+lib/libkxmlrpcclient.so.${PKGVERSION}
lib/libmailtransport.so
lib/libmailtransport.so.4
-lib/libmailtransport.so.4.8.0
+lib/libmailtransport.so.${PKGVERSION}
lib/libmicroblog.so
lib/libmicroblog.so.4
-lib/libmicroblog.so.4.8.0
+lib/libmicroblog.so.${PKGVERSION}
lib/libqgpgme.so
lib/libqgpgme.so.1
lib/libqgpgme.so.1.0.1
lib/libsyndication.so
lib/libsyndication.so.4
-lib/libsyndication.so.4.8.0
+lib/libsyndication.so.${PKGVERSION}
share/dbus-1/interfaces/org.kde.KResourcesManager.xml
share/dbus-1/interfaces/org.kde.pim.IdentityManager.xml
share/doc/kde/HTML/en/kcontrol/kresources/common
@@ -1121,12 +1168,13 @@ share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/skype_protocol.png
share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/sms_protocol.png
share/kde/apps/akonadi/contact/icons/oxygen/16x16/apps/yahoo_protocol.png
share/kde/apps/akonadi/contact/pics/world.jpg
+share/kde/apps/akonadi/plugins/serializer/akonadi_serializer_socialfeeditem.desktop
share/kde/apps/cmake/modules/CheckTimezone.cmake
-share/kde/apps/cmake/modules/FindAkonadi.cmake
share/kde/apps/cmake/modules/FindGpgme.cmake
share/kde/apps/cmake/modules/FindLdap.cmake
share/kde/apps/cmake/modules/FindLibical.cmake
share/kde/apps/cmake/modules/FindQGpgme.cmake
+share/kde/apps/cmake/modules/FindQtOAuth.cmake
share/kde/apps/cmake/modules/KDEPimLibsDependencies.cmake
share/kde/apps/kabc/countrytransl.map
share/kde/apps/kabc/formats/binary.desktop
@@ -1150,14 +1198,20 @@ share/kde/apps/libkholidays/plan2/holiday_br_pt-br
share/kde/apps/libkholidays/plan2/holiday_by_be
share/kde/apps/libkholidays/plan2/holiday_ca-qc_fr
share/kde/apps/libkholidays/plan2/holiday_ca_en-gb
+share/kde/apps/libkholidays/plan2/holiday_ch_de
share/kde/apps/libkholidays/plan2/holiday_ch_fr
+share/kde/apps/libkholidays/plan2/holiday_ch_it
share/kde/apps/libkholidays/plan2/holiday_cl_es
share/kde/apps/libkholidays/plan2/holiday_cn_zh-cn
share/kde/apps/libkholidays/plan2/holiday_co_es
+share/kde/apps/libkholidays/plan2/holiday_cr_en
+share/kde/apps/libkholidays/plan2/holiday_cr_es
share/kde/apps/libkholidays/plan2/holiday_cz_cs
share/kde/apps/libkholidays/plan2/holiday_de-by_de
share/kde/apps/libkholidays/plan2/holiday_de_de
share/kde/apps/libkholidays/plan2/holiday_dk_da
+share/kde/apps/libkholidays/plan2/holiday_dz_ar
+share/kde/apps/libkholidays/plan2/holiday_dz_fr
share/kde/apps/libkholidays/plan2/holiday_ee_et
share/kde/apps/libkholidays/plan2/holiday_eg_ar
share/kde/apps/libkholidays/plan2/holiday_es-ct_ca
@@ -1191,6 +1245,8 @@ share/kde/apps/libkholidays/plan2/holiday_jm_en-gb
share/kde/apps/libkholidays/plan2/holiday_jp_en-us
share/kde/apps/libkholidays/plan2/holiday_jp_ja
share/kde/apps/libkholidays/plan2/holiday_kr_ko
+share/kde/apps/libkholidays/plan2/holiday_kz_kk
+share/kde/apps/libkholidays/plan2/holiday_kz_ru
share/kde/apps/libkholidays/plan2/holiday_lt_lt
share/kde/apps/libkholidays/plan2/holiday_lu_fr
share/kde/apps/libkholidays/plan2/holiday_lu_lb
@@ -1201,13 +1257,17 @@ share/kde/apps/libkholidays/plan2/holiday_na_en-gb
share/kde/apps/libkholidays/plan2/holiday_nc_fr
share/kde/apps/libkholidays/plan2/holiday_nl_nl
share/kde/apps/libkholidays/plan2/holiday_no_nb
+share/kde/apps/libkholidays/plan2/holiday_no_nn
share/kde/apps/libkholidays/plan2/holiday_nz_en-gb
+share/kde/apps/libkholidays/plan2/holiday_pa_en
+share/kde/apps/libkholidays/plan2/holiday_pa_es
share/kde/apps/libkholidays/plan2/holiday_pf_fr
share/kde/apps/libkholidays/plan2/holiday_pl_pl
share/kde/apps/libkholidays/plan2/holiday_pt_pt
share/kde/apps/libkholidays/plan2/holiday_py_es
share/kde/apps/libkholidays/plan2/holiday_re_fr
share/kde/apps/libkholidays/plan2/holiday_ro_ro
+share/kde/apps/libkholidays/plan2/holiday_rs_sr
share/kde/apps/libkholidays/plan2/holiday_ru_ru
share/kde/apps/libkholidays/plan2/holiday_se_sv
share/kde/apps/libkholidays/plan2/holiday_sg_en-gb
@@ -1227,6 +1287,7 @@ share/kde/config.kcfg/resourcebase.kcfg
share/kde/config.kcfg/specialmailcollections.kcfg
share/kde4/services/akonadi/contact/aimprotocol.desktop
share/kde4/services/akonadi/contact/gaduprotocol.desktop
+share/kde4/services/akonadi/contact/googletalkprotocol.desktop
share/kde4/services/akonadi/contact/groupwiseprotocol.desktop
share/kde4/services/akonadi/contact/icqprotocol.desktop
share/kde4/services/akonadi/contact/ircprotocol.desktop
@@ -1237,7 +1298,7 @@ share/kde4/services/akonadi/contact/skypeprotocol.desktop
share/kde4/services/akonadi/contact/smsprotocol.desktop
share/kde4/services/akonadi/contact/yahooprotocol.desktop
share/kde4/services/akonadicontact_actions.desktop
-share/kde4/services/imap4.protocol
+share/kde4/services/imap.protocol
share/kde4/services/imaps.protocol
share/kde4/services/kcm_mailtransport.desktop
share/kde4/services/kresources.desktop
@@ -1263,3 +1324,4 @@ share/kde4/servicetypes/kontactplugin.desktop
share/kde4/servicetypes/kresources_manager.desktop
share/kde4/servicetypes/kresources_plugin.desktop
share/mime/packages/kdepimlibs-mime.xml
+share/mime/packages/x-vnd.akonadi.socialfeeditem.xml
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index a4d73e032b3..79ed49fca35 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.24 2012/12/20 23:00:06 joerg Exp $
+$NetBSD: distinfo,v 1.25 2013/04/03 10:51:47 markd Exp $
-SHA1 (kdepimlibs-4.8.4.tar.xz) = 34f693ac71896d0d8653fc2a81323d1e91531bb2
-RMD160 (kdepimlibs-4.8.4.tar.xz) = f9804ea6e6d016d879a16f1077e49aeef429ba13
-Size (kdepimlibs-4.8.4.tar.xz) = 2858756 bytes
+SHA1 (kdepimlibs-4.10.2.tar.xz) = ab163597d36b5457f9bcb0328f21c35777fffc34
+RMD160 (kdepimlibs-4.10.2.tar.xz) = bdcd31a2c3388886196b8b68e805a9672a55f998
+Size (kdepimlibs-4.10.2.tar.xz) = 2808532 bytes
SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c
SHA1 (patch-kalarmcal_CMakeLists.txt) = 8237552f350f214c3380bf0fc54d19d36765c9b9
SHA1 (patch-kblog_CMakeLists.txt) = 183d17f2de6f5f4f2f6bd29666b2a35d22c055aa
SHA1 (patch-kcalutils_CMakeLists.txt) = 5c212ab23d0b1006a43c765bc1d860be85da284a
-SHA1 (patch-kimap_loginjob.cpp) = efcc4ee6915215013cbc8b349741d747cb061a94
+SHA1 (patch-kimap_loginjob.cpp) = 8a0fe3c1779b981d9c9ca6cb34121219f2f97c9f
SHA1 (patch-kldap_ber.cpp) = 3656e006278db8fd4014f6e4a902f60703955871
SHA1 (patch-kldap_ber.h) = c4edcaedb7169e261892b973627b3265f1efd3df
SHA1 (patch-kmbox_CMakeLists.txt) = 924bd70a84c8af1c7d37501d4f718343a0aa7121
-SHA1 (patch-kpimutils_CMakeLists.txt) = 0a9f7283e2b70b38e0c545240251bc9ecb615eab
+SHA1 (patch-kpimutils_CMakeLists.txt) = 540a866b7c9d9de35ed0613519320490d73258d8
SHA1 (patch-qgpgme_CMakeLists.txt) = 0860963f371a008f1d006dad58ea40329c358cfd
diff --git a/misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp b/misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp
index 85ac4e93983..97d1060cb50 100644
--- a/misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp
+++ b/misc/kdepimlibs4/patches/patch-kimap_loginjob.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-kimap_loginjob.cpp,v 1.1 2012/04/26 13:22:42 hans Exp $
+$NetBSD: patch-kimap_loginjob.cpp,v 1.2 2013/04/03 10:51:48 markd Exp $
---- kimap/loginjob.cpp.orig 2012-02-29 23:56:04.000000000 +0100
-+++ kimap/loginjob.cpp 2012-04-26 14:32:19.144049407 +0200
-@@ -260,7 +260,7 @@ void LoginJob::handleResponse( const Mes
+--- kimap/loginjob.cpp.orig 2013-03-01 06:58:43.000000000 +0000
++++ kimap/loginjob.cpp
+@@ -282,7 +282,7 @@ void LoginJob::handleResponse( const Mes
enum ResponseCode {
OK,
@@ -11,21 +11,21 @@ $NetBSD: patch-kimap_loginjob.cpp,v 1.1 2012/04/26 13:22:42 hans Exp $
UNTAGGED,
CONTINUATION,
MALFORMED
-@@ -282,7 +282,7 @@ void LoginJob::handleResponse( const Mes
- else if ( response.content[1].toString() == "OK" )
+@@ -305,7 +305,7 @@ void LoginJob::handleResponse( const Mes
+ } else if ( response.content[1].toString() == "OK" ) {
code = OK;
- else
+ } else {
- code = ERR;
+ code = ERROR;
+ }
}
- switch (code) {
-@@ -290,7 +290,7 @@ void LoginJob::handleResponse( const Mes
+@@ -314,7 +314,7 @@ void LoginJob::handleResponse( const Mes
// We'll handle it later
break;
- case ERR:
+ case ERROR:
//server replied with NO or BAD for SASL authentication
- if (d->authState == LoginJobPrivate::Authenticate)
+ if ( d->authState == LoginJobPrivate::Authenticate ) {
sasl_dispose( &d->conn );
diff --git a/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt b/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
index 3f015ed0978..22a005cd119 100644
--- a/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
+++ b/misc/kdepimlibs4/patches/patch-kpimutils_CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-kpimutils_CMakeLists.txt,v 1.1 2012/03/19 11:46:44 markd Exp $
+$NetBSD: patch-kpimutils_CMakeLists.txt,v 1.2 2013/04/03 10:51:48 markd Exp $
---- kpimutils/CMakeLists.txt.orig 2011-07-27 18:34:56.000000000 +0000
+--- kpimutils/CMakeLists.txt.orig 2013-03-01 06:58:43.000000000 +0000
+++ kpimutils/CMakeLists.txt
@@ -1,6 +1,7 @@
project(kpimutils)
- add_definitions( -DKDE_DEFAULT_DEBUG_AREA=5321 )
+ add_definitions(-DKDE_DEFAULT_DEBUG_AREA=5321)
+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
- add_subdirectory( tests )
+ add_subdirectory(tests)
diff --git a/misc/kdeplasma-addons4/Makefile b/misc/kdeplasma-addons4/Makefile
index f78bf04c68d..a43aa42a625 100644
--- a/misc/kdeplasma-addons4/Makefile
+++ b/misc/kdeplasma-addons4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2013/02/16 11:23:20 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2013/04/03 10:52:18 markd Exp $
DISTNAME= kdeplasma-addons-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 11
CATEGORIES= misc
COMMENT= Plasmoids
@@ -16,12 +15,14 @@ CMAKE_ARGS+= -D BUILD_ibus:BOOL=OFF
.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../devel/qjson/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libkexiv2/buildlink3.mk"
BUILDLINK_API_DEPENDS.eigen2+= eigen2>=2.0.3
.include "../../math/eigen2/buildlink3.mk"
.include "../../misc/attica/buildlink3.mk"
.include "../../misc/marble/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
.include "../../security/qca2/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
diff --git a/misc/kdeplasma-addons4/PLIST b/misc/kdeplasma-addons4/PLIST
index 879e851502b..f5b9017e6f8 100644
--- a/misc/kdeplasma-addons4/PLIST
+++ b/misc/kdeplasma-addons4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/03/19 20:50:24 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/04/03 10:52:19 markd Exp $
bin/lancelot
include/KDE/Lancelot/ActionListModel
include/KDE/Lancelot/ActionListView
@@ -97,6 +97,7 @@ include/lancelot/widgets/TabBar.h
include/lancelot/widgets/Widget.h
lib/kde4/kcm_krunner_audioplayercontrol.so
lib/kde4/kcm_krunner_charrunner.so
+lib/kde4/kcm_krunner_dictionary.so
lib/kde4/kcm_krunner_spellcheck.so
lib/kde4/kcm_plasma_runner_events.so
lib/kde4/krunner_audioplayercontrol.so
@@ -104,19 +105,20 @@ lib/kde4/krunner_browserhistory.so
lib/kde4/krunner_charrunner.so
lib/kde4/krunner_contacts.so
lib/kde4/krunner_converter.so
+lib/kde4/krunner_dictionary.so
lib/kde4/krunner_katesessions.so
lib/kde4/krunner_konquerorsessions.so
lib/kde4/krunner_konsolesessions.so
lib/kde4/krunner_kopete.so
lib/kde4/krunner_mediawiki.so
lib/kde4/krunner_spellcheckrunner.so
+lib/kde4/krunner_youtube.so
lib/kde4/plasma-applet_systemloadviewer.so
lib/kde4/plasma_applet_bball.so
lib/kde4/plasma_applet_binaryclock.so
lib/kde4/plasma_applet_blackboard.so
lib/kde4/plasma_applet_bookmarks.so
lib/kde4/plasma_applet_bubblemon.so
-lib/kde4/plasma_applet_calculator.so
lib/kde4/plasma_applet_charselect.so
lib/kde4/plasma_applet_comic.so
lib/kde4/plasma_applet_dict.so
@@ -130,8 +132,6 @@ lib/kde4/plasma_applet_incomingmsg.so
lib/kde4/plasma_applet_kimpanel.so
lib/kde4/plasma_applet_knowledgebase.so
lib/kde4/plasma_applet_kolourpicker.so
-lib/kde4/plasma_applet_konqprofiles.so
-lib/kde4/plasma_applet_konsoleprofiles.so
lib/kde4/plasma_applet_lancelot_launcher.so
lib/kde4/plasma_applet_lancelot_part.so
lib/kde4/plasma_applet_leavenote.so
@@ -142,7 +142,6 @@ lib/kde4/plasma_applet_mediaplayer.so
lib/kde4/plasma_applet_microblog.so
lib/kde4/plasma_applet_news.so
lib/kde4/plasma_applet_notes.so
-lib/kde4/plasma_applet_nowplaying.so
lib/kde4/plasma_applet_opendesktop.so
lib/kde4/plasma_applet_opendesktop_activities.so
lib/kde4/plasma_applet_paste.so
@@ -166,7 +165,8 @@ lib/kde4/plasma_containment_groupingpanel.so
lib/kde4/plasma_engine_comic.so
lib/kde4/plasma_engine_kdeobservatory.so
lib/kde4/plasma_engine_kimpanel.so
-lib/kde4/plasma_engine_microblog.so
+lib/kde4/plasma_engine_konqprofiles.so
+lib/kde4/plasma_engine_konsoleprofiles.so
lib/kde4/plasma_engine_ocs.so
lib/kde4/plasma_engine_potd.so
lib/kde4/plasma_engine_rtm.so
@@ -182,6 +182,7 @@ lib/kde4/plasma_wallpaper_mandelbrot.so
lib/kde4/plasma_wallpaper_marble.so
lib/kde4/plasma_wallpaper_pattern.so
lib/kde4/plasma_wallpaper_potd.so
+lib/kde4/plasma_wallpaper_qml.so
lib/kde4/plasma_wallpaper_virus.so
lib/kde4/plasma_wallpaper_weather.so
lib/liblancelot-datamodels.so
@@ -192,7 +193,7 @@ lib/liblancelot.so.1.9.0
lib/liblancelot.so.2
lib/libplasma_groupingcontainment.so
lib/libplasma_groupingcontainment.so.4
-lib/libplasma_groupingcontainment.so.4.8.0
+lib/libplasma_groupingcontainment.so.${PKGVERSION}
lib/libplasmacomicprovidercore.so
lib/libplasmacomicprovidercore.so.1
lib/libplasmacomicprovidercore.so.1.0.0
@@ -201,10 +202,10 @@ lib/libplasmapotdprovidercore.so.1
lib/libplasmapotdprovidercore.so.1.0.0
lib/libplasmaweather.so
lib/libplasmaweather.so.4
-lib/libplasmaweather.so.4.8.0
+lib/libplasmaweather.so.${PKGVERSION}
lib/librtm.so
lib/librtm.so.4
-lib/librtm.so.4.8.0
+lib/librtm.so.${PKGVERSION}
share/icons/hicolor/128x128/apps/bball.png
share/icons/hicolor/128x128/apps/eyes.png
share/icons/hicolor/128x128/apps/lancelot-start.png
@@ -213,6 +214,7 @@ share/icons/hicolor/128x128/apps/lifegame.png
share/icons/hicolor/128x128/apps/luna.png
share/icons/hicolor/128x128/apps/plasmaapplet-shelf.png
share/icons/hicolor/128x128/apps/previewer.png
+share/icons/hicolor/16x16/actions/youtube.png
share/icons/hicolor/16x16/apps/bball.png
share/icons/hicolor/16x16/apps/eyes.png
share/icons/hicolor/16x16/apps/lancelot-start.png
@@ -221,6 +223,7 @@ share/icons/hicolor/16x16/apps/lifegame.png
share/icons/hicolor/16x16/apps/luna.png
share/icons/hicolor/16x16/apps/plasmaapplet-shelf.png
share/icons/hicolor/16x16/apps/previewer.png
+share/icons/hicolor/22x22/actions/youtube.png
share/icons/hicolor/22x22/apps/eyes.png
share/icons/hicolor/22x22/apps/lancelot-start.png
share/icons/hicolor/22x22/apps/lancelot.png
@@ -230,6 +233,7 @@ share/icons/hicolor/22x22/apps/plasmaapplet-shelf.png
share/icons/hicolor/22x22/apps/previewer.png
share/icons/hicolor/256x256/apps/eyes.png
share/icons/hicolor/256x256/apps/lifegame.png
+share/icons/hicolor/32x32/actions/youtube.png
share/icons/hicolor/32x32/apps/bball.png
share/icons/hicolor/32x32/apps/eyes.png
share/icons/hicolor/32x32/apps/lancelot-start.png
@@ -238,6 +242,7 @@ share/icons/hicolor/32x32/apps/lifegame.png
share/icons/hicolor/32x32/apps/luna.png
share/icons/hicolor/32x32/apps/plasmaapplet-shelf.png
share/icons/hicolor/32x32/apps/previewer.png
+share/icons/hicolor/48x48/actions/youtube.png
share/icons/hicolor/48x48/apps/bball.png
share/icons/hicolor/48x48/apps/lancelot-start.png
share/icons/hicolor/48x48/apps/lancelot.png
@@ -245,6 +250,7 @@ share/icons/hicolor/48x48/apps/lifegame.png
share/icons/hicolor/48x48/apps/luna.png
share/icons/hicolor/48x48/apps/plasmaapplet-shelf.png
share/icons/hicolor/48x48/apps/previewer.png
+share/icons/hicolor/64x64/actions/youtube.png
share/icons/hicolor/64x64/apps/bball.png
share/icons/hicolor/64x64/apps/lancelot-start.png
share/icons/hicolor/64x64/apps/lancelot.png
@@ -252,6 +258,7 @@ share/icons/hicolor/64x64/apps/lifegame.png
share/icons/hicolor/64x64/apps/luna.png
share/icons/hicolor/64x64/apps/plasmaapplet-shelf.png
share/icons/hicolor/64x64/apps/previewer.png
+share/icons/hicolor/scalable/actions/youtube.svgz
share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
share/icons/hicolor/scalable/apps/bball.svgz
share/icons/hicolor/scalable/apps/eyes.svgz
@@ -337,13 +344,15 @@ share/kde/apps/desktoptheme/default/rssnow/background.svgz
share/kde/apps/desktoptheme/default/rssnow/rssnow.svgz
share/kde/apps/desktoptheme/default/stylesheets/news.css
share/kde/apps/desktoptheme/default/weather/wind-arrows.svgz
-share/kde/apps/desktoptheme/default/weatherstation/lcd.svgz
+share/kde/apps/desktoptheme/default/weatherstation/lcd2.svgz
+share/kde/apps/desktoptheme/default/weatherstation/lcd_digits.svgz
share/kde/apps/desktoptheme/default/weatherstation/lcd_panel.svgz
+share/kde/apps/desktoptheme/default/weatherstation/weather_icons.svgz
+share/kde/apps/desktoptheme/default/weatherstation/wind_arrows.svgz
share/kde/apps/desktoptheme/default/widgets/eyes.svg
share/kde/apps/desktoptheme/default/widgets/luna.svgz
share/kde/apps/desktoptheme/default/widgets/microblog.svgz
share/kde/apps/desktoptheme/default/widgets/notes.svgz
-share/kde/apps/desktoptheme/default/widgets/nowplaying/nocover.svgz
share/kde/apps/desktoptheme/default/widgets/previewer-16.svgz
share/kde/apps/desktoptheme/default/widgets/previewer-22.svgz
share/kde/apps/desktoptheme/default/widgets/timer.svgz
@@ -378,13 +387,70 @@ share/kde/apps/lancelot/lancelot.notifyrc
share/kde/apps/plasma-applet-frame/picture-frame-default.jpg
share/kde/apps/plasma-applet-opendesktop-activities/plasma-applet-opendesktop-activities.notifyrc
share/kde/apps/plasma-applet-opendesktop/user.css
+share/kde/apps/plasma/packages/org.kde.comic/contents/ui/ButtonBar.qml
+share/kde/apps/plasma/packages/org.kde.comic/contents/ui/ComicBottomInfo.qml
+share/kde/apps/plasma/packages/org.kde.comic/contents/ui/ComicCentralView.qml
+share/kde/apps/plasma/packages/org.kde.comic/contents/ui/FullViewWidget.qml
+share/kde/apps/plasma/packages/org.kde.comic/contents/ui/ImageWidget.qml
+share/kde/apps/plasma/packages/org.kde.comic/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.comic/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.lcdweather/contents/ui/LCDDigit.qml
+share/kde/apps/plasma/packages/org.kde.lcdweather/contents/ui/LCDDisplay.qml
+share/kde/apps/plasma/packages/org.kde.lcdweather/contents/ui/Wind.qml
+share/kde/apps/plasma/packages/org.kde.lcdweather/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.lcdweather/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.weather/contents/ui/DetailsView.qml
+share/kde/apps/plasma/packages/org.kde.weather/contents/ui/FiveDaysView.qml
+share/kde/apps/plasma/packages/org.kde.weather/contents/ui/Notice.qml
+share/kde/apps/plasma/packages/org.kde.weather/contents/ui/NoticesView.qml
+share/kde/apps/plasma/packages/org.kde.weather/contents/ui/TopPanel.qml
+share/kde/apps/plasma/packages/org.kde.weather/contents/ui/Utils.js
+share/kde/apps/plasma/packages/org.kde.weather/contents/ui/WeatherListView.qml
+share/kde/apps/plasma/packages/org.kde.weather/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.weather/metadata.desktop
+share/kde/apps/plasma/plasmoids/calculator/contents/ui/calculator.qml
+share/kde/apps/plasma/plasmoids/calculator/metadata.desktop
+share/kde/apps/plasma/plasmoids/konqprofiles/contents/ui/konqprofiles.qml
+share/kde/apps/plasma/plasmoids/konqprofiles/metadata.desktop
+share/kde/apps/plasma/plasmoids/konsoleprofiles/contents/ui/konsoleprofiles.qml
+share/kde/apps/plasma/plasmoids/konsoleprofiles/metadata.desktop
+share/kde/apps/plasma/plasmoids/nowplaying/contents/code/service.js
+share/kde/apps/plasma/plasmoids/nowplaying/contents/config/main.xml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/images/nocover.svgz
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/AlbumArt.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/CompactLayout.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/Controls.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/FullLayout.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/Label.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/MetadataLine.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/MetadataPanel.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/Mpris2.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/PlayPauseButton.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/PositionSlider.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/VLayout.qml
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/nowplaying/contents/ui/nowplaying.qml
+share/kde/apps/plasma/plasmoids/nowplaying/metadata.desktop
share/kde/apps/plasma/services/kdeobservatory.operations
share/kde/apps/plasma/services/kimpanel.operations
share/kde/apps/plasma/services/ocsPerson.operations
+share/kde/apps/plasma/services/org.kde.plasma.dataengine.konqprofiles.operations
+share/kde/apps/plasma/services/org.kde.plasma.dataengine.konsoleprofiles.operations
share/kde/apps/plasma/services/rtmauth.operations
share/kde/apps/plasma/services/rtmtask.operations
share/kde/apps/plasma/services/rtmtasks.operations
-share/kde/apps/plasma/services/tweet.operations
+share/kde/apps/plasma/wallpapers/org.kde.animals/contents/ui/Animal.qml
+share/kde/apps/plasma/wallpapers/org.kde.animals/contents/ui/animals.qml
+share/kde/apps/plasma/wallpapers/org.kde.animals/metadata.desktop
+share/kde/apps/plasma/wallpapers/org.kde.haenau/contents/ui/BackgroundElement.qml
+share/kde/apps/plasma/wallpapers/org.kde.haenau/contents/ui/BottomBackgroundElement.qml
+share/kde/apps/plasma/wallpapers/org.kde.haenau/contents/ui/RightBackgroundElement.qml
+share/kde/apps/plasma/wallpapers/org.kde.haenau/contents/ui/main.qml
+share/kde/apps/plasma/wallpapers/org.kde.haenau/contents/ui/wallpaper.svgz
+share/kde/apps/plasma/wallpapers/org.kde.haenau/metadata.desktop
+share/kde/apps/plasma/wallpapers/org.kde.hunyango/contents/ui/main.qml
+share/kde/apps/plasma/wallpapers/org.kde.hunyango/contents/ui/wallpaper.svgz
+share/kde/apps/plasma/wallpapers/org.kde.hunyango/metadata.desktop
share/kde/apps/plasma_pastebin/plasma_pastebin.notifyrc
share/kde/apps/plasma_wallpaper_pattern/patterns/bees.desktop
share/kde/apps/plasma_wallpaper_pattern/patterns/bees.png
@@ -489,7 +555,8 @@ share/kde4/services/plasma-containment-groupingdesktop.desktop
share/kde4/services/plasma-containment-groupingpanel.desktop
share/kde4/services/plasma-dataengine-comic.desktop
share/kde4/services/plasma-dataengine-kimpanel.desktop
-share/kde4/services/plasma-dataengine-microblog.desktop
+share/kde4/services/plasma-dataengine-konqprofiles.desktop
+share/kde4/services/plasma-dataengine-konsoleprofiles.desktop
share/kde4/services/plasma-dataengine-ocs.desktop
share/kde4/services/plasma-dataengine-potd.desktop
share/kde4/services/plasma-dict-default.desktop
@@ -505,6 +572,8 @@ share/kde4/services/plasma-runner-audioplayercontrol_config.desktop
share/kde4/services/plasma-runner-contacts.desktop
share/kde4/services/plasma-runner-converter.desktop
share/kde4/services/plasma-runner-datetime.desktop
+share/kde4/services/plasma-runner-dictionary.desktop
+share/kde4/services/plasma-runner-dictionary_config.desktop
share/kde4/services/plasma-runner-events.desktop
share/kde4/services/plasma-runner-events_config.desktop
share/kde4/services/plasma-runner-kopete.desktop
@@ -513,10 +582,12 @@ share/kde4/services/plasma-runner-spellchecker_config.desktop
share/kde4/services/plasma-runner-techbase.desktop
share/kde4/services/plasma-runner-wikipedia.desktop
share/kde4/services/plasma-runner-wikitravel.desktop
+share/kde4/services/plasma-runner-youtube.desktop
share/kde4/services/plasma-wallpaper-mandelbrot.desktop
share/kde4/services/plasma-wallpaper-marble.desktop
share/kde4/services/plasma-wallpaper-pattern.desktop
share/kde4/services/plasma-wallpaper-potd.desktop
+share/kde4/services/plasma-wallpaper-qml.desktop
share/kde4/services/plasma-wallpaper-virus.desktop
share/kde4/services/plasma-wallpaper-weather.desktop
share/kde4/services/plasma_applet_plasmaboard.desktop
diff --git a/misc/kdeplasma-addons4/distinfo b/misc/kdeplasma-addons4/distinfo
index ee54b5f4d73..738625a23f5 100644
--- a/misc/kdeplasma-addons4/distinfo
+++ b/misc/kdeplasma-addons4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2012/06/16 04:45:37 markd Exp $
+$NetBSD: distinfo,v 1.17 2013/04/03 10:52:19 markd Exp $
-SHA1 (kdeplasma-addons-4.8.4.tar.xz) = 725d26e3aa59d02bc73a77b43e6aae92bc961254
-RMD160 (kdeplasma-addons-4.8.4.tar.xz) = b15e20fd44a96d383a565c125f78807e8411444f
-Size (kdeplasma-addons-4.8.4.tar.xz) = 1774416 bytes
+SHA1 (kdeplasma-addons-4.10.2.tar.xz) = 26c59eb5738f9efbb94c7109b108ec09d7008ba6
+RMD160 (kdeplasma-addons-4.10.2.tar.xz) = f8ade8ff105b1bdb1d37e8de8c1cccd28e2119a0
+Size (kdeplasma-addons-4.10.2.tar.xz) = 1785252 bytes
SHA1 (patch-ab) = eb477ddc938d7eb9205df386e6f2f17e88de392e
SHA1 (patch-libs_lancelot-datamodels_CMakeLists.txt) = 0f8000457dbfc2de02e451a7a76faff089a1635a
diff --git a/misc/kgeography/Makefile b/misc/kgeography/Makefile
index e742d332f66..f48ec7b6075 100644
--- a/misc/kgeography/Makefile
+++ b/misc/kgeography/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2013/02/16 11:23:20 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2013/04/03 10:52:00 markd Exp $
DISTNAME= kgeography-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE geography trainer
diff --git a/misc/kgeography/distinfo b/misc/kgeography/distinfo
index 91bab4d3ff5..20eed408511 100644
--- a/misc/kgeography/distinfo
+++ b/misc/kgeography/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/06/16 04:45:34 markd Exp $
+$NetBSD: distinfo,v 1.7 2013/04/03 10:52:00 markd Exp $
-SHA1 (kgeography-4.8.4.tar.xz) = 4637c5a792164d083f0ea05e6733160922d8c73b
-RMD160 (kgeography-4.8.4.tar.xz) = d43714d9e197eb2a411452c5ff1beefc3ec56e8b
-Size (kgeography-4.8.4.tar.xz) = 6768292 bytes
+SHA1 (kgeography-4.10.2.tar.xz) = 14cd9d3d788a9f0068af3e10f26f0375b5c7251a
+RMD160 (kgeography-4.10.2.tar.xz) = 160738609b4be62aceb5ccfa2f92094f7808e8f2
+Size (kgeography-4.10.2.tar.xz) = 6721268 bytes
diff --git a/misc/kig/Makefile b/misc/kig/Makefile
index 3904c25855f..f00707f8b1c 100644
--- a/misc/kig/Makefile
+++ b/misc/kig/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:23 markd Exp $
DISTNAME= kig-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE interactive geometry
diff --git a/misc/kig/distinfo b/misc/kig/distinfo
index 56942b2d0d7..bb4c766454d 100644
--- a/misc/kig/distinfo
+++ b/misc/kig/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:23 markd Exp $
-SHA1 (kig-4.8.4.tar.xz) = dcbde5fbb34e0c569a2ef95a328cf69a924cd38e
-RMD160 (kig-4.8.4.tar.xz) = 0e466a7191c802cde9aa98b58982675fca72e3b7
-Size (kig-4.8.4.tar.xz) = 1529956 bytes
+SHA1 (kig-4.10.2.tar.xz) = 0066e645cd11d239678aa90ede938daf4dd0942d
+RMD160 (kig-4.10.2.tar.xz) = 93314209d15e9edb915597464af8cdd677445427
+Size (kig-4.10.2.tar.xz) = 1527356 bytes
diff --git a/misc/kiten/Makefile b/misc/kiten/Makefile
index c3fc82e0f5e..4cad7dcfec6 100644
--- a/misc/kiten/Makefile
+++ b/misc/kiten/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:01 markd Exp $
DISTNAME= kiten-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE Japanese reference/learning tool
diff --git a/misc/kiten/PLIST b/misc/kiten/PLIST
index c7ffdd9eeae..e8143a5a04b 100644
--- a/misc/kiten/PLIST
+++ b/misc/kiten/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:52 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/04/03 10:52:01 markd Exp $
bin/kiten
bin/kitengen
bin/kitenkanjibrowser
@@ -17,8 +17,10 @@ include/libkiten/kromajiedit.h
include/libkiten/libkitenexport.h
lib/libkiten.so
lib/libkiten.so.4
-lib/libkiten.so.4.8.0
+lib/libkiten.so.${PKGVERSION}
share/applications/kde4/kiten.desktop
+share/applications/kde4/kitenkanjibrowser.desktop
+share/applications/kde4/kitenradselect.desktop
share/doc/kde/HTML/en/kiten/common
share/doc/kde/HTML/en/kiten/common_uncommon_filtering.png
share/doc/kde/HTML/en/kiten/ending_search.png
diff --git a/misc/kiten/distinfo b/misc/kiten/distinfo
index 946af084636..b834c9316d6 100644
--- a/misc/kiten/distinfo
+++ b/misc/kiten/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:01 markd Exp $
-SHA1 (kiten-4.8.4.tar.xz) = f7b5f9b6cbbda37c539f1ffce9bd905f0be3658e
-RMD160 (kiten-4.8.4.tar.xz) = de8f2403916c25ec1eb36dbe5f2195c0802a2894
-Size (kiten-4.8.4.tar.xz) = 12039428 bytes
+SHA1 (kiten-4.10.2.tar.xz) = 7aa2d6889c932639ded77eac33b9ae09ed7bbc45
+RMD160 (kiten-4.10.2.tar.xz) = 28d6660f95799ab2e4da4023fc9227c9892f28b9
+Size (kiten-4.10.2.tar.xz) = 11740792 bytes
diff --git a/misc/klettres/Makefile b/misc/klettres/Makefile
index 04d3aad10ea..573cc196036 100644
--- a/misc/klettres/Makefile
+++ b/misc/klettres/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:01 markd Exp $
DISTNAME= klettres-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE app to help learn the alphabet and read some syllables in languages
diff --git a/misc/klettres/distinfo b/misc/klettres/distinfo
index de37b244995..16ed2c7a2c4 100644
--- a/misc/klettres/distinfo
+++ b/misc/klettres/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:35 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:02 markd Exp $
-SHA1 (klettres-4.8.4.tar.xz) = b5dc64cdd09f265cd7a84d0ee14a93ea4ae067be
-RMD160 (klettres-4.8.4.tar.xz) = ca490eb86c2494496a87bf8292cdb9b4f6d49daa
-Size (klettres-4.8.4.tar.xz) = 2657820 bytes
+SHA1 (klettres-4.10.2.tar.xz) = 101cd33b6e099174358d1ac754747cdf17cf6ba5
+RMD160 (klettres-4.10.2.tar.xz) = b4b97e612ad753649744cdcc3ed35c8b6823a72e
+Size (klettres-4.10.2.tar.xz) = 2655492 bytes
diff --git a/misc/kmag/Makefile b/misc/kmag/Makefile
index 582de7fc24b..ececd8165d4 100644
--- a/misc/kmag/Makefile
+++ b/misc/kmag/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:21 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:52 markd Exp $
DISTNAME= kmag-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE screen magnifier
diff --git a/misc/kmag/distinfo b/misc/kmag/distinfo
index 32153baf7e2..aa7d34d4689 100644
--- a/misc/kmag/distinfo
+++ b/misc/kmag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:52 markd Exp $
-SHA1 (kmag-4.8.4.tar.xz) = 7b5b51422d4241d6303841805a04b2eace0c7a2d
-RMD160 (kmag-4.8.4.tar.xz) = b406c3a9ac47a152cec509b0d5500b0a9378ac2e
-Size (kmag-4.8.4.tar.xz) = 93388 bytes
+SHA1 (kmag-4.10.2.tar.xz) = 4bcb0153663ab67eafba4cb450b62891133b4ab2
+RMD160 (kmag-4.10.2.tar.xz) = bb3ceb0423bd593e16e49f4916e2560d9e1709bf
+Size (kmag-4.10.2.tar.xz) = 93436 bytes
diff --git a/misc/kmousetool/Makefile b/misc/kmousetool/Makefile
index 5544af0156b..21dbf303070 100644
--- a/misc/kmousetool/Makefile
+++ b/misc/kmousetool/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:53 markd Exp $
DISTNAME= kmousetool-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE mouse manipulation tool
diff --git a/misc/kmousetool/distinfo b/misc/kmousetool/distinfo
index 0b01da05c42..cd08377ada5 100644
--- a/misc/kmousetool/distinfo
+++ b/misc/kmousetool/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:53 markd Exp $
-SHA1 (kmousetool-4.8.4.tar.xz) = 6667336267a3a65bf0b33a8454299558ad458108
-RMD160 (kmousetool-4.8.4.tar.xz) = 842989b324aa6edd3f610e193f2c059f49f81892
-Size (kmousetool-4.8.4.tar.xz) = 46320 bytes
+SHA1 (kmousetool-4.10.2.tar.xz) = d6778d9393b0a1cfa597565bc77771b78d98422f
+RMD160 (kmousetool-4.10.2.tar.xz) = a356e43e4204900e9649b10bc8d5d98b5114a3b9
+Size (kmousetool-4.10.2.tar.xz) = 43780 bytes
diff --git a/misc/kmouth/Makefile b/misc/kmouth/Makefile
index fec1837054f..f617e272c15 100644
--- a/misc/kmouth/Makefile
+++ b/misc/kmouth/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:22 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:52 markd Exp $
DISTNAME= kmouth-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE Speech Synthesizer frontend
diff --git a/misc/kmouth/distinfo b/misc/kmouth/distinfo
index ff1fe254401..9149203c383 100644
--- a/misc/kmouth/distinfo
+++ b/misc/kmouth/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:53 markd Exp $
-SHA1 (kmouth-4.8.4.tar.xz) = 104bb2c434deabbaa57326fe567fc90c4067f36c
-RMD160 (kmouth-4.8.4.tar.xz) = 78f10eb56bc97df73d522d71658d3bcb12a33eeb
-Size (kmouth-4.8.4.tar.xz) = 323252 bytes
+SHA1 (kmouth-4.10.2.tar.xz) = 3ed90ae8a113264ef9b8c176c905f3d365443766
+RMD160 (kmouth-4.10.2.tar.xz) = 1b18750c39c40c63a39da653a4719c20c1c9d573
+Size (kmouth-4.10.2.tar.xz) = 321596 bytes
diff --git a/misc/kremotecontrol/Makefile b/misc/kremotecontrol/Makefile
index a9f88fe8188..cce854a58ba 100644
--- a/misc/kremotecontrol/Makefile
+++ b/misc/kremotecontrol/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:15 markd Exp $
DISTNAME= kremotecontrol-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE frontend for your remote controls.
diff --git a/misc/kremotecontrol/PLIST b/misc/kremotecontrol/PLIST
index ab1b2235dac..ea42a4cd0aa 100644
--- a/misc/kremotecontrol/PLIST
+++ b/misc/kremotecontrol/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 06:35:28 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:16 markd Exp $
bin/krcdnotifieritem
lib/kde4/kcm_remotecontrol.so
lib/kde4/kded_kremotecontroldaemon.so
@@ -45,7 +45,9 @@ share/kde/apps/kremotecontrol/profiles/kscd.profile.xml
share/kde/apps/kremotecontrol/profiles/okular.profile.xml
share/kde/apps/kremotecontrol/profiles/powermanagement.profile.xml
share/kde/apps/kremotecontrol/profiles/profile.xsd
+share/kde/apps/kremotecontrol/profiles/tomahawk.profile.xml
share/kde/apps/kremotecontrol/profiles/vlc.profile.xml
+share/kde/apps/kremotecontrol/profiles/vlc2.profile.xml
share/kde/apps/kremotecontroldaemon/kremotecontroldaemon.notifyrc
share/kde4/services/kcm_remotecontrol.desktop
share/kde4/services/kded/kremotecontroldaemon.desktop
diff --git a/misc/kremotecontrol/distinfo b/misc/kremotecontrol/distinfo
index 1638b73245f..f3ed1fd5ecd 100644
--- a/misc/kremotecontrol/distinfo
+++ b/misc/kremotecontrol/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:35 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:16 markd Exp $
-SHA1 (kremotecontrol-4.8.4.tar.xz) = 2c967b6d5738d3947401d9055f0956dfd16b2ec2
-RMD160 (kremotecontrol-4.8.4.tar.xz) = 5b286f95bc83ae183d19105e0ffd3889d3cc9224
-Size (kremotecontrol-4.8.4.tar.xz) = 1084088 bytes
+SHA1 (kremotecontrol-4.10.2.tar.xz) = e74d4724afef6fdfb5b4a95e35672b3e3d8e9b5c
+RMD160 (kremotecontrol-4.10.2.tar.xz) = 4fc781ab94e6fa03f003c50738c254b5df77323e
+Size (kremotecontrol-4.10.2.tar.xz) = 1083608 bytes
diff --git a/misc/kstars/Makefile b/misc/kstars/Makefile
index 9eb81cc4998..ebfff7acc52 100644
--- a/misc/kstars/Makefile
+++ b/misc/kstars/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2013/02/16 11:23:23 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2013/04/03 10:52:02 markd Exp $
DISTNAME= kstars-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE desktop planetarium
diff --git a/misc/kstars/PLIST b/misc/kstars/PLIST
index f3e8c9b8f63..3acc77a69ef 100644
--- a/misc/kstars/PLIST
+++ b/misc/kstars/PLIST
@@ -1,7 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 2012/03/20 08:35:30 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/03 10:52:02 markd Exp $
bin/kstars
lib/libhtmesh.a
share/applications/kde4/kstars.desktop
+share/doc/kde/HTML/en/kstars/Add_Object_to_Session_plan.png
+share/doc/kde/HTML/en/kstars/Another_way4.png
+share/doc/kde/HTML/en/kstars/Another_way5.png
+share/doc/kde/HTML/en/kstars/Another_way6.png
+share/doc/kde/HTML/en/kstars/Another_way_to_add.png
+share/doc/kde/HTML/en/kstars/Another_way_to_add_part3.png
+share/doc/kde/HTML/en/kstars/Delete_all_images.png
+share/doc/kde/HTML/en/kstars/KStars_Neptune.png
+share/doc/kde/HTML/en/kstars/Savin_session.png
+share/doc/kde/HTML/en/kstars/WUT.png
share/doc/kde/HTML/en/kstars/aavso.png
share/doc/kde/HTML/en/kstars/ai-contents.docbook
share/doc/kde/HTML/en/kstars/alpha.png
@@ -39,6 +49,7 @@ share/doc/kde/HTML/en/kstars/colorandtemp.docbook
share/doc/kde/HTML/en/kstars/commands.docbook
share/doc/kde/HTML/en/kstars/common
share/doc/kde/HTML/en/kstars/config.docbook
+share/doc/kde/HTML/en/kstars/cosmicdist.docbook
share/doc/kde/HTML/en/kstars/cpoles.docbook
share/doc/kde/HTML/en/kstars/credits.docbook
share/doc/kde/HTML/en/kstars/csphere.docbook
@@ -46,10 +57,14 @@ share/doc/kde/HTML/en/kstars/darkmatter.docbook
share/doc/kde/HTML/en/kstars/detaildialog.png
share/doc/kde/HTML/en/kstars/details.docbook
share/doc/kde/HTML/en/kstars/devicemanager.png
+share/doc/kde/HTML/en/kstars/dss.png
share/doc/kde/HTML/en/kstars/dumpmode.docbook
share/doc/kde/HTML/en/kstars/ecliptic.docbook
share/doc/kde/HTML/en/kstars/ellipticalgalaxies.docbook
+share/doc/kde/HTML/en/kstars/epoch.docbook
share/doc/kde/HTML/en/kstars/equinox.docbook
+share/doc/kde/HTML/en/kstars/execute_session_nt.png
+share/doc/kde/HTML/en/kstars/execute_session_the_nt.png
share/doc/kde/HTML/en/kstars/faq.docbook
share/doc/kde/HTML/en/kstars/find.png
share/doc/kde/HTML/en/kstars/fitsarea.png
@@ -87,8 +102,7 @@ share/doc/kde/HTML/en/kstars/luminosity_ex.png
share/doc/kde/HTML/en/kstars/magnitude.docbook
share/doc/kde/HTML/en/kstars/meridian.docbook
share/doc/kde/HTML/en/kstars/newfov.png
-share/doc/kde/HTML/en/kstars/observinglist.docbook
-share/doc/kde/HTML/en/kstars/observinglist.png
+share/doc/kde/HTML/en/kstars/obsplanner.docbook
share/doc/kde/HTML/en/kstars/parallax.docbook
share/doc/kde/HTML/en/kstars/popup.png
share/doc/kde/HTML/en/kstars/precession.docbook
@@ -97,6 +111,7 @@ share/doc/kde/HTML/en/kstars/retrograde.docbook
share/doc/kde/HTML/en/kstars/screen1.png
share/doc/kde/HTML/en/kstars/scriptbuilder.docbook
share/doc/kde/HTML/en/kstars/scriptbuilder.png
+share/doc/kde/HTML/en/kstars/sds.png
share/doc/kde/HTML/en/kstars/sidereal.docbook
share/doc/kde/HTML/en/kstars/skycoords.docbook
share/doc/kde/HTML/en/kstars/skymapdevice.png
@@ -105,6 +120,7 @@ share/doc/kde/HTML/en/kstars/solarsystem.png
share/doc/kde/HTML/en/kstars/spiralgalaxies.docbook
share/doc/kde/HTML/en/kstars/star_colors.png
share/doc/kde/HTML/en/kstars/stars.docbook
+share/doc/kde/HTML/en/kstars/telescopes.docbook
share/doc/kde/HTML/en/kstars/timezones.docbook
share/doc/kde/HTML/en/kstars/tools.docbook
share/doc/kde/HTML/en/kstars/utime.docbook
@@ -161,31 +177,37 @@ share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_cnames.png
share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_deepsky.png
share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_flag.png
share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_grid.png
+share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_hgrid.png
share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_horizon.png
share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_mw.png
share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_planets.png
share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_satellites.png
share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_stars.png
+share/kde/apps/kstars/icons/hicolor/22x22/actions/kstars_supernovae.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_clines.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_cnames.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_deepsky.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_flag.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_grid.png
+share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_hgrid.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_horizon.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_mw.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_planets.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_satellites.png
share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_stars.png
+share/kde/apps/kstars/icons/hicolor/32x32/actions/kstars_supernovae.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_clines.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_cnames.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_deepsky.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_flag.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_grid.png
+share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_hgrid.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_horizon.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_mw.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_planets.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_satellites.png
share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_stars.png
+share/kde/apps/kstars/icons/hicolor/48x48/actions/kstars_supernovae.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_advanced.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_catalog.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_cbound.png
@@ -196,12 +218,14 @@ share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_deepsky.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_flag.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_grid.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_guides.png
+share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_hgrid.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_horizon.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_mw.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_planets.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_satellites.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_solarsystem.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_stars.png
+share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_supernovae.png
share/kde/apps/kstars/icons/hicolor/64x64/actions/kstars_xplanet.png
share/kde/apps/kstars/icons/hicolor/scalable/actions/kstars_cbound.svgz
share/kde/apps/kstars/icons/hicolor/scalable/actions/kstars_clines.svgz
diff --git a/misc/kstars/distinfo b/misc/kstars/distinfo
index 7a8bc91601c..f6126062068 100644
--- a/misc/kstars/distinfo
+++ b/misc/kstars/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/06/16 04:45:35 markd Exp $
+$NetBSD: distinfo,v 1.7 2013/04/03 10:52:02 markd Exp $
-SHA1 (kstars-4.8.4.tar.xz) = 579cec66cfb172258d2967872a2b9c32d4514c75
-RMD160 (kstars-4.8.4.tar.xz) = 2e93c0c81515293cca7a13353475de58a73cf642
-Size (kstars-4.8.4.tar.xz) = 12345052 bytes
+SHA1 (kstars-4.10.2.tar.xz) = ce99c18862505eac3da729e666315d0b27daec1e
+RMD160 (kstars-4.10.2.tar.xz) = 9c4f209d2a8008544c04b74149268432e4b05695
+Size (kstars-4.10.2.tar.xz) = 12470500 bytes
+SHA1 (patch-kstars_skyobjects_ksmoon.cpp) = 23d31289ca18075afb38324b72ca41a1287aa9b3
diff --git a/misc/kstars/patches/patch-kstars_skyobjects_ksmoon.cpp b/misc/kstars/patches/patch-kstars_skyobjects_ksmoon.cpp
new file mode 100644
index 00000000000..fc7e1a7b2f2
--- /dev/null
+++ b/misc/kstars/patches/patch-kstars_skyobjects_ksmoon.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-kstars_skyobjects_ksmoon.cpp,v 1.1 2013/04/03 10:52:03 markd Exp $
+
+'isnan' was not declared in scope
+
+--- kstars/skyobjects/ksmoon.cpp.orig 2013-03-01 06:45:57.000000000 +0000
++++ kstars/skyobjects/ksmoon.cpp
+@@ -222,7 +222,7 @@ void KSMoon::findMagnitude(const KSNumbe
+ // relevant data put into ksplanetbase.h) was taken from
+ // SkyChart v3 Beta
+ double phd = phase().Degrees();
+- if( isnan( phd ) ) // Avoid nanny phases.
++ if( std::isnan( phd ) ) // Avoid nanny phases.
+ return;
+ int p = floor( phd );
+ if( p > 180 )
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index eeddc8a6d97..b2aec3b1e48 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:23 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:03 markd Exp $
DISTNAME= ktouch-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE touch typing tutor
@@ -12,5 +11,6 @@ COMMENT= KDE touch typing tutor
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/ktouch/PLIST b/misc/ktouch/PLIST
index 59987730528..0c328b621a3 100644
--- a/misc/ktouch/PLIST
+++ b/misc/ktouch/PLIST
@@ -1,117 +1,188 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 08:34:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:03 markd Exp $
bin/ktouch
+lib/kde4/imports/org/kde/ktouch/graph/BarGraph.qml
+lib/kde4/imports/org/kde/ktouch/graph/Label.qml
+lib/kde4/imports/org/kde/ktouch/graph/LegendItem.qml
+lib/kde4/imports/org/kde/ktouch/graph/LineGraph.qml
+lib/kde4/imports/org/kde/ktouch/graph/LineLabel.qml
+lib/kde4/imports/org/kde/ktouch/graph/libgraphplugin.so
+lib/kde4/imports/org/kde/ktouch/graph/qmldir
man/man1/ktouch.1
share/applications/kde4/ktouch.desktop
+share/doc/kde/HTML/en/ktouch/Icon-arrow-down.png
+share/doc/kde/HTML/en/ktouch/Icon-arrow-left.png
+share/doc/kde/HTML/en/ktouch/Icon-arrow-right.png
+share/doc/kde/HTML/en/ktouch/Icon-arrow-up.png
+share/doc/kde/HTML/en/ktouch/Icon-configure.png
+share/doc/kde/HTML/en/ktouch/Icon-dialog-information.png
+share/doc/kde/HTML/en/ktouch/Icon-document-new.png
+share/doc/kde/HTML/en/ktouch/Icon-edit-delete.png
+share/doc/kde/HTML/en/ktouch/Icon-go-home.png
+share/doc/kde/HTML/en/ktouch/Icon-list-add.png
+share/doc/kde/HTML/en/ktouch/Icon-list-remove.png
+share/doc/kde/HTML/en/ktouch/Icon-media-playback-pause.png
+share/doc/kde/HTML/en/ktouch/Icon-object-locked.png
+share/doc/kde/HTML/en/ktouch/character_editing.png
share/doc/kde/HTML/en/ktouch/color_options.png
share/doc/kde/HTML/en/ktouch/common
-share/doc/kde/HTML/en/ktouch/general_options.png
+share/doc/kde/HTML/en/ktouch/courses.png
+share/doc/kde/HTML/en/ktouch/create.png
+share/doc/kde/HTML/en/ktouch/create_course1.png
+share/doc/kde/HTML/en/ktouch/create_course2.png
+share/doc/kde/HTML/en/ktouch/create_course3.png
+share/doc/kde/HTML/en/ktouch/create_layout1.png
+share/doc/kde/HTML/en/ktouch/create_layout2.png
+share/doc/kde/HTML/en/ktouch/create_layout3.png
+share/doc/kde/HTML/en/ktouch/home_screen.png
share/doc/kde/HTML/en/ktouch/index.cache.bz2
share/doc/kde/HTML/en/ktouch/index.docbook
-share/doc/kde/HTML/en/ktouch/keyboard_options.png
+share/doc/kde/HTML/en/ktouch/key_editing.png
+share/doc/kde/HTML/en/ktouch/ktouch_menu.png
share/doc/kde/HTML/en/ktouch/main_screen_default_color.png
share/doc/kde/HTML/en/ktouch/main_window_german.png
share/doc/kde/HTML/en/ktouch/man-ktouch.1.docbook
-share/doc/kde/HTML/en/ktouch/sound_options.png
+share/doc/kde/HTML/en/ktouch/pause_options.png
+share/doc/kde/HTML/en/ktouch/profiles.png
+share/doc/kde/HTML/en/ktouch/profiles1.png
+share/doc/kde/HTML/en/ktouch/quality_check.png
+share/doc/kde/HTML/en/ktouch/score_screen.png
+share/doc/kde/HTML/en/ktouch/score_screen_errors.png
share/doc/kde/HTML/en/ktouch/statistics_dialog.png
-share/doc/kde/HTML/en/ktouch/statistics_dialog_chart.png
+share/doc/kde/HTML/en/ktouch/statistics_hovering.png
+share/doc/kde/HTML/en/ktouch/statistics_over.png
+share/doc/kde/HTML/en/ktouch/statistics_show.png
share/doc/kde/HTML/en/ktouch/training_options.png
+share/doc/kde/HTML/en/ktouch/welcome_screen.png
share/icons/hicolor/128x128/apps/ktouch.png
share/icons/hicolor/16x16/apps/ktouch.png
share/icons/hicolor/22x22/apps/ktouch.png
share/icons/hicolor/32x32/apps/ktouch.png
share/icons/hicolor/48x48/apps/ktouch.png
share/icons/hicolor/scalable/apps/ktouch.svgz
-share/kde/apps/ktouch/Lecture/Arabic/ar.ktouch.xml
-share/kde/apps/ktouch/Lecture/Brazilian/pt.br-nativo.ktouch.xml
-share/kde/apps/ktouch/Lecture/Bulgarian/bg.ktouch.xml
-share/kde/apps/ktouch/Lecture/Bulgarian/bg.long.ktouch.xml
-share/kde/apps/ktouch/Lecture/Catalan/ca.ktouch.xml
-share/kde/apps/ktouch/Lecture/Czech/cs.ktouch.xml
-share/kde/apps/ktouch/Lecture/Danish/da.auto.ktouch.xml
-share/kde/apps/ktouch/Lecture/Danish/da.ktouch.xml
-share/kde/apps/ktouch/Lecture/Dutch/nl.junior.ktouch.xml
-share/kde/apps/ktouch/Lecture/Dutch/nl.ktouch.xml
-share/kde/apps/ktouch/Lecture/English/en.colemak.ktouch.xml
-share/kde/apps/ktouch/Lecture/English/en.dvorak1.ktouch.xml
-share/kde/apps/ktouch/Lecture/English/en.dvorak2.ktouch.xml
-share/kde/apps/ktouch/Lecture/English/en.ktouch.xml
-share/kde/apps/ktouch/Lecture/English/english_alphagrip.ktouch.xml
-share/kde/apps/ktouch/Lecture/Finnish/fi.junior.ktouch.xml
-share/kde/apps/ktouch/Lecture/Finnish/fi.ktouch.xml
-share/kde/apps/ktouch/Lecture/French/fr.auto1.ktouch.xml
-share/kde/apps/ktouch/Lecture/French/fr.auto2.ktouch.xml
-share/kde/apps/ktouch/Lecture/French/fr.dvorak1.ktouch.xml
-share/kde/apps/ktouch/Lecture/French/fr.dvorak2.ktouch.xml
-share/kde/apps/ktouch/Lecture/German/de.1.ktouch.xml
-share/kde/apps/ktouch/Lecture/German/de.2.ktouch.xml
-share/kde/apps/ktouch/Lecture/German/de.3.ktouch.xml
-share/kde/apps/ktouch/Lecture/German/de.dvorak.ktouch.xml
-share/kde/apps/ktouch/Lecture/German/de.neo2.ktouch.xml
-share/kde/apps/ktouch/Lecture/German/de.number.ktouch.xml
-share/kde/apps/ktouch/Lecture/Hellenic/el.ktouch.xml
-share/kde/apps/ktouch/Lecture/Hungarian/hu.expert.ktouch.xml
-share/kde/apps/ktouch/Lecture/Hungarian/hu.ktouch.xml
-share/kde/apps/ktouch/Lecture/Italian/it.ktouch.xml
-share/kde/apps/ktouch/Lecture/Latin/la.ktouch.xml
-share/kde/apps/ktouch/Lecture/Lithuanian/lt.ktouch.xml
-share/kde/apps/ktouch/Lecture/Norwegian/no.ktouch.xml
-share/kde/apps/ktouch/Lecture/Polish/pl.ktouch.xml
-share/kde/apps/ktouch/Lecture/Russian/ru.1.ktouch.xml
-share/kde/apps/ktouch/Lecture/Russian/ru.2.ktouch.xml
-share/kde/apps/ktouch/Lecture/Russian/ru.long.ktouch.xml
-share/kde/apps/ktouch/Lecture/Slovak/sl.ktouch.xml
-share/kde/apps/ktouch/Lecture/Slovenian/slovenian.ktouch.xml
-share/kde/apps/ktouch/Lecture/Spanish/es.1.ktouch.xml
-share/kde/apps/ktouch/Lecture/Spanish/es.2.ktouch.xml
-share/kde/apps/ktouch/Lecture/Spanish/es.3.ktouch.xml
-share/kde/apps/ktouch/Lecture/Spanish/es.dvorak.ktouch.xml
-share/kde/apps/ktouch/Lecture/Turkish/tr.ktouch.xml
-share/kde/apps/ktouch/Lecture/Ukrainian/uk.ktouch.xml
-share/kde/apps/ktouch/down.wav
-share/kde/apps/ktouch/error.wav
-share/kde/apps/ktouch/keyboard/arabic/ar.keyboard.xml
-share/kde/apps/ktouch/keyboard/brazilian/pt.br.keyboard.xml
-share/kde/apps/ktouch/keyboard/bulgarian/bg.keyboard.xml
-share/kde/apps/ktouch/keyboard/czech/cs.qwerty.keyboard.xml
-share/kde/apps/ktouch/keyboard/czech/cs.qwertz.keyboard.xml
-share/kde/apps/ktouch/keyboard/danish/dk.keyboard.xml
-share/kde/apps/ktouch/keyboard/english/en.colemak.keyboard.xml
-share/kde/apps/ktouch/keyboard/english/en.dvorak.keyboard.xml
-share/kde/apps/ktouch/keyboard/english/en.keyboard.xml
-share/kde/apps/ktouch/keyboard/english/en_alphagrip.keyboard.xml
-share/kde/apps/ktouch/keyboard/english/en_gb.dvorak.keyboard.xml
-share/kde/apps/ktouch/keyboard/english/en_gb.qwerty.keyboard.xml
-share/kde/apps/ktouch/keyboard/estonian/ee.keyboard.xml
-share/kde/apps/ktouch/keyboard/finnish/fi.keyboard.xml
-share/kde/apps/ktouch/keyboard/french/fr.dvorak.keyboard.xml
-share/kde/apps/ktouch/keyboard/french/fr.keyboard.xml
-share/kde/apps/ktouch/keyboard/german/de.dvorak.type2.keyboard.xml
-share/kde/apps/ktouch/keyboard/german/de.keyboard.xml
-share/kde/apps/ktouch/keyboard/german/de.neo2.all.keyboard.xml
-share/kde/apps/ktouch/keyboard/greek/el.keyboard.xml
-share/kde/apps/ktouch/keyboard/hebrew/he.keyboard.xml
-share/kde/apps/ktouch/keyboard/hungarian/hu.keyboard.xml
-share/kde/apps/ktouch/keyboard/italian/it.keyboard.xml
-share/kde/apps/ktouch/keyboard/kannada/kn.keyboard.xml
-share/kde/apps/ktouch/keyboard/latin/lat.keyboard.xml
-share/kde/apps/ktouch/keyboard/lithuanian/lt.keyboard.xml
-share/kde/apps/ktouch/keyboard/norwegian/no.keyboard.xml
-share/kde/apps/ktouch/keyboard/quebec/qc.keyboard.xml
-share/kde/apps/ktouch/keyboard/russian/ru.keyboard.xml
-share/kde/apps/ktouch/keyboard/russian/ru.winkeys.keyboard.xml
-share/kde/apps/ktouch/keyboard/slovak/sk.qwerty.keyboard.xml
-share/kde/apps/ktouch/keyboard/slovak/sk.qwertz.keyboard.xml
-share/kde/apps/ktouch/keyboard/slovenian/sl.keyboard.xml
-share/kde/apps/ktouch/keyboard/spanish/es.dvorak.keyboard.xml
-share/kde/apps/ktouch/keyboard/spanish/es.keyboard.xml
-share/kde/apps/ktouch/keyboard/swedish/sv.keyboard.xml
-share/kde/apps/ktouch/keyboard/swiss/ch.de.keyboard.xml
-share/kde/apps/ktouch/keyboard/swiss/ch.fr.keyboard.xml
-share/kde/apps/ktouch/keyboard/tamil/ta_eng.keyboard.xml
-share/kde/apps/ktouch/keyboard/tamil/tamil.keyboard.xml
-share/kde/apps/ktouch/keyboard/ukrainian/uk.winkeys.keyboard.xml
-share/kde/apps/ktouch/ktouchui.rc
-share/kde/apps/ktouch/splash.png
-share/kde/apps/ktouch/typewriter.wav
-share/kde/apps/ktouch/up.wav
+share/kde/apps/ktouch/courses/ara.xml
+share/kde/apps/ktouch/courses/bg1.xml
+share/kde/apps/ktouch/courses/bg2.xml
+share/kde/apps/ktouch/courses/br.xml
+share/kde/apps/ktouch/courses/cat.xml
+share/kde/apps/ktouch/courses/cz.xml
+share/kde/apps/ktouch/courses/de.dvorak.xml
+share/kde/apps/ktouch/courses/de.neo.xml
+share/kde/apps/ktouch/courses/de1.xml
+share/kde/apps/ktouch/courses/de2.xml
+share/kde/apps/ktouch/courses/dk1.xml
+share/kde/apps/ktouch/courses/es.dvorak.xml
+share/kde/apps/ktouch/courses/es1.xml
+share/kde/apps/ktouch/courses/es2.xml
+share/kde/apps/ktouch/courses/es3.xml
+share/kde/apps/ktouch/courses/fi.xml
+share/kde/apps/ktouch/courses/fr.dvarok.xml
+share/kde/apps/ktouch/courses/fr.xml
+share/kde/apps/ktouch/courses/gb.xml
+share/kde/apps/ktouch/courses/gr.xml
+share/kde/apps/ktouch/courses/it.xml
+share/kde/apps/ktouch/courses/lt.std.xml
+share/kde/apps/ktouch/courses/nl1.xml
+share/kde/apps/ktouch/courses/nl2.xml
+share/kde/apps/ktouch/courses/no.xml
+share/kde/apps/ktouch/courses/pl.xml
+share/kde/apps/ktouch/courses/ru.legacy.xml
+share/kde/apps/ktouch/courses/ru1.xml
+share/kde/apps/ktouch/courses/ru2.xml
+share/kde/apps/ktouch/courses/si.xml
+share/kde/apps/ktouch/courses/sk.xml
+share/kde/apps/ktouch/courses/tr.xml
+share/kde/apps/ktouch/courses/ua.xml
+share/kde/apps/ktouch/courses/us.colemak.xml
+share/kde/apps/ktouch/courses/us.dvorak1.xml
+share/kde/apps/ktouch/courses/us.dvorak2.xml
+share/kde/apps/ktouch/courses/us.xml
+share/kde/apps/ktouch/data.xml
+share/kde/apps/ktouch/images/accuracymeter.svgz
+share/kde/apps/ktouch/images/charactersperminutemeter.svgz
+share/kde/apps/ktouch/images/elapsedtimemeter.svgz
+share/kde/apps/ktouch/images/meterbox.svgz
+share/kde/apps/ktouch/images/resizegrip.svgz
+share/kde/apps/ktouch/images/statusled.svgz
+share/kde/apps/ktouch/images/trainingscreen.svgz
+share/kde/apps/ktouch/keyboardlayouts/ara.xml
+share/kde/apps/ktouch/keyboardlayouts/be.xml
+share/kde/apps/ktouch/keyboardlayouts/bg.xml
+share/kde/apps/ktouch/keyboardlayouts/br.xml
+share/kde/apps/ktouch/keyboardlayouts/ch.fr.xml
+share/kde/apps/ktouch/keyboardlayouts/ch.xml
+share/kde/apps/ktouch/keyboardlayouts/cz.qwerty.xml
+share/kde/apps/ktouch/keyboardlayouts/cz.xml
+share/kde/apps/ktouch/keyboardlayouts/de.dvorak.xml
+share/kde/apps/ktouch/keyboardlayouts/de.neo2.xml
+share/kde/apps/ktouch/keyboardlayouts/de.xml
+share/kde/apps/ktouch/keyboardlayouts/dk.xml
+share/kde/apps/ktouch/keyboardlayouts/ee.xml
+share/kde/apps/ktouch/keyboardlayouts/es.dvorak.xml
+share/kde/apps/ktouch/keyboardlayouts/es.xml
+share/kde/apps/ktouch/keyboardlayouts/fi.xml
+share/kde/apps/ktouch/keyboardlayouts/fr.dvorak.xml
+share/kde/apps/ktouch/keyboardlayouts/fr.xml
+share/kde/apps/ktouch/keyboardlayouts/gb.dvorak.xml
+share/kde/apps/ktouch/keyboardlayouts/gb.xml
+share/kde/apps/ktouch/keyboardlayouts/hu.xml
+share/kde/apps/ktouch/keyboardlayouts/il.xml
+share/kde/apps/ktouch/keyboardlayouts/in.kan.xml
+share/kde/apps/ktouch/keyboardlayouts/in.tam_unicode.xml
+share/kde/apps/ktouch/keyboardlayouts/it.xml
+share/kde/apps/ktouch/keyboardlayouts/latam.xml
+share/kde/apps/ktouch/keyboardlayouts/lt.std.xml
+share/kde/apps/ktouch/keyboardlayouts/no.xml
+share/kde/apps/ktouch/keyboardlayouts/pt.xml
+share/kde/apps/ktouch/keyboardlayouts/ru.legacy.xml
+share/kde/apps/ktouch/keyboardlayouts/ru.xml
+share/kde/apps/ktouch/keyboardlayouts/se.xml
+share/kde/apps/ktouch/keyboardlayouts/si.xml
+share/kde/apps/ktouch/keyboardlayouts/sk.qwerty.xml
+share/kde/apps/ktouch/keyboardlayouts/sk.xml
+share/kde/apps/ktouch/keyboardlayouts/tr.f.xml
+share/kde/apps/ktouch/keyboardlayouts/ua.xml
+share/kde/apps/ktouch/keyboardlayouts/us.colemak.xml
+share/kde/apps/ktouch/keyboardlayouts/us.dvorak.xml
+share/kde/apps/ktouch/keyboardlayouts/us.xml
+share/kde/apps/ktouch/qml/AccuracyMeter.qml
+share/kde/apps/ktouch/qml/Balloon.qml
+share/kde/apps/ktouch/qml/CharactersPerMinuteMeter.qml
+share/kde/apps/ktouch/qml/CourseDescriptionItem.qml
+share/kde/apps/ktouch/qml/CoursePage.qml
+share/kde/apps/ktouch/qml/CourseSelector.qml
+share/kde/apps/ktouch/qml/ElapsedTimeMeter.qml
+share/kde/apps/ktouch/qml/HomeScreen.qml
+share/kde/apps/ktouch/qml/InfoItem.qml
+share/kde/apps/ktouch/qml/InformationTable.qml
+share/kde/apps/ktouch/qml/InitialProfileForm.qml
+share/kde/apps/ktouch/qml/KeyItem.qml
+share/kde/apps/ktouch/qml/KeyLabel.qml
+share/kde/apps/ktouch/qml/Keyboard.qml
+share/kde/apps/ktouch/qml/KeyboardLayoutEditor.qml
+share/kde/apps/ktouch/qml/KeyboardUnavailableNotice.qml
+share/kde/apps/ktouch/qml/LearningProgressGraph.qml
+share/kde/apps/ktouch/qml/LessonLockedNotice.qml
+share/kde/apps/ktouch/qml/LessonPreview.qml
+share/kde/apps/ktouch/qml/LessonSelector.qml
+share/kde/apps/ktouch/qml/ListItem.qml
+share/kde/apps/ktouch/qml/MessageBox.qml
+share/kde/apps/ktouch/qml/Meter.qml
+share/kde/apps/ktouch/qml/NoCoursesMessage.qml
+share/kde/apps/ktouch/qml/ProfileDetailsItem.qml
+share/kde/apps/ktouch/qml/ProfileForm.qml
+share/kde/apps/ktouch/qml/ProfileSelector.qml
+share/kde/apps/ktouch/qml/ScoreScreen.qml
+share/kde/apps/ktouch/qml/SelectionGrip.qml
+share/kde/apps/ktouch/qml/SelectionRectangle.qml
+share/kde/apps/ktouch/qml/SheetDialog.qml
+share/kde/apps/ktouch/qml/StatBox.qml
+share/kde/apps/ktouch/qml/TrainingLine.qml
+share/kde/apps/ktouch/qml/TrainingScreen.qml
+share/kde/apps/ktouch/qml/TrainingScreenMenuOverlay.qml
+share/kde/apps/ktouch/qml/TrainingScreenToolbar.qml
+share/kde/apps/ktouch/qml/TrainingWidget.qml
+share/kde/apps/ktouch/qml/main.qml
+share/kde/apps/ktouch/schemata/course.xsd
+share/kde/apps/ktouch/schemata/data.xsd
+share/kde/apps/ktouch/schemata/keyboardlayout.xsd
share/kde/config.kcfg/ktouch.kcfg
diff --git a/misc/ktouch/distinfo b/misc/ktouch/distinfo
index 67a5f011a7b..2df8527aba2 100644
--- a/misc/ktouch/distinfo
+++ b/misc/ktouch/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:03 markd Exp $
-SHA1 (ktouch-4.8.4.tar.xz) = 95e7712b9644d1b3491c988bc591d7c5b4e4d3b7
-RMD160 (ktouch-4.8.4.tar.xz) = ccff91e1f1eb1d8bdd9859f0200255aa9a4820fb
-Size (ktouch-4.8.4.tar.xz) = 1726028 bytes
+SHA1 (ktouch-4.10.2.tar.xz) = 7a7c44b1bf64fdc5109be9d1b6d1481db6a1848f
+RMD160 (ktouch-4.10.2.tar.xz) = 86354589c7e5b11bbf0ba1c485622920ae95cc32
+Size (ktouch-4.10.2.tar.xz) = 2627544 bytes
diff --git a/misc/kturtle/Makefile b/misc/kturtle/Makefile
index 393d46e4b10..04f948de2ac 100644
--- a/misc/kturtle/Makefile
+++ b/misc/kturtle/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:24 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:04 markd Exp $
DISTNAME= kturtle-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE educational programming environment
diff --git a/misc/kturtle/distinfo b/misc/kturtle/distinfo
index 5ee05f88c34..9dc68b0afe8 100644
--- a/misc/kturtle/distinfo
+++ b/misc/kturtle/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:04 markd Exp $
-SHA1 (kturtle-4.8.4.tar.xz) = 160972878f61c37575fb5953b88354fe174fe8ab
-RMD160 (kturtle-4.8.4.tar.xz) = 5edad9acca57995472d89426771d800a757dd90a
-Size (kturtle-4.8.4.tar.xz) = 216580 bytes
+SHA1 (kturtle-4.10.2.tar.xz) = c14cb19822fc101100938e4fcde0d50b16216cff
+RMD160 (kturtle-4.10.2.tar.xz) = 97d593e634e3c088a04a4bc82b6b102a04aba259
+Size (kturtle-4.10.2.tar.xz) = 212608 bytes
diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile
index c6fcf9dcd7a..84181cde5c9 100644
--- a/misc/kwordquiz/Makefile
+++ b/misc/kwordquiz/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:24 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:04 markd Exp $
DISTNAME= kwordquiz-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE flash card trainer
diff --git a/misc/kwordquiz/PLIST b/misc/kwordquiz/PLIST
index a8db1b9d0f1..73d89ac47db 100644
--- a/misc/kwordquiz/PLIST
+++ b/misc/kwordquiz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 08:32:16 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:04 markd Exp $
bin/kwordquiz
share/applications/kde4/kwordquiz.desktop
share/doc/kde/HTML/en/kwordquiz/common
@@ -26,168 +26,168 @@ share/doc/kde/HTML/en/kwordquiz/kwq-tutor-settings.png
share/doc/kde/HTML/en/kwordquiz/kwq-tutor-shortcuts.png
share/doc/kde/HTML/en/kwordquiz/kwq-tutor-welcome.png
share/icons/hicolor/128x128/apps/kwordquiz.png
+share/icons/hicolor/128x128/mimetypes/application-x-kwordquiz.png
share/icons/hicolor/16x16/apps/kwordquiz.png
+share/icons/hicolor/16x16/mimetypes/application-x-kwordquiz.png
share/icons/hicolor/22x22/apps/kwordquiz.png
+share/icons/hicolor/22x22/mimetypes/application-x-kwordquiz.png
share/icons/hicolor/32x32/apps/kwordquiz.png
+share/icons/hicolor/32x32/mimetypes/application-x-kwordquiz.png
share/icons/hicolor/48x48/apps/kwordquiz.png
+share/icons/hicolor/48x48/mimetypes/application-x-kwordquiz.png
share/icons/hicolor/64x64/apps/kwordquiz.png
share/kde/apps/kwordquiz/examples/example.kvtml
share/kde/apps/kwordquiz/examples/fill_in_the_blank.kvtml
share/kde/apps/kwordquiz/examples/french_verbs.kvtml
share/kde/apps/kwordquiz/examples/us_states_and_capitals.kvtml
-share/kde/apps/kwordquiz/icons/hicolor/128x128/mimetypes/kwordquiz_doc.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/answer-correct.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/answer.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/delete-table-row.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/editor.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/error.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/flash.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/insert-table-row.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/languages.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/mode1.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/mode2.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/mode3.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/mode4.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/mode5.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/multiple.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/qa.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/question.png
+share/kde/apps/kwordquiz/icons/hicolor/128x128/actions/rowcol.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/answer-correct.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/answer.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/delete-table-row.png
share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/dontknow.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/editor.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/error.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/flash.png
share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/hint.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/insert-table-row.png
share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/know.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/languages.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/markasblank.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/mode1.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/mode2.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/mode3.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/mode4.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/mode5.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/multiple.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/qa.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/question.png
share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/repeat.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/rowcol.png
share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/shuffle.png
share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/sort_incr.png
share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/start-over.png
-share/kde/apps/kwordquiz/icons/hicolor/16x16/mimetypes/kwordquiz_doc.png
+share/kde/apps/kwordquiz/icons/hicolor/16x16/actions/unmarkasblank.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/answer-correct.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/answer.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/delete-table-row.png
share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/dontknow.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/editor.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/error.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/flash.png
share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/hint.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/insert-table-row.png
share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/know.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/languages.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/markasblank.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/mode1.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/mode2.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/mode3.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/mode4.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/mode5.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/multiple.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/qa.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/question.png
share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/repeat.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/rowcol.png
share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/shuffle.png
share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/sort_incr.png
share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/start-over.png
-share/kde/apps/kwordquiz/icons/hicolor/22x22/mimetypes/kwordquiz_doc.png
+share/kde/apps/kwordquiz/icons/hicolor/22x22/actions/unmarkasblank.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/answer-correct.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/answer.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/delete-table-row.png
share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/dontknow.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/editor.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/error.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/flash.png
share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/hint.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/insert-table-row.png
share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/know.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/languages.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/markasblank.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/mode1.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/mode2.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/mode3.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/mode4.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/mode5.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/multiple.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/qa.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/question.png
share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/question_mark.png
share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/repeat.png
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/rowcol.png
share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/shuffle.png
share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/sort_incr.png
share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/start-over.png
-share/kde/apps/kwordquiz/icons/hicolor/32x32/mimetypes/kwordquiz_doc.png
-share/kde/apps/kwordquiz/icons/hicolor/48x48/mimetypes/kwordquiz_doc.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/answer-correct.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/answer.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/delete-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/editor.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/error.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/flash.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/insert-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/languages.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/mode1.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/mode2.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/mode3.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/mode4.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/mode5.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/multiple.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/qa.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/question.png
-share/kde/apps/kwordquiz/icons/oxygen/128x128/actions/rowcol.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/answer-correct.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/answer.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/delete-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/editor.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/error.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/flash.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/insert-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/languages.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/markasblank.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/mode1.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/mode2.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/mode3.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/mode4.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/mode5.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/multiple.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/qa.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/question.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/rowcol.png
-share/kde/apps/kwordquiz/icons/oxygen/16x16/actions/unmarkasblank.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/answer-correct.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/answer.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/delete-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/editor.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/error.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/flash.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/insert-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/languages.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/markasblank.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/mode1.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/mode2.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/mode3.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/mode4.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/mode5.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/multiple.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/qa.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/question.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/rowcol.png
-share/kde/apps/kwordquiz/icons/oxygen/22x22/actions/unmarkasblank.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/answer-correct.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/answer.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/delete-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/editor.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/error.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/flash.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/insert-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/languages.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/markasblank.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/mode1.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/mode2.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/mode3.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/mode4.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/mode5.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/multiple.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/qa.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/question.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/rowcol.png
-share/kde/apps/kwordquiz/icons/oxygen/32x32/actions/unmarkasblank.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/answer-correct.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/answer.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/delete-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/editor.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/error.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/flash.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/insert-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/languages.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/mode1.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/mode2.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/mode3.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/mode4.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/mode5.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/multiple.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/qa.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/question.png
-share/kde/apps/kwordquiz/icons/oxygen/48x48/actions/rowcol.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/answer-correct.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/answer.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/delete-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/editor.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/error.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/flash.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/insert-table-row.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/languages.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/mode1.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/mode2.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/mode3.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/mode4.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/mode5.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/multiple.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/qa.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/question.png
-share/kde/apps/kwordquiz/icons/oxygen/64x64/actions/rowcol.png
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/answer-correct.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/answer.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/delete-table-row.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/editor.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/error.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/flash.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/insert-table-row.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/languages.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/markasblank.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/mode1.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/mode2.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/mode3.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/mode4.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/mode5.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/multiple.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/qa.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/question.svgz
-share/kde/apps/kwordquiz/icons/oxygen/scalable/actions/unmarkasblank.svgz
+share/kde/apps/kwordquiz/icons/hicolor/32x32/actions/unmarkasblank.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/answer-correct.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/answer.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/delete-table-row.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/editor.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/error.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/flash.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/insert-table-row.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/languages.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/mode1.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/mode2.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/mode3.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/mode4.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/mode5.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/multiple.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/qa.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/question.png
+share/kde/apps/kwordquiz/icons/hicolor/48x48/actions/rowcol.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/answer-correct.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/answer.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/delete-table-row.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/editor.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/error.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/flash.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/insert-table-row.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/languages.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/mode1.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/mode2.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/mode3.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/mode4.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/mode5.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/multiple.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/qa.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/question.png
+share/kde/apps/kwordquiz/icons/hicolor/64x64/actions/rowcol.png
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/answer-correct.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/answer.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/delete-table-row.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/editor.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/error.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/flash.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/insert-table-row.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/languages.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/markasblank.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/mode1.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/mode2.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/mode3.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/mode4.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/mode5.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/multiple.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/qa.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/question.svgz
+share/kde/apps/kwordquiz/icons/hicolor/scalable/actions/unmarkasblank.svgz
share/kde/apps/kwordquiz/kwordquiz.notifyrc
share/kde/apps/kwordquiz/kwordquizui.rc
share/kde/config.kcfg/kwordquiz.kcfg
diff --git a/misc/kwordquiz/distinfo b/misc/kwordquiz/distinfo
index 88377522122..48b282454ce 100644
--- a/misc/kwordquiz/distinfo
+++ b/misc/kwordquiz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:33 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:04 markd Exp $
-SHA1 (kwordquiz-4.8.4.tar.xz) = ab6cf92bbedef4115951d3cc53a9f3b91ac11875
-RMD160 (kwordquiz-4.8.4.tar.xz) = 6366b46cc635d6dd023ef785d02037d44c412f43
-Size (kwordquiz-4.8.4.tar.xz) = 1217404 bytes
+SHA1 (kwordquiz-4.10.2.tar.xz) = e21947d795f1025ee7766ac9c47bbe879b5d1a0e
+RMD160 (kwordquiz-4.10.2.tar.xz) = 778b511bfaded89398382c66a745039b054093d4
+Size (kwordquiz-4.10.2.tar.xz) = 1215208 bytes
diff --git a/misc/libkdeedu/Makefile b/misc/libkdeedu/Makefile
index ae430b81910..e80480a1bc6 100644
--- a/misc/libkdeedu/Makefile
+++ b/misc/libkdeedu/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:19:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:57 markd Exp $
DISTNAME= libkdeedu-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= Common library for KDE educational apps
diff --git a/misc/libkdeedu/PLIST b/misc/libkdeedu/PLIST
index b7778411298..dd2719fd6af 100644
--- a/misc/libkdeedu/PLIST
+++ b/misc/libkdeedu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/20 08:55:12 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:57 markd Exp $
include/libkdeedu/keduvocarticle.h
include/libkdeedu/keduvocconjugation.h
include/libkdeedu/keduvoccontainer.h
@@ -21,11 +21,11 @@ include/libkdeedu/qtmml/QtMmlWidget
include/libkdeedu/qtmml/qtmmlwidget.h
include/libkdeedu/sharedkvtmlfiles.h
lib/cmake/libkdeedu/LibKdeEduConfig.cmake
-lib/cmake/libkdeedu/LibKdeEduTargets-relwithdebinfo.cmake
+lib/cmake/libkdeedu/LibKdeEduTargets-${TARGET}.cmake
lib/cmake/libkdeedu/LibKdeEduTargets.cmake
lib/libkeduvocdocument.so
lib/libkeduvocdocument.so.4
-lib/libkeduvocdocument.so.4.8.0
+lib/libkeduvocdocument.so.${PKGVERSION}
lib/libqtmmlwidget.a
share/icons/hicolor/16x16/actions/editplots.png
share/icons/hicolor/16x16/actions/functionhelp.png
diff --git a/misc/libkdeedu/distinfo b/misc/libkdeedu/distinfo
index a03496703e7..5d4e5e59402 100644
--- a/misc/libkdeedu/distinfo
+++ b/misc/libkdeedu/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:32 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:57 markd Exp $
-SHA1 (libkdeedu-4.8.4.tar.xz) = 055fa35db3c482c61f8eab7d1912532823a88726
-RMD160 (libkdeedu-4.8.4.tar.xz) = 7c27408bfb672545623fdab20cf11b67e8cce8dc
-Size (libkdeedu-4.8.4.tar.xz) = 214240 bytes
+SHA1 (libkdeedu-4.10.2.tar.xz) = 2c0f6ebfc1e51919da0313b0a93d149dfd1d0be7
+RMD160 (libkdeedu-4.10.2.tar.xz) = 08ab030ca6ccad7951ed38e049f6f93513962c23
+Size (libkdeedu-4.10.2.tar.xz) = 213392 bytes
diff --git a/misc/marble/Makefile b/misc/marble/Makefile
index a5f6af2907e..ec4475ab4e3 100644
--- a/misc/marble/Makefile
+++ b/misc/marble/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/02/16 11:19:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/03 10:51:55 markd Exp $
DISTNAME= marble-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE desktop globe
diff --git a/misc/marble/PLIST b/misc/marble/PLIST
index 51bcacd14c2..aaf7785a8a2 100644
--- a/misc/marble/PLIST
+++ b/misc/marble/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:53 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/04/03 10:51:55 markd Exp $
bin/marble
bin/marble-touch
bin/routing-instructions
@@ -11,9 +11,14 @@ include/marble/AbstractMarbleGraphicsLayout.h
include/marble/AbstractProjection.h
include/marble/AbstractWorkerThread.h
include/marble/AlternativeRoutesModel.h
+include/marble/AutoNavigation.h
+include/marble/BillboardGraphicsItem.h
include/marble/BookmarkManager.h
include/marble/ClipPainter.h
include/marble/CurrentLocationWidget.h
+include/marble/CylindricalProjection.h
+include/marble/DialogConfigurationInterface.h
+include/marble/DownloadRegion.h
include/marble/DownloadRegionDialog.h
include/marble/ElevationModel.h
include/marble/EquirectProjection.h
@@ -28,6 +33,7 @@ include/marble/GeoDataDocument.h
include/marble/GeoDataFeature.h
include/marble/GeoDataFolder.h
include/marble/GeoDataGeometry.h
+include/marble/GeoDataGroundOverlay.h
include/marble/GeoDataHotSpot.h
include/marble/GeoDataIconStyle.h
include/marble/GeoDataLabelStyle.h
@@ -40,6 +46,7 @@ include/marble/GeoDataLod.h
include/marble/GeoDataLookAt.h
include/marble/GeoDataMultiGeometry.h
include/marble/GeoDataObject.h
+include/marble/GeoDataOverlay.h
include/marble/GeoDataPlacemark.h
include/marble/GeoDataPoint.h
include/marble/GeoDataPolyStyle.h
@@ -48,10 +55,13 @@ include/marble/GeoDataRegion.h
include/marble/GeoDataStyle.h
include/marble/GeoDataStyleMap.h
include/marble/GeoDataStyleSelector.h
+include/marble/GeoDataTrack.h
+include/marble/GeoDataTreeModel.h
include/marble/GeoDocument.h
include/marble/GeoGraphicsItem.h
include/marble/GeoGraphicsScene.h
include/marble/GeoPainter.h
+include/marble/GeoWriter.h
include/marble/LabelGraphicsItem.h
include/marble/LatLonBoxWidget.h
include/marble/LatLonEdit.h
@@ -65,6 +75,7 @@ include/marble/MarbleAboutDialog.h
include/marble/MarbleAbstractRunner.h
include/marble/MarbleControlBox.h
include/marble/MarbleDirs.h
+include/marble/MarbleGlobal.h
include/marble/MarbleGraphicsGridLayout.h
include/marble/MarbleGraphicsItem.h
include/marble/MarbleMap.h
@@ -75,29 +86,34 @@ include/marble/MarbleWidget.h
include/marble/MarbleWidgetInputHandler.h
include/marble/MercatorProjection.h
include/marble/NavigationWidget.h
+include/marble/ParseRunnerPlugin.h
include/marble/Planet.h
include/marble/PluginAboutDialog.h
include/marble/PluginInterface.h
+include/marble/PositionProviderPluginInterface.h
include/marble/PositionTracking.h
include/marble/QtMarbleConfigDialog.h
include/marble/Quaternion.h
include/marble/RenderPlugin.h
include/marble/RenderPluginInterface.h
+include/marble/ReverseGeocodingRunnerPlugin.h
include/marble/Route.h
include/marble/RouteRequest.h
include/marble/RouteSegment.h
include/marble/RoutingManager.h
include/marble/RoutingModel.h
include/marble/RoutingProfile.h
+include/marble/RoutingRunnerPlugin.h
include/marble/RoutingWidget.h
-include/marble/RunnerPlugin.h
include/marble/ScreenGraphicsItem.h
+include/marble/SearchRunnerPlugin.h
include/marble/Serializable.h
include/marble/SphericalProjection.h
include/marble/SunLocator.h
include/marble/TileCoordsPyramid.h
include/marble/TileCreator.h
include/marble/TileCreatorDialog.h
+include/marble/TileId.h
include/marble/TileLevelRangeWidget.h
include/marble/TinyWebBrowser.h
include/marble/ViewportParams.h
@@ -109,24 +125,35 @@ lib/kde4/libmarble_part.so
lib/kde4/plasma_applet_worldclock.so
lib/kde4/plasma_runner_marble.so
lib/kde4/plugins/marble/AprsPlugin.so
+lib/kde4/plugins/marble/AtmospherePlugin.so
lib/kde4/plugins/marble/CachePlugin.so
lib/kde4/plugins/marble/CompassFloatItem.so
lib/kde4/plugins/marble/CrosshairsPlugin.so
lib/kde4/plugins/marble/EarthquakePlugin.so
lib/kde4/plugins/marble/ElevationProfileFloatItem.so
-lib/kde4/plugins/marble/GosmorePlugin.so
+lib/kde4/plugins/marble/ElevationProfileMarker.so
+lib/kde4/plugins/marble/FlightGearPositionProviderPlugin.so
+lib/kde4/plugins/marble/FoursquarePlugin.so
+lib/kde4/plugins/marble/GosmoreReverseGeocodingPlugin.so
+lib/kde4/plugins/marble/GosmoreRoutingPlugin.so
lib/kde4/plugins/marble/GpsInfo.so
lib/kde4/plugins/marble/GpxPlugin.so
lib/kde4/plugins/marble/GraticulePlugin.so
lib/kde4/plugins/marble/HostipPlugin.so
+lib/kde4/plugins/marble/JsonPlugin.so
lib/kde4/plugins/marble/KmlPlugin.so
lib/kde4/plugins/marble/LatLonPlugin.so
lib/kde4/plugins/marble/LocalDatabasePlugin.so
lib/kde4/plugins/marble/LocalOsmSearchPlugin.so
+lib/kde4/plugins/marble/LogPlugin.so
+lib/kde4/plugins/marble/MapQuestPlugin.so
lib/kde4/plugins/marble/MapScaleFloatItem.so
+lib/kde4/plugins/marble/MeasureTool.so
lib/kde4/plugins/marble/MonavPlugin.so
lib/kde4/plugins/marble/NavigationFloatItem.so
-lib/kde4/plugins/marble/NominatimPlugin.so
+lib/kde4/plugins/marble/NominatimReverseGeocodingPlugin.so
+lib/kde4/plugins/marble/NominatimSearchPlugin.so
+lib/kde4/plugins/marble/OSRMPlugin.so
lib/kde4/plugins/marble/OpenDesktopPlugin.so
lib/kde4/plugins/marble/OpenRouteServicePlugin.so
lib/kde4/plugins/marble/OsmPlugin.so
@@ -135,8 +162,10 @@ lib/kde4/plugins/marble/Photo.so
lib/kde4/plugins/marble/PlacemarkPositionProviderPlugin.so
lib/kde4/plugins/marble/PntPlugin.so
lib/kde4/plugins/marble/PositionMarker.so
+lib/kde4/plugins/marble/PostalCode.so
lib/kde4/plugins/marble/ProgressFloatItem.so
lib/kde4/plugins/marble/QNamNetworkPlugin.so
+lib/kde4/plugins/marble/RouteSimulationPositionProviderPlugin.so
lib/kde4/plugins/marble/RoutingPlugin.so
lib/kde4/plugins/marble/RoutinoPlugin.so
lib/kde4/plugins/marble/SatellitesPlugin.so
@@ -147,23 +176,27 @@ lib/kde4/plugins/marble/Weather.so
lib/kde4/plugins/marble/Wikipedia.so
lib/kde4/plugins/marble/YoursPlugin.so
lib/libmarblewidget.so
-lib/libmarblewidget.so.0.13.0
-lib/libmarblewidget.so.13
+lib/libmarblewidget.so.0.15.0
+lib/libmarblewidget.so.15
qt4/imports/org/kde/edu/marble/MarbleSettings.qml
qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
qt4/imports/org/kde/edu/marble/qmldir
qt4/imports/org/kde/edu/marble/qtcomponents/FileDialog.qml
qt4/imports/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
qt4/imports/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
+qt4/imports/org/kde/edu/marble/qtcomponents/MarbleMenuLayout.qml
+qt4/imports/org/kde/edu/marble/qtcomponents/MarbleToolIcon.qml
qt4/imports/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
+qt4/imports/org/kde/edu/marble/qtcomponents/PlacemarkEditor.qml
qt4/imports/org/kde/edu/marble/qtcomponents/RouteEditor.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/RoutingDialog.qml
qt4/imports/org/kde/edu/marble/qtcomponents/SearchField.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/SearchResultSelectionDialog.qml
qt4/imports/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
qt4/imports/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
qt4/imports/org/kde/edu/marble/qtcomponents/qmldir
share/applications/kde4/marble.desktop
+share/applications/kde4/marble_gpx.desktop
+share/applications/kde4/marble_kml.desktop
+share/applications/kde4/marble_osm.desktop
share/doc/kde/HTML/en/marble/common
share/doc/kde/HTML/en/marble/configure-cacheproxy.png
share/doc/kde/HTML/en/marble/configure-navigation.png
@@ -220,19 +253,28 @@ share/kde/apps/marble/data/bitmaps/city_4_white.png
share/kde/apps/marble/data/bitmaps/city_4_yellow.png
share/kde/apps/marble/data/bitmaps/coordinate.png
share/kde/apps/marble/data/bitmaps/crater.png
-share/kde/apps/marble/data/bitmaps/cursor_bc.xpm
-share/kde/apps/marble/data/bitmaps/cursor_bl.xpm
-share/kde/apps/marble/data/bitmaps/cursor_br.xpm
-share/kde/apps/marble/data/bitmaps/cursor_cl.xpm
-share/kde/apps/marble/data/bitmaps/cursor_cr.xpm
-share/kde/apps/marble/data/bitmaps/cursor_tc.xpm
-share/kde/apps/marble/data/bitmaps/cursor_tl.xpm
-share/kde/apps/marble/data/bitmaps/cursor_tr.xpm
+share/kde/apps/marble/data/bitmaps/cursor_bc.png
+share/kde/apps/marble/data/bitmaps/cursor_bl.png
+share/kde/apps/marble/data/bitmaps/cursor_br.png
+share/kde/apps/marble/data/bitmaps/cursor_cl.png
+share/kde/apps/marble/data/bitmaps/cursor_cr.png
+share/kde/apps/marble/data/bitmaps/cursor_tc.png
+share/kde/apps/marble/data/bitmaps/cursor_tl.png
+share/kde/apps/marble/data/bitmaps/cursor_tr.png
share/kde/apps/marble/data/bitmaps/default_location.png
share/kde/apps/marble/data/bitmaps/earth_apollo.jpg
share/kde/apps/marble/data/bitmaps/flag.png
share/kde/apps/marble/data/bitmaps/folder.png
share/kde/apps/marble/data/bitmaps/hand.png
+share/kde/apps/marble/data/bitmaps/highway_footway.png
+share/kde/apps/marble/data/bitmaps/highway_motorway.png
+share/kde/apps/marble/data/bitmaps/highway_path.png
+share/kde/apps/marble/data/bitmaps/highway_primary.png
+share/kde/apps/marble/data/bitmaps/highway_secondary.png
+share/kde/apps/marble/data/bitmaps/highway_tertiary.png
+share/kde/apps/marble/data/bitmaps/highway_track.png
+share/kde/apps/marble/data/bitmaps/highway_trunk.png
+share/kde/apps/marble/data/bitmaps/highway_unclassified.png
share/kde/apps/marble/data/bitmaps/lake.png
share/kde/apps/marble/data/bitmaps/manned_landing.png
share/kde/apps/marble/data/bitmaps/mountain_1.png
@@ -303,10 +345,14 @@ share/kde/apps/marble/data/bitmaps/robotic_rover.png
share/kde/apps/marble/data/bitmaps/routing_pick.png
share/kde/apps/marble/data/bitmaps/routing_remove.png
share/kde/apps/marble/data/bitmaps/routing_step.png
+share/kde/apps/marble/data/bitmaps/satellite.png
share/kde/apps/marble/data/bitmaps/shipwreck.png
share/kde/apps/marble/data/bitmaps/turn-around.png
share/kde/apps/marble/data/bitmaps/turn-continue.png
+share/kde/apps/marble/data/bitmaps/turn-exit-left.png
+share/kde/apps/marble/data/bitmaps/turn-exit-right.png
share/kde/apps/marble/data/bitmaps/turn-left.png
+share/kde/apps/marble/data/bitmaps/turn-merge.png
share/kde/apps/marble/data/bitmaps/turn-right.png
share/kde/apps/marble/data/bitmaps/turn-roundabout-far.png
share/kde/apps/marble/data/bitmaps/turn-roundabout-first.png
@@ -848,6 +894,7 @@ share/kde/apps/marble/data/svg/marble-logo-inverted-32dpi.png
share/kde/apps/marble/data/svg/marble-logo-inverted-72dpi.png
share/kde/apps/marble/data/svg/marble-logo.png
share/kde/apps/marble/data/svg/marble-logo.svg
+share/kde/apps/marble/data/svg/sun.png
share/kde/apps/marble/data/svg/sunshine.png
share/kde/apps/marble/data/svg/track_turtle.svg
share/kde/apps/marble/data/svg/wikipedia.svg
@@ -885,5 +932,9 @@ share/kde/apps/marble/marble_part.rc
share/kde/apps/marble/marbleui.rc
share/kde/config.kcfg/marble.kcfg
share/kde4/services/marble_part.desktop
+share/kde4/services/marble_part_gpx.desktop
+share/kde4/services/marble_part_kml.desktop
+share/kde4/services/marble_part_osm.desktop
share/kde4/services/plasma-applet-kworldclock.desktop
share/kde4/services/plasma-runner-marble.desktop
+share/mime/packages/geo.xml
diff --git a/misc/marble/distinfo b/misc/marble/distinfo
index 01313d10d39..2bca59f3265 100644
--- a/misc/marble/distinfo
+++ b/misc/marble/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:56 markd Exp $
-SHA1 (marble-4.8.4.tar.xz) = ec3cd41a1d333e9e3b34595adf6e4859315159b9
-RMD160 (marble-4.8.4.tar.xz) = a8c6a095ad8ff014156a24968259502b4853492c
-Size (marble-4.8.4.tar.xz) = 19899160 bytes
+SHA1 (marble-4.10.2.tar.xz) = e4ba6aaaa5f861f715a7c4881dd78ed1deb03a36
+RMD160 (marble-4.10.2.tar.xz) = 21ccee8ac9792c1c2920634a82c2eefd00d2f186
+Size (marble-4.10.2.tar.xz) = 19466508 bytes
diff --git a/misc/nepomuk-core/DESCR b/misc/nepomuk-core/DESCR
new file mode 100644
index 00000000000..b9f64c54aa6
--- /dev/null
+++ b/misc/nepomuk-core/DESCR
@@ -0,0 +1,7 @@
+The NepomukCore library is the main library for dealing with Nepomuk
+components. This includes the following parts -
+
+* The main resource handling centered around Nepomuk::Resource
+* The handling of ontologies via classes in the Nepomuk::Types namespace
+* The desktop Nepomuk::Query API
+* Several utility methods and classes
diff --git a/misc/nepomuk-core/Makefile b/misc/nepomuk-core/Makefile
new file mode 100644
index 00000000000..0e5f4a28a92
--- /dev/null
+++ b/misc/nepomuk-core/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1 2013/04/03 10:51:46 markd Exp $
+
+DISTNAME= nepomuk-core-${_KDE_VERSION}
+CATEGORIES= misc
+COMMENT= library for dealing with Nepomuk components
+
+CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF
+
+REPLACE_PYTHON+= \
+ services/storage/rcgen/nepomuk-simpleresource-rcgen.py
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+BUILDLINK_API_DEPENDS.soprano+= soprano>=2.9.0
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.include "../../audio/taglib/buildlink3.mk"
+.include "../../graphics/exiv2/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../print/poppler-qt4/buildlink3.mk"
+.include "../../textproc/shared-desktop-ontologies/buildlink3.mk"
+.include "../../textproc/soprano/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/nepomuk-core/PLIST b/misc/nepomuk-core/PLIST
new file mode 100644
index 00000000000..8bd9b0db5f9
--- /dev/null
+++ b/misc/nepomuk-core/PLIST
@@ -0,0 +1,165 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/03 10:51:46 markd Exp $
+bin/nepomuk-simpleresource-rcgen
+bin/nepomuk2-rcgen
+bin/nepomukbackup
+bin/nepomukcleaner
+bin/nepomukindexer
+bin/nepomukserver
+bin/nepomukservicestub
+include/Nepomuk2/CreateResourceJob
+include/Nepomuk2/DataManagement
+include/Nepomuk2/DescribeResourcesJob
+include/Nepomuk2/File
+include/Nepomuk2/Query/AndTerm
+include/Nepomuk2/Query/ComparisonTerm
+include/Nepomuk2/Query/FileQuery
+include/Nepomuk2/Query/GroupTerm
+include/Nepomuk2/Query/LiteralTerm
+include/Nepomuk2/Query/NegationTerm
+include/Nepomuk2/Query/OptionalTerm
+include/Nepomuk2/Query/OrTerm
+include/Nepomuk2/Query/Query
+include/Nepomuk2/Query/QueryParser
+include/Nepomuk2/Query/QueryServiceClient
+include/Nepomuk2/Query/ResourceTerm
+include/Nepomuk2/Query/ResourceTypeTerm
+include/Nepomuk2/Query/Result
+include/Nepomuk2/Query/ResultIterator
+include/Nepomuk2/Query/SimpleTerm
+include/Nepomuk2/Query/StandardQuery
+include/Nepomuk2/Query/Term
+include/Nepomuk2/Resource
+include/Nepomuk2/ResourceManager
+include/Nepomuk2/ResourceWatcher
+include/Nepomuk2/Service
+include/Nepomuk2/SimpleResource
+include/Nepomuk2/SimpleResourceGraph
+include/Nepomuk2/StoreResourcesJob
+include/Nepomuk2/Tag
+include/Nepomuk2/Types/Class
+include/Nepomuk2/Types/Literal
+include/Nepomuk2/Types/Ontology
+include/Nepomuk2/Types/Property
+include/Nepomuk2/Variant
+include/Nepomuk2/Vocabulary/NCAL
+include/Nepomuk2/Vocabulary/NCO
+include/Nepomuk2/Vocabulary/NDO
+include/Nepomuk2/Vocabulary/NEXIF
+include/Nepomuk2/Vocabulary/NFO
+include/Nepomuk2/Vocabulary/NIE
+include/Nepomuk2/Vocabulary/NMM
+include/Nepomuk2/Vocabulary/NMO
+include/Nepomuk2/Vocabulary/NUAO
+include/Nepomuk2/Vocabulary/PIMO
+include/Nepomuk2/Vocabulary/TMO
+include/nepomuk2/andterm.h
+include/nepomuk2/class.h
+include/nepomuk2/comparisonterm.h
+include/nepomuk2/createresourcejob.h
+include/nepomuk2/datamanagement.h
+include/nepomuk2/describeresourcesjob.h
+include/nepomuk2/entity.h
+include/nepomuk2/file.h
+include/nepomuk2/filequery.h
+include/nepomuk2/groupterm.h
+include/nepomuk2/literal.h
+include/nepomuk2/literalterm.h
+include/nepomuk2/ncal.h
+include/nepomuk2/nco.h
+include/nepomuk2/ndo.h
+include/nepomuk2/negationterm.h
+include/nepomuk2/nepomuk_export.h
+include/nepomuk2/nepomukservice.h
+include/nepomuk2/nepomukversion.h
+include/nepomuk2/nexif.h
+include/nepomuk2/nfo.h
+include/nepomuk2/nie.h
+include/nepomuk2/nmm.h
+include/nepomuk2/nmo.h
+include/nepomuk2/nuao.h
+include/nepomuk2/ontology.h
+include/nepomuk2/optionalterm.h
+include/nepomuk2/orterm.h
+include/nepomuk2/pimo.h
+include/nepomuk2/property.h
+include/nepomuk2/query.h
+include/nepomuk2/queryinterface.h
+include/nepomuk2/queryparser.h
+include/nepomuk2/queryserviceclient.h
+include/nepomuk2/queryserviceinterface.h
+include/nepomuk2/resource.h
+include/nepomuk2/resourcemanager.h
+include/nepomuk2/resourceterm.h
+include/nepomuk2/resourcetypeterm.h
+include/nepomuk2/resourcewatcher.h
+include/nepomuk2/result.h
+include/nepomuk2/resultiterator.h
+include/nepomuk2/simpleresource.h
+include/nepomuk2/simpleresourcegraph.h
+include/nepomuk2/simpleterm.h
+include/nepomuk2/standardqueries.h
+include/nepomuk2/storeresourcesjob.h
+include/nepomuk2/tag.h
+include/nepomuk2/term.h
+include/nepomuk2/tmo.h
+include/nepomuk2/utils.h
+include/nepomuk2/variant.h
+include/nepomuk2/vocabulary.h
+lib/cmake/NepomukCore/Nepomuk2AddOntologyClasses.cmake
+lib/cmake/NepomukCore/NepomukCoreConfig.cmake
+lib/cmake/NepomukCore/NepomukCoreConfigVersion.cmake
+lib/cmake/NepomukCore/NepomukCoreTargetsWithPrefix-${TARGET}.cmake
+lib/cmake/NepomukCore/NepomukCoreTargetsWithPrefix.cmake
+lib/kde4/nepomukexiv2extractor.so
+lib/kde4/nepomukffmpegextractor.so
+lib/kde4/nepomukfileindexer.so
+lib/kde4/nepomukfilewatch.so
+lib/kde4/nepomukplaintextextractor.so
+lib/kde4/nepomukpopplerextractor.so
+lib/kde4/nepomukstorage.so
+lib/kde4/nepomuktaglibextractor.so
+lib/libkdeinit4_nepomukserver.so
+lib/libnepomukcommon.so
+lib/libnepomukcore.so
+lib/libnepomukcore.so.4
+lib/libnepomukcore.so.${PKGVERSION}
+share/applications/kde4/nepomukbackup.desktop
+share/applications/kde4/nepomukcleaner.desktop
+share/dbus-1/interfaces/org.kde.NepomukServer.xml
+share/dbus-1/interfaces/org.kde.nepomuk.BackupManager.xml
+share/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml
+share/dbus-1/interfaces/org.kde.nepomuk.FileIndexer.xml
+share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
+share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
+share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
+share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcher.xml
+share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml
+share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
+share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
+share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
+share/kde/apps/fileindexerservice/nepomukfileindexer.notifyrc
+share/kde/apps/nepomukfilewatch/nepomukfilewatch.notifyrc
+share/kde/apps/nepomukstorage/nepomukstorage.notifyrc
+share/kde/autostart/nepomukserver.desktop
+share/kde4/services/nepomukactivitiesservice.desktop
+share/kde4/services/nepomukbackupsync.desktop
+share/kde4/services/nepomukexiv2extractor.desktop
+share/kde4/services/nepomukffmpegextractor.desktop
+share/kde4/services/nepomukfileindexer.desktop
+share/kde4/services/nepomukfilewatch.desktop
+share/kde4/services/nepomukontologyloader.desktop
+share/kde4/services/nepomukplaintextextractor.desktop
+share/kde4/services/nepomukpopplerextractor.desktop
+share/kde4/services/nepomukqueryservice.desktop
+share/kde4/services/nepomukremovablestorageservice.desktop
+share/kde4/services/nepomukstorage.desktop
+share/kde4/services/nepomukstrigiservice.desktop
+share/kde4/services/nepomuktaglibextractor.desktop
+share/kde4/servicetypes/nepomukextractor.desktop
+share/kde4/servicetypes/nepomukservice.desktop
+share/ontology/kde/kext.ontology
+share/ontology/kde/kext.trig
+share/ontology/kde/kuvo.ontology
+share/ontology/kde/kuvo.trig
+share/ontology/kde/nrio.ontology
+share/ontology/kde/nrio.trig
diff --git a/misc/nepomuk-core/buildlink3.mk b/misc/nepomuk-core/buildlink3.mk
new file mode 100644
index 00000000000..a6181f16b29
--- /dev/null
+++ b/misc/nepomuk-core/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/04/03 10:51:46 markd Exp $
+
+BUILDLINK_TREE+= nepomuk-core
+
+.if !defined(NEPOMUK_CORE_BUILDLINK3_MK)
+NEPOMUK_CORE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nepomuk-core+= nepomuk-core>=4.10.1
+BUILDLINK_PKGSRCDIR.nepomuk-core?= ../../misc/nepomuk-core
+
+.endif # NEPOMUK_CORE_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -nepomuk-core
diff --git a/misc/nepomuk-core/distinfo b/misc/nepomuk-core/distinfo
new file mode 100644
index 00000000000..c7d6b16905a
--- /dev/null
+++ b/misc/nepomuk-core/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2013/04/03 10:51:46 markd Exp $
+
+SHA1 (nepomuk-core-4.10.2.tar.xz) = e17ca2b7eb3b1745806be7576d6340777f4ce0d0
+RMD160 (nepomuk-core-4.10.2.tar.xz) = 247f4a63088de9fb5f56434a6e1748bfe498753c
+Size (nepomuk-core-4.10.2.tar.xz) = 371008 bytes
diff --git a/misc/nepomuk-widgets/DESCR b/misc/nepomuk-widgets/DESCR
new file mode 100644
index 00000000000..dc62483035f
--- /dev/null
+++ b/misc/nepomuk-widgets/DESCR
@@ -0,0 +1,7 @@
+This is the KDE Meta Data library (not to confuse with KFileMetaData).
+It consists of the following parts:
+* The main resource handling centered around Nepomuk2::Resource
+* The handling of ontologies via classes in the Nepomuk2::Types namespace
+* The desktop Nepomuk2::Query API
+* \ref nepomuk_facets
+* Several utility methods and classes
diff --git a/misc/nepomuk-widgets/Makefile b/misc/nepomuk-widgets/Makefile
new file mode 100644
index 00000000000..68c177aa3ef
--- /dev/null
+++ b/misc/nepomuk-widgets/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2013/04/03 10:51:46 markd Exp $
+
+DISTNAME= nepomuk-widgets-${_KDE_VERSION}
+CATEGORIES= misc
+COMMENT= Nepomuk Meta Data Library
+
+.include "../../meta-pkgs/kde4/Makefile.kde4"
+
+.include "../../meta-pkgs/kde4/kde4.mk"
+
+.include "../../misc/nepomuk-core/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/nepomuk-widgets/PLIST b/misc/nepomuk-widgets/PLIST
new file mode 100644
index 00000000000..880a6acee17
--- /dev/null
+++ b/misc/nepomuk-widgets/PLIST
@@ -0,0 +1,11 @@
+@comment $NetBSD: PLIST,v 1.1 2013/04/03 10:51:46 markd Exp $
+include/nepomuk2/filemetadatawidget.h
+include/nepomuk2/nepomukwidgets_export.h
+include/nepomuk2/tagwidget.h
+lib/cmake/NepomukWidgets/NepomukWidgetsConfig.cmake
+lib/cmake/NepomukWidgets/NepomukWidgetsConfigVersion.cmake
+lib/cmake/NepomukWidgets/NepomukWidgetsTargetsWithPrefix-${TARGET}.cmake
+lib/cmake/NepomukWidgets/NepomukWidgetsTargetsWithPrefix.cmake
+lib/libnepomukwidgets.so
+lib/libnepomukwidgets.so.4
+lib/libnepomukwidgets.so.${PKGVERSION}
diff --git a/misc/nepomuk-widgets/buildlink3.mk b/misc/nepomuk-widgets/buildlink3.mk
new file mode 100644
index 00000000000..c5b3e74e78f
--- /dev/null
+++ b/misc/nepomuk-widgets/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1 2013/04/03 10:51:47 markd Exp $
+
+BUILDLINK_TREE+= nepomuk-widgets
+
+.if !defined(NEPOMUK_WIDGETS_BUILDLINK3_MK)
+NEPOMUK_WIDGETS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.nepomuk-widgets+= nepomuk-widgets>=4.10.1
+BUILDLINK_PKGSRCDIR.nepomuk-widgets?= ../../misc/nepomuk-widgets
+
+.endif # NEPOMUK_WIDGETS_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -nepomuk-widgets
diff --git a/misc/nepomuk-widgets/distinfo b/misc/nepomuk-widgets/distinfo
new file mode 100644
index 00000000000..f01f2ee1cfa
--- /dev/null
+++ b/misc/nepomuk-widgets/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2013/04/03 10:51:47 markd Exp $
+
+SHA1 (nepomuk-widgets-4.10.2.tar.xz) = 2aa9eaf4709acc1f9a2acf6c6bb4b42fc0840549
+RMD160 (nepomuk-widgets-4.10.2.tar.xz) = 890784f38970bd7191aaa8973c27f176ca99a8e7
+Size (nepomuk-widgets-4.10.2.tar.xz) = 80044 bytes
diff --git a/misc/parley/Makefile b/misc/parley/Makefile
index 12ab6c5c9a5..a1f04574954 100644
--- a/misc/parley/Makefile
+++ b/misc/parley/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:26 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:04 markd Exp $
DISTNAME= parley-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE vocabulary trainer
diff --git a/misc/parley/distinfo b/misc/parley/distinfo
index 2d5d0d5fa01..ae7782d1162 100644
--- a/misc/parley/distinfo
+++ b/misc/parley/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:04 markd Exp $
-SHA1 (parley-4.8.4.tar.xz) = bfc361363fa0cb866fd1d704b86d71401c1c4ea6
-RMD160 (parley-4.8.4.tar.xz) = 69240319fb05c2e32b5125b93a8424936d8cd97d
-Size (parley-4.8.4.tar.xz) = 8222924 bytes
+SHA1 (parley-4.10.2.tar.xz) = 1e9e568c2a4dce6a61a51164c43b3930efe99664
+RMD160 (parley-4.10.2.tar.xz) = 8356b5c347b8f2fd08b88e29c0182e962c5baa52
+Size (parley-4.10.2.tar.xz) = 8210756 bytes
diff --git a/misc/rocs/patches/patch-RocsCore_LoadSave_Plugins_CMakeLists.txt b/misc/rocs/patches/patch-RocsCore_LoadSave_Plugins_CMakeLists.txt
new file mode 100644
index 00000000000..62edf44bed6
--- /dev/null
+++ b/misc/rocs/patches/patch-RocsCore_LoadSave_Plugins_CMakeLists.txt
@@ -0,0 +1,32 @@
+$NetBSD: patch-RocsCore_LoadSave_Plugins_CMakeLists.txt,v 1.1 2013/04/03 10:52:25 markd Exp $
+
+Disable dotFileFormat plugin -- causes g++ Internal error on
+NetBSD 6.x
+
+--- RocsCore/LoadSave/Plugins/CMakeLists.txt.orig 2013-03-01 06:51:29.000000000 +0000
++++ RocsCore/LoadSave/Plugins/CMakeLists.txt
+@@ -19,15 +19,15 @@
+ add_subdirectory(tgfFileFormat)
+ add_subdirectory(tikzFileFormat)
+
+-# require Boost >= 1.49 for DOT file format
+-if(${Boost_VERSION} VERSION_LESS 104900)
+- add_feature_info(DotFileFormat
+- OFF
+- "Building of DOT file format support needs Boost >= 1.49."
+- )
+-else(${Boost_VERSION} VERSION_LESS 104900)
+- add_subdirectory(dotFileFormat)
+-endif(${Boost_VERSION} VERSION_LESS 104900)
++## require Boost >= 1.49 for DOT file format
++#if(${Boost_VERSION} VERSION_LESS 104900)
++# add_feature_info(DotFileFormat
++# OFF
++# "Building of DOT file format support needs Boost >= 1.49."
++# )
++#else(${Boost_VERSION} VERSION_LESS 104900)
++# add_subdirectory(dotFileFormat)
++#endif(${Boost_VERSION} VERSION_LESS 104900)
+
+ # these plugins are in an unstable state and are not suited for end users
+ if (ROCS_BUILD_LOADSAVE)
diff --git a/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h b/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h
deleted file mode 100644
index 7d3532acd66..00000000000
--- a/misc/rocs/patches/patch-src_Plugins_AssignValues_assignvalueswidget.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Plugins_AssignValues_assignvalueswidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $
-
---- src/Plugins/AssignValues/assignvalueswidget.h.orig 2011-11-17 20:57:24.000000000 +0000
-+++ src/Plugins/AssignValues/assignvalueswidget.h
-@@ -21,8 +21,10 @@
-
- #include <QWidget>
-
-+#ifndef Q_MOC_RUN
- #include <boost/graph/adjacency_list.hpp>
- #include <boost/graph/topology.hpp>
-+#endif
- #include <KDialog>
- #include "Rocs_Typedefs.h"
-
diff --git a/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp b/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp
deleted file mode 100644
index 2db4c368748..00000000000
--- a/misc/rocs/patches/patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_Plugins_DataStructure_Graph_GraphStructure.cpp,v 1.1 2013/02/26 23:37:32 joerg Exp $
-
---- src/Plugins/DataStructure/Graph/GraphStructure.cpp.orig 2013-02-26 22:55:07.000000000 +0000
-+++ src/Plugins/DataStructure/Graph/GraphStructure.cpp
-@@ -153,7 +153,7 @@ QScriptValue Rocs::GraphStructure::dijks
- BOOST_FOREACH( PointerPtr p, this->pointers() )
- {
- edges[counter] = Edge(node_mapping[p->from().get()], node_mapping[p->to().get()]);
-- edge_mapping[std::make_pair<int,int>(node_mapping[p->from().get()], node_mapping[p->to().get()])] = p;
-+ edge_mapping[std::make_pair(node_mapping[p->from().get()], node_mapping[p->to().get()])] = p;
- if (!p->value().isEmpty()) {
- weights[counter] = p->value().toDouble();
- } else {
-@@ -163,7 +163,7 @@ QScriptValue Rocs::GraphStructure::dijks
- // if graph is directed, also add back-edges
- if(!this->directed()) {
- edges[counter] = Edge(node_mapping[p->to().get()], node_mapping[p->from().get()]);
-- edge_mapping[std::make_pair<int,int>(node_mapping[p->to().get()], node_mapping[p->from().get()])] = p;
-+ edge_mapping[std::make_pair(node_mapping[p->to().get()], node_mapping[p->from().get()])] = p;
- if (!p->value().isEmpty()) {
- weights[counter] = p->value().toDouble();
- } else {
diff --git a/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h b/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h
deleted file mode 100644
index e249a5c77dc..00000000000
--- a/misc/rocs/patches/patch-src_Plugins_GenerateGraph_generategraphwidget.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Plugins_GenerateGraph_generategraphwidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $
-
---- src/Plugins/GenerateGraph/generategraphwidget.h.orig 2012-01-02 19:52:41.000000000 +0000
-+++ src/Plugins/GenerateGraph/generategraphwidget.h
-@@ -22,8 +22,10 @@
- #include <QWidget>
- #include <KDialog>
-
-+#ifndef Q_MOC_RUN
- #include <boost/graph/adjacency_list.hpp>
- #include <boost/graph/topology.hpp>
-+#endif
-
- class QGridLayout;
- class Document;
diff --git a/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h b/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h
deleted file mode 100644
index f5ab054e359..00000000000
--- a/misc/rocs/patches/patch-src_Plugins_TransformEdges_transformedgeswidget.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_Plugins_TransformEdges_transformedgeswidget.h,v 1.1 2013/02/26 23:37:32 joerg Exp $
-
---- src/Plugins/TransformEdges/transformedgeswidget.h.orig 2011-09-26 09:45:24.000000000 +0000
-+++ src/Plugins/TransformEdges/transformedgeswidget.h
-@@ -22,8 +22,10 @@
- #include <QWidget>
- #include <KDialog>
-
-+#ifndef Q_MOC_RUN
- #include <boost/graph/adjacency_list.hpp>
- #include <boost/graph/topology.hpp>
-+#endif
-
- #include "Rocs_Typedefs.h"
-
diff --git a/misc/step/Makefile b/misc/step/Makefile
index 476b869bedb..1bf12cff559 100644
--- a/misc/step/Makefile
+++ b/misc/step/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:27 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:05 markd Exp $
DISTNAME= step-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE interactive physical simulator
diff --git a/misc/step/distinfo b/misc/step/distinfo
index e86c0b24c69..a9ee098b27c 100644
--- a/misc/step/distinfo
+++ b/misc/step/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:05 markd Exp $
-SHA1 (step-4.8.4.tar.xz) = 498d8243309388fa8b59cd968c0c92fc588eda11
-RMD160 (step-4.8.4.tar.xz) = 7e485bed29dc60f0e54fb32a3758437b8658901a
-Size (step-4.8.4.tar.xz) = 377912 bytes
+SHA1 (step-4.10.2.tar.xz) = ff5fccd47113b598b688b87226b23072047bf990
+RMD160 (step-4.10.2.tar.xz) = b9a33b90ed47aa4707d918ffe4ebaa1249ef27e1
+Size (step-4.10.2.tar.xz) = 376340 bytes
diff --git a/misc/superkaramba/Makefile b/misc/superkaramba/Makefile
index c6fa74f18b7..026d7f239b0 100644
--- a/misc/superkaramba/Makefile
+++ b/misc/superkaramba/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2013/02/16 11:23:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2013/04/03 10:52:23 markd Exp $
DISTNAME= superkaramba-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= misc
COMMENT= KDE desktop widgets
diff --git a/misc/superkaramba/PLIST b/misc/superkaramba/PLIST
index db14b096408..447ae12152a 100644
--- a/misc/superkaramba/PLIST
+++ b/misc/superkaramba/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:56 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/04/03 10:52:23 markd Exp $
bin/superkaramba
lib/kde4/plasma_package_superkaramba.so
lib/kde4/plasma_scriptengine_superkaramba.so
lib/libsuperkaramba.so
lib/libsuperkaramba.so.4
-lib/libsuperkaramba.so.4.8.0
+lib/libsuperkaramba.so.${PKGVERSION}
share/applications/kde4/superkaramba.desktop
share/dbus-1/interfaces/org.kde.superkaramba.xml
share/icons/hicolor/128x128/apps/superkaramba.png
diff --git a/misc/superkaramba/distinfo b/misc/superkaramba/distinfo
index b060f8b694f..1affe84c9ae 100644
--- a/misc/superkaramba/distinfo
+++ b/misc/superkaramba/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2013/01/17 15:56:54 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:23 markd Exp $
-SHA1 (superkaramba-4.8.4.tar.xz) = b013e4bd063790e5970cf798f247edb87d576900
-RMD160 (superkaramba-4.8.4.tar.xz) = 635b59dfde50e3f9b18f4428769563dd43c278f8
-Size (superkaramba-4.8.4.tar.xz) = 394084 bytes
+SHA1 (superkaramba-4.10.2.tar.xz) = 5c701c7d95cef873fd0767726a6042d02844c0f2
+RMD160 (superkaramba-4.10.2.tar.xz) = 945f95a400e84489f1cb40f648e2154682f5bf1f
+Size (superkaramba-4.10.2.tar.xz) = 390292 bytes
SHA1 (patch-src_sensors_mem.cpp) = b95cf1c87821e0f01828646d4a23d46fa0368a02
diff --git a/misc/sweeper/Makefile b/misc/sweeper/Makefile
index 75b3759481a..42c49735775 100644
--- a/misc/sweeper/Makefile
+++ b/misc/sweeper/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:23:27 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:17 markd Exp $
DISTNAME= sweeper-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= sysutils
COMMENT= KDE system cleaner
diff --git a/misc/sweeper/distinfo b/misc/sweeper/distinfo
index d718a98bd4f..ac858d2c247 100644
--- a/misc/sweeper/distinfo
+++ b/misc/sweeper/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:34 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:18 markd Exp $
-SHA1 (sweeper-4.8.4.tar.xz) = 8a4dd11724ed14987981dfaa60e742cfd80ee6d9
-RMD160 (sweeper-4.8.4.tar.xz) = 8f893ed97a83f7ef33f729495219ec9954387dc1
-Size (sweeper-4.8.4.tar.xz) = 84892 bytes
+SHA1 (sweeper-4.10.2.tar.xz) = b817768cbf7c47ba8d0f61c714849e9074cebc43
+RMD160 (sweeper-4.10.2.tar.xz) = d9e4aa21e2f2402169b903bb5954ea0a78ed2f5b
+Size (sweeper-4.10.2.tar.xz) = 84584 bytes
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index e687adc146e..2d895535925 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.49 2013/02/16 11:23:53 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2013/04/03 10:51:59 markd Exp $
DISTNAME= kdenetwork-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 13
CATEGORIES= net
COMMENT= Network modules for the KDE integrated X11 desktop
diff --git a/net/kdenetwork4/PLIST b/net/kdenetwork4/PLIST
index 5515647cebb..b3acb525fa8 100644
--- a/net/kdenetwork4/PLIST
+++ b/net/kdenetwork4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/09/17 12:06:01 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/04/03 10:51:59 markd Exp $
bin/kget
bin/kopete
bin/kopete_latexconvert.sh
@@ -155,16 +155,16 @@ lib/kde4/plugins/accessible/chatwindowaccessiblewidgetfactory.so
lib/kde4/sambausershareplugin.so
lib/libkgetcore.so
lib/libkgetcore.so.4
-lib/libkgetcore.so.4.8.0
+lib/libkgetcore.so.${PKGVERSION}
lib/libkopete.so
lib/libkopete.so.4
-lib/libkopete.so.4.8.0
+lib/libkopete.so.${PKGVERSION}
lib/libkopete_oscar.so
lib/libkopete_oscar.so.4
-lib/libkopete_oscar.so.4.8.0
+lib/libkopete_oscar.so.${PKGVERSION}
lib/libkopete_videodevice.so
lib/libkopete_videodevice.so.4
-lib/libkopete_videodevice.so.4.8.0
+lib/libkopete_videodevice.so.${PKGVERSION}
lib/libkopeteaddaccountwizard.so
lib/libkopeteaddaccountwizard.so.1
lib/libkopeteaddaccountwizard.so.1.0.0
@@ -185,8 +185,8 @@ lib/libkopetestatusmenu.so.1
lib/libkopetestatusmenu.so.1.0.0
lib/libkrdccore.so
lib/libkrdccore.so.4
-lib/libkrdccore.so.4.8.0
-lib/libkrfbprivate.so.4.8.0
+lib/libkrdccore.so.${PKGVERSION}
+lib/libkrfbprivate.so.${PKGVERSION}
lib/libkyahoo.so
lib/libkyahoo.so.1
lib/libkyahoo.so.1.0.0
@@ -1479,6 +1479,8 @@ share/kde4/servicetypes/kopeteprotocol.desktop
share/kde4/servicetypes/kopeteui.desktop
share/kde4/servicetypes/krdc_plugin.desktop
share/kde4/servicetypes/krfb-framebuffer.desktop
+share/ontology/kde/kget_history.ontology
+share/ontology/kde/kget_history.trig
share/sounds/KDE-Im-Phone-Ring.wav
share/sounds/Kopete_Event.ogg
share/sounds/Kopete_Received.ogg
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index fda7260d0e6..0dd82e6e9be 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2012/06/16 04:45:37 markd Exp $
+$NetBSD: distinfo,v 1.21 2013/04/03 10:51:59 markd Exp $
-SHA1 (kdenetwork-4.8.4.tar.xz) = b3926c5cd929cec209421c2f1cb8659cc1c82458
-RMD160 (kdenetwork-4.8.4.tar.xz) = 593ebaa7821ffa9921817ab7ac651040f0d8d44b
-Size (kdenetwork-4.8.4.tar.xz) = 9268552 bytes
+SHA1 (kdenetwork-4.10.2.tar.xz) = 972526be8275a8adcb6e4fa51188a5dad83a0b14
+RMD160 (kdenetwork-4.10.2.tar.xz) = 1ab2675e453d7bc39bb51a192d4e7166404dc351
+Size (kdenetwork-4.10.2.tar.xz) = 9052096 bytes
SHA1 (patch-aa) = 0359cd86501c57197242c398d63c1fc77c60a4d0
SHA1 (patch-ab) = 0743b3b6c994623c507b8bcd52ee01dad31cf56f
SHA1 (patch-ae) = 765d48550d2d8b7a59a1593a669b0909fef3bd96
diff --git a/print/okular/Makefile b/print/okular/Makefile
index ecc0524a4e5..8232890a3de 100644
--- a/print/okular/Makefile
+++ b/print/okular/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2013/04/01 16:03:49 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2013/04/03 10:52:10 markd Exp $
DISTNAME= okular-${_KDE_VERSION}
-PKGREVISION= 11
CATEGORIES= print
COMMENT= KDE universal document viewer
@@ -19,6 +18,7 @@ COMMENT= KDE universal document viewer
.include "../../security/qca2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/ebook-tools/buildlink3.mk"
+.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/okular/PLIST b/print/okular/PLIST
index 36247a5dbf4..3afbd12a84c 100644
--- a/print/okular/PLIST
+++ b/print/okular/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 00:34:54 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:10 markd Exp $
bin/okular
include/okular/core/action.h
include/okular/core/annotations.h
@@ -13,18 +13,23 @@ include/okular/core/okular_export.h
include/okular/core/page.h
include/okular/core/pagesize.h
include/okular/core/pagetransition.h
+include/okular/core/settings_core.h
include/okular/core/sound.h
include/okular/core/sourcereference.h
include/okular/core/textdocumentgenerator.h
include/okular/core/textpage.h
+include/okular/core/tile.h
include/okular/core/utils.h
include/okular/core/version.h
include/okular/interfaces/configinterface.h
include/okular/interfaces/guiinterface.h
include/okular/interfaces/printinterface.h
+include/okular/interfaces/saveinterface.h
include/okular/interfaces/viewerinterface.h
lib/cmake/Okular/OkularConfig.cmake
lib/cmake/Okular/OkularConfigVersion.cmake
+lib/kde4/imports/org/kde/okular/libokularplugin.so
+lib/kde4/imports/org/kde/okular/qmldir
lib/kde4/kio_msits.so
lib/kde4/okularGenerator_chmlib.so
lib/kde4/okularGenerator_comicbook.so
@@ -42,8 +47,9 @@ lib/kde4/okularGenerator_tiff.so
lib/kde4/okularGenerator_xps.so
lib/kde4/okularpart.so
lib/libokularcore.so
-lib/libokularcore.so.1
-lib/libokularcore.so.1.8.0
+lib/libokularcore.so.2
+lib/libokularcore.so.2.0.0
+man/man1/okular.1
share/applications/kde4/okular.desktop
share/applications/kde4/okularApplication_chm.desktop
share/applications/kde4/okularApplication_comicbook.desktop
@@ -61,14 +67,18 @@ share/applications/kde4/okularApplication_tiff.desktop
share/applications/kde4/okularApplication_xps.desktop
share/doc/kde/HTML/en/okular/annotation-properties.png
share/doc/kde/HTML/en/okular/annotations.png
+share/doc/kde/HTML/en/okular/bookmark-management.png
share/doc/kde/HTML/en/okular/common
+share/doc/kde/HTML/en/okular/configure-editor.png
share/doc/kde/HTML/en/okular/configure.png
share/doc/kde/HTML/en/okular/embedded-files-bar.png
share/doc/kde/HTML/en/okular/forms-bar.png
share/doc/kde/HTML/en/okular/index.cache.bz2
share/doc/kde/HTML/en/okular/index.docbook
share/doc/kde/HTML/en/okular/mainwindow.png
+share/doc/kde/HTML/en/okular/man-okular.1.docbook
share/doc/kde/HTML/en/okular/presentation.png
+share/doc/kde/HTML/en/okular/rating.png
share/icons/hicolor/128x128/apps/okular.png
share/icons/hicolor/16x16/apps/okular.png
share/icons/hicolor/22x22/apps/okular.png
@@ -76,6 +86,7 @@ share/icons/hicolor/32x32/apps/okular.png
share/icons/hicolor/48x48/apps/okular.png
share/icons/hicolor/64x64/apps/okular.png
share/icons/hicolor/scalable/apps/okular.svgz
+share/kde/apps/kconf_update/okular.upd
share/kde/apps/okular/icons/hicolor/16x16/apps/okular-gv.png
share/kde/apps/okular/icons/hicolor/32x32/apps/okular-gv.png
share/kde/apps/okular/part-viewermode.rc
@@ -113,6 +124,7 @@ share/kde/apps/okular/shell.rc
share/kde/apps/okular/tools.xml
share/kde/config.kcfg/gssettings.kcfg
share/kde/config.kcfg/okular.kcfg
+share/kde/config.kcfg/okular_core.kcfg
share/kde4/services/libokularGenerator_chmlib.desktop
share/kde4/services/libokularGenerator_comicbook.desktop
share/kde4/services/libokularGenerator_djvu.desktop
diff --git a/print/okular/distinfo b/print/okular/distinfo
index a1e71c302de..943692443d0 100644
--- a/print/okular/distinfo
+++ b/print/okular/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:37 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:10 markd Exp $
-SHA1 (okular-4.8.4.tar.xz) = 34ff243a4fa77400631aa44b31cbe54910f8091e
-RMD160 (okular-4.8.4.tar.xz) = f210df71bb8021cf26a942ea21d4929eeb533417
-Size (okular-4.8.4.tar.xz) = 1114648 bytes
+SHA1 (okular-4.10.2.tar.xz) = fcd0c725300c50ea04ec8e05b7d7035bf26afc79
+RMD160 (okular-4.10.2.tar.xz) = 43ebeed8a0e26bac373044976e7046bf2f0acecf
+Size (okular-4.10.2.tar.xz) = 1383348 bytes
diff --git a/print/printer-applet/DESCR b/print/printer-applet/DESCR
deleted file mode 100644
index fb8c801beef..00000000000
--- a/print/printer-applet/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Printer Applet is a system tray utility that shows current print jobs,
-shows printer warnings and errors and shows when printers that have been
-plugged in for the first time are being auto-configured by hal-cups-utils.
-It is a port of the applet from Red Hat's system-config-printer to KDE.
diff --git a/print/printer-applet/Makefile b/print/printer-applet/Makefile
deleted file mode 100644
index e9283fff693..00000000000
--- a/print/printer-applet/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2013/02/16 11:24:13 wiz Exp $
-
-DISTNAME= printer-applet-${_KDE_VERSION}
-PKGREVISION= 7
-CATEGORIES= print
-COMMENT= KDE printer applet
-
-.include "../../meta-pkgs/kde4/Makefile.kde4"
-
-#make sure cmake picks up the same Python version as pkgsrc
-CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
-
-REPLACE_PYTHON+= *.py
-
-.include "../../meta-pkgs/kde4/kde4.mk"
-
-.include "../../lang/python/application.mk"
-.include "../../print/py-cups/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/py-kde4/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/printer-applet/PLIST b/print/printer-applet/PLIST
deleted file mode 100644
index dac9e8baa74..00000000000
--- a/print/printer-applet/PLIST
+++ /dev/null
@@ -1,15 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 06:21:42 markd Exp $
-bin/printer-applet
-share/doc/kde/HTML/en/printer-applet/common
-share/doc/kde/HTML/en/printer-applet/index.cache.bz2
-share/doc/kde/HTML/en/printer-applet/index.docbook
-share/kde/apps/printer-applet/authconn.py
-share/kde/apps/printer-applet/debug.py
-share/kde/apps/printer-applet/monitor.py
-share/kde/apps/printer-applet/printer-applet-printers.ui
-share/kde/apps/printer-applet/printer-applet.notifyrc
-share/kde/apps/printer-applet/printer-applet.py
-share/kde/apps/printer-applet/printer-applet.ui
-share/kde/apps/printer-applet/printer-appletui.rc
-share/kde/apps/printer-applet/statereason.py
-share/kde/autostart/printer-applet.desktop
diff --git a/print/printer-applet/distinfo b/print/printer-applet/distinfo
deleted file mode 100644
index 543d6870310..00000000000
--- a/print/printer-applet/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:37 markd Exp $
-
-SHA1 (printer-applet-4.8.4.tar.xz) = 451bb3d658a447c454918ea5b0299f1e85b8cfd2
-RMD160 (printer-applet-4.8.4.tar.xz) = 4684c2eb7a5956c09cd6d670b9366fa31dd119ae
-Size (printer-applet-4.8.4.tar.xz) = 37072 bytes
diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile
index 0c007f111f0..8c2ae4ee9f7 100644
--- a/security/kgpg/Makefile
+++ b/security/kgpg/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2013/02/16 11:24:19 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2013/04/03 10:52:17 markd Exp $
DISTNAME= kgpg-${_KDE_VERSION}
-PKGREVISION= 11
CATEGORIES= security
COMMENT= KDE encryption tool
diff --git a/security/kgpg/distinfo b/security/kgpg/distinfo
index 3bb7581fc57..4fe15168a3b 100644
--- a/security/kgpg/distinfo
+++ b/security/kgpg/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:37 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:17 markd Exp $
-SHA1 (kgpg-4.8.4.tar.xz) = 4b201d0db0d97d258597b0b345848acec5bd0130
-RMD160 (kgpg-4.8.4.tar.xz) = 40b075ed7e0926cd8a6c5672c04204e6aafec211
-Size (kgpg-4.8.4.tar.xz) = 817180 bytes
+SHA1 (kgpg-4.10.2.tar.xz) = fbe8df63cbfbff616493267253b03e153e2bbc40
+RMD160 (kgpg-4.10.2.tar.xz) = c6e16ac7183e9735085afbf32d850622d20a5085
+Size (kgpg-4.10.2.tar.xz) = 814584 bytes
diff --git a/security/ksecrets/DESCR b/security/ksecrets/DESCR
deleted file mode 100644
index 95cb62d5d3c..00000000000
--- a/security/ksecrets/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-KDE secrets service.
diff --git a/security/ksecrets/Makefile b/security/ksecrets/Makefile
deleted file mode 100644
index 445ccbc5e48..00000000000
--- a/security/ksecrets/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2013/02/16 11:24:19 wiz Exp $
-
-DISTNAME= ksecrets-${_KDE_VERSION}
-PKGREVISION= 7
-CATEGORIES= security
-COMMENT= KDE secrets service
-
-.include "../../meta-pkgs/kde4/Makefile.kde4"
-
-.include "../../meta-pkgs/kde4/kde4.mk"
-
-.include "../../security/qca2/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kde-workspace4/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/security/ksecrets/PLIST b/security/ksecrets/PLIST
deleted file mode 100644
index 88d1abb0216..00000000000
--- a/security/ksecrets/PLIST
+++ /dev/null
@@ -1,28 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2012/04/15 05:54:58 markd Exp $
-bin/ksecrets
-bin/ksecretsserviced
-bin/ksecretsync
-bin/kwl2kss
-include/ksecretsservice/daemonsecret.h
-include/ksecretsservice/dbustypes.h
-include/ksecretsservice/ksecretsservicecodec.h
-include/ksecretsservice/ksecretsservicecollection.h
-include/ksecretsservice/ksecretsservicecollectionjobs.h
-include/ksecretsservice/ksecretsservicedbustypes.h
-include/ksecretsservice/ksecretsserviceitem.h
-include/ksecretsservice/ksecretsserviceitemjobs.h
-include/ksecretsservice/ksecretsservicesecret.h
-include/ksecretsservice/private/ksecretsservicecodec.h
-include/ksecretsservice/private/ksecretsservicedbustypes.h
-lib/kde4/kcm_ksecretsync.so
-lib/kde4/kio_ksecretsservice.so
-lib/libksecretsservice.so
-lib/libksecretsservice.so.4
-lib/libksecretsservice.so.4.8.0
-share/applications/kde4/ksecrets.desktop
-share/dbus-1/services/org.kde.ksecretsserviced.service
-share/kde/apps/ksecretsync/ksecretsync.rc
-share/kde/config.kcfg/kcm_ksecretsync.kcfg
-share/kde4/services/kcm_ksecretsync.desktop
-share/kde4/services/ksecretsserviced.desktop
-share/kde4/services/secrets.protocol
diff --git a/security/ksecrets/distinfo b/security/ksecrets/distinfo
deleted file mode 100644
index 4db2f32e851..00000000000
--- a/security/ksecrets/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
-
-SHA1 (ksecrets-4.8.4.tar.xz) = d0fd2c601833cf1ffe52760472e22d667a6a6408
-RMD160 (ksecrets-4.8.4.tar.xz) = a6bc00009ea454555fde3e9b282b32a328fb02f6
-Size (ksecrets-4.8.4.tar.xz) = 153268 bytes
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 63a9e4cabd0..a9506926b63 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:24:20 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:16 markd Exp $
DISTNAME= kwallet-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= security
COMMENT= KDE wallet manager
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index 07b546a7b5d..52f3659f850 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:17 markd Exp $
-SHA1 (kwallet-4.8.4.tar.xz) = 8c85c9de379f0e8ad8a3dffc2136c6b25c0fa4a9
-RMD160 (kwallet-4.8.4.tar.xz) = 80ef140f7f45df0b80d27f84ccf4a9697f85182d
-Size (kwallet-4.8.4.tar.xz) = 283536 bytes
+SHA1 (kwallet-4.10.2.tar.xz) = 2a566c85aec79e8d08afe996224029714cd38b6e
+RMD160 (kwallet-4.10.2.tar.xz) = 8eae13edd9972deefe178b1aa39d8b5512b95bd2
+Size (kwallet-4.10.2.tar.xz) = 282440 bytes
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 92e7f7e8f0d..99a7d17b25c 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2013/02/16 11:24:26 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2013/04/03 10:52:13 markd Exp $
DISTNAME= filelight-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= sysutils
COMMENT= Graphical filesystem usage monitor
LICENSE= gnu-gpl-v3
diff --git a/sysutils/filelight/distinfo b/sysutils/filelight/distinfo
index 821bced77ca..bfafc7facb0 100644
--- a/sysutils/filelight/distinfo
+++ b/sysutils/filelight/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.7 2013/04/03 10:52:14 markd Exp $
-SHA1 (filelight-4.8.4.tar.xz) = 3023e9daa8bc5271bed3f3c08076952bcaf75efd
-RMD160 (filelight-4.8.4.tar.xz) = 86d44193dd1da30b091cadd36dca68283558826d
-Size (filelight-4.8.4.tar.xz) = 296540 bytes
+SHA1 (filelight-4.10.2.tar.xz) = 1047e985fead8655b9eac888315b007844b34a68
+RMD160 (filelight-4.10.2.tar.xz) = 44be8d73ce0b9de374dda7bf0b299258ac61f45c
+Size (filelight-4.10.2.tar.xz) = 290736 bytes
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 7b97a3a8d85..8ae0a8621da 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2013/02/16 11:24:32 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/04/03 10:52:14 markd Exp $
DISTNAME= kdf-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= sysutils
COMMENT= show mount points and disk usage under KDE desktop
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 0677647352e..b5d1ef601a7 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.9 2013/04/03 10:52:15 markd Exp $
-SHA1 (kdf-4.8.4.tar.xz) = c83f9659d693f27166519969f85c630fdeaa3d9c
-RMD160 (kdf-4.8.4.tar.xz) = 1ec5a5610f99bdac172dfac0a2e636fcf0d72e56
-Size (kdf-4.8.4.tar.xz) = 157648 bytes
+SHA1 (kdf-4.10.2.tar.xz) = e7f230d14188c45c226513e110ee664a4ad89cb9
+RMD160 (kdf-4.10.2.tar.xz) = d70165c812344576268173f7bddaaf1ff99ac61c
+Size (kdf-4.10.2.tar.xz) = 157052 bytes
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 6e498de9ec2..cd20a33c5c9 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:24:33 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:15 markd Exp $
DISTNAME= kfloppy-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= sysutils
COMMENT= KDE floppy formatter
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 4d9dfff9336..21379ff9c60 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:15 markd Exp $
-SHA1 (kfloppy-4.8.4.tar.xz) = 597e7d1fa546a898b4e46a9750632be8dc8a01a7
-RMD160 (kfloppy-4.8.4.tar.xz) = e1d67c61fc75a0aad5b9d5554a77a7227eb4ecaf
-Size (kfloppy-4.8.4.tar.xz) = 61860 bytes
+SHA1 (kfloppy-4.10.2.tar.xz) = c79e9660ebea09aea2caffb8424e3621f30d3346
+RMD160 (kfloppy-4.10.2.tar.xz) = 3a7a5fccac6e53b498494e47bc9d1e0edc2b0f5d
+Size (kfloppy-4.10.2.tar.xz) = 61452 bytes
diff --git a/time/ktimer/Makefile b/time/ktimer/Makefile
index 1e0d055b938..b4052d0ada0 100644
--- a/time/ktimer/Makefile
+++ b/time/ktimer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:24:43 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:52:16 markd Exp $
DISTNAME= ktimer-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= time
COMMENT= KDE countdown launcher
diff --git a/time/ktimer/distinfo b/time/ktimer/distinfo
index 29be289e35e..c773e5f02a3 100644
--- a/time/ktimer/distinfo
+++ b/time/ktimer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:52:16 markd Exp $
-SHA1 (ktimer-4.8.4.tar.xz) = 39e117449beffa8e2a38f7b45f69965a71de3805
-RMD160 (ktimer-4.8.4.tar.xz) = de3b8a3931d92ec42d70bdb8cd2f4f6963eaf814
-Size (ktimer-4.8.4.tar.xz) = 151216 bytes
+SHA1 (ktimer-4.10.2.tar.xz) = 2348d09267f173201b1ce426f0831e444602545d
+RMD160 (ktimer-4.10.2.tar.xz) = cb1f71dc729291d05648dae91759206b7abaf27d
+Size (ktimer-4.10.2.tar.xz) = 150924 bytes
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 40e692736bf..9a44612ddf9 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2013/02/16 11:24:53 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2013/04/03 10:52:18 markd Exp $
DISTNAME= kdewebdev-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 11
CATEGORIES= www
COMMENT= HTML editor and tools suitable for experienced web developers
diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo
index 1659b9023b8..8d15b7d83d5 100644
--- a/www/kdewebdev4/distinfo
+++ b/www/kdewebdev4/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.16 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.17 2013/04/03 10:52:18 markd Exp $
-SHA1 (kdewebdev-4.8.4.tar.xz) = bab86ef6c04515a454298cee46eccb25e590f972
-RMD160 (kdewebdev-4.8.4.tar.xz) = 9397b030bc2ff44cc30e5227183cfe654a83c417
-Size (kdewebdev-4.8.4.tar.xz) = 2603352 bytes
+SHA1 (kdewebdev-4.10.2.tar.xz) = 3ab68cf5fefbfe09826e659a097d21821771a5b9
+RMD160 (kdewebdev-4.10.2.tar.xz) = 56c9270127fecc052ddcf0686e6626bb456c072f
+Size (kdewebdev-4.10.2.tar.xz) = 2592208 bytes
SHA1 (patch-klinkstatus_src_CMakeLists.txt) = b3698f7edde82552e0395a27df980d0e58ce0994
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index 91d4607d729..806c0dff504 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:19:53 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:45 markd Exp $
DISTNAME= kactivities-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= x11
COMMENT= KDE Activity Manager
@@ -10,5 +9,6 @@ COMMENT= KDE Activity Manager
PKGCONFIG_OVERRIDE+= lib/libkactivities.pc.cmake
.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kactivities/PLIST b/x11/kactivities/PLIST
index 9a4595bb387..1b2cb78cf6c 100644
--- a/x11/kactivities/PLIST
+++ b/x11/kactivities/PLIST
@@ -1,30 +1,63 @@
-@comment $NetBSD: PLIST,v 1.2 2012/06/16 04:45:38 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/04/03 10:51:45 markd Exp $
bin/kactivitymanagerd
include/KDE/KActivities/Consumer
include/KDE/KActivities/Controller
include/KDE/KActivities/Info
+include/KDE/KActivities/Models/ActivityModel
+include/KDE/KActivities/Models/ResourceModel
include/KDE/KActivities/ResourceInstance
+include/kactivities-models/activitymodel.h
+include/kactivities-models/kactivities_models_export.h
+include/kactivities-models/resourcemodel.h
include/kactivities/consumer.h
include/kactivities/controller.h
include/kactivities/info.h
include/kactivities/kactivities_export.h
include/kactivities/resourceinstance.h
+lib/cmake/KActivities-Models/KActivities-ModelsConfig.cmake
+lib/cmake/KActivities-Models/KActivities-ModelsConfigVersion.cmake
+lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets-${TARGET}.cmake
+lib/cmake/KActivities-Models/KActivitiesModelsLibraryTargets.cmake
lib/cmake/KActivities/KActivitiesConfig.cmake
lib/cmake/KActivities/KActivitiesConfigVersion.cmake
-lib/cmake/KActivities/KActivitiesLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KActivities/KActivitiesLibraryTargets-${TARGET}.cmake
lib/cmake/KActivities/KActivitiesLibraryTargets.cmake
-lib/kde4/activitymanager_plugin_dummy.so
+lib/kde4/activitymanager_plugin_activityranking.so
lib/kde4/activitymanager_plugin_globalshortcuts.so
-lib/kde4/activitymanager_plugin_nepomuk.so
lib/kde4/activitymanager_plugin_slc.so
+lib/kde4/activitymanager_plugin_sqlite.so
+lib/kde4/activitymanager_plugin_virtualdesktopswitch.so
+lib/kde4/activitymanager_uihandler_declarative.so
+lib/kde4/activitymanager_uihandler_kdialog.so
+lib/kde4/imports/org/kde/activities/models/libkactivities-models-component-plugin.so
+lib/kde4/imports/org/kde/activities/models/qmldir
+lib/kde4/kactivitymanagerd_fileitem_linking_plugin.so
+lib/kde4/kcm_activities.so
+lib/kde4/kio_activities.so
+lib/libkactivities-models.so
+lib/libkactivities-models.so.1
+lib/libkactivities-models.so.1.0.0
lib/libkactivities.so
lib/libkactivities.so.6
-lib/libkactivities.so.6.0.0
+lib/libkactivities.so.6.1.0
+lib/pkgconfig/libkactivities-models.pc
lib/pkgconfig/libkactivities.pc
-share/kde4/services/activitymanager-plugin-dummy.desktop
+share/kde/apps/activitymanager/workspace/settings/BlacklistApplicationView.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/ChoiceDialog.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/MessageDialog.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/NewPasswordDialog.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/PasswordDialog.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/contents/ui/uihandler.qml
+share/kde/apps/plasma/packages/org.kde.ActivityManager.UiHandler/metadata.desktop
+share/kde4/services/activities.protocol
+share/kde4/services/activitymanager-plugin-activityranking.desktop
share/kde4/services/activitymanager-plugin-globalshortcuts.desktop
-share/kde4/services/activitymanager-plugin-nepomuk.desktop
share/kde4/services/activitymanager-plugin-slc.desktop
+share/kde4/services/activitymanager-plugin-sqlite.desktop
+share/kde4/services/activitymanager-plugin-virtualdesktopswitch.desktop
share/kde4/services/kactivitymanagerd.desktop
-share/kde4/services/kded/activitymanager.desktop
+share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
+share/kde4/services/kcm_activities.desktop
share/kde4/servicetypes/activitymanager-plugin.desktop
+share/ontology/kde/kao.ontology
+share/ontology/kde/kao.trig
diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
index 2615d43f28c..9ff3d980858 100644
--- a/x11/kactivities/distinfo
+++ b/x11/kactivities/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:45 markd Exp $
-SHA1 (kactivities-4.8.4.tar.xz) = 3f42c18bae5a1d6bbd7fca471d8b4f9755875e06
-RMD160 (kactivities-4.8.4.tar.xz) = 0b5c95876f507e990b8d3e98f1964ad72b1c2c91
-Size (kactivities-4.8.4.tar.xz) = 42396 bytes
+SHA1 (kactivities-4.10.2.tar.xz) = bde79ed3db93d5fa72e1081a6638c5cb777f495e
+RMD160 (kactivities-4.10.2.tar.xz) = 04e63600ceddd0788b2f0ba63816b0b07a209643
+Size (kactivities-4.10.2.tar.xz) = 108668 bytes
diff --git a/x11/kde-baseapps4/Makefile b/x11/kde-baseapps4/Makefile
index 5d5800dff79..6b9960792ab 100644
--- a/x11/kde-baseapps4/Makefile
+++ b/x11/kde-baseapps4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2013/02/16 11:25:05 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2013/04/03 10:51:48 markd Exp $
DISTNAME= kde-baseapps-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 7
CATEGORIES= x11
COMMENT= Base modules for the KDE 4 integrated X11 desktop
@@ -26,7 +25,10 @@ REPLACE_FILES.scheme= lib/konq/Templates/Program.desktop
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/qimageblitz/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
+.include "../../misc/nepomuk-widgets/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../x11/kde-runtime4/buildlink3.mk"
.include "../../x11/kde-workspace4/buildlink3.mk"
diff --git a/x11/kde-baseapps4/PLIST b/x11/kde-baseapps4/PLIST
index a9ad59542ab..219351b3735 100644
--- a/x11/kde-baseapps4/PLIST
+++ b/x11/kde-baseapps4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:39 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/03 10:51:49 markd Exp $
bin/dolphin
bin/fsview
bin/kbookmarkmerger
@@ -75,22 +75,22 @@ lib/kde4/webarchiverplugin.so
lib/kde4/webarchivethumbnail.so
lib/libdolphinprivate.so
lib/libdolphinprivate.so.4
-lib/libdolphinprivate.so.4.8.0
+lib/libdolphinprivate.so.${PKGVERSION}
lib/libkbookmarkmodel_private.so
lib/libkbookmarkmodel_private.so.4
-lib/libkbookmarkmodel_private.so.4.8.0
+lib/libkbookmarkmodel_private.so.${PKGVERSION}
lib/libkdeinit4_dolphin.so
lib/libkdeinit4_keditbookmarks.so
lib/libkdeinit4_kfmclient.so
lib/libkdeinit4_konqueror.so
lib/libkonq.so
lib/libkonq.so.5
-lib/libkonq.so.5.8.0
+lib/libkonq.so.5.10.2
lib/libkonqsidebarplugin.so
lib/libkonqsidebarplugin.so.4
-lib/libkonqsidebarplugin.so.4.8.0
+lib/libkonqsidebarplugin.so.${PKGVERSION}
lib/libkonquerorprivate.so.4
-lib/libkonquerorprivate.so.4.8.0
+lib/libkonquerorprivate.so.${PKGVERSION}
man/man1/kbookmarkmerger.1
man/man1/kfind.1
share/applications/kde4/Home.desktop
@@ -115,13 +115,14 @@ share/dbus-1/interfaces/org.kde.nsplugins.instance.xml
share/dbus-1/interfaces/org.kde.nsplugins.viewer.xml
share/doc/kde/HTML/en/dolphin/common
share/doc/kde/HTML/en/dolphin/default-ui.png
+share/doc/kde/HTML/en/dolphin/grouping-view.png
share/doc/kde/HTML/en/dolphin/index.cache.bz2
share/doc/kde/HTML/en/dolphin/index.docbook
-share/doc/kde/HTML/en/dolphin/grouping-view.png
share/doc/kde/HTML/en/dolphin/locationbar-breadcrumb.png
share/doc/kde/HTML/en/dolphin/locationbar-context-menu.png
share/doc/kde/HTML/en/dolphin/locationbar-editable.png
share/doc/kde/HTML/en/dolphin/locationbar-places-icon.png
+share/doc/kde/HTML/en/dolphin/nepomuk-search-more-options.png
share/doc/kde/HTML/en/dolphin/nepomuk-search.png
share/doc/kde/HTML/en/dolphin/preferences-general-behavior.png
share/doc/kde/HTML/en/dolphin/preferences-navigation.png
@@ -156,6 +157,7 @@ share/doc/kde/HTML/en/konqueror/filemanager.docbook
share/doc/kde/HTML/en/konqueror/folders.png
share/doc/kde/HTML/en/konqueror/format-font-size-less.png
share/doc/kde/HTML/en/konqueror/format-font-size-more.png
+share/doc/kde/HTML/en/konqueror/grouping-view.png
share/doc/kde/HTML/en/konqueror/index.cache.bz2
share/doc/kde/HTML/en/konqueror/index.docbook
share/doc/kde/HTML/en/konqueror/introduction.docbook
@@ -220,10 +222,6 @@ share/kde/apps/domtreeviewer/domtreeviewerui.rc
share/kde/apps/fsview/fsview_part.rc
share/kde/apps/kbookmark/directory_bookmarkbar.desktop
share/kde/apps/kcmcss/template.css
-share/kde/apps/kconf_update/favicons.upd
-share/kde/apps/kconf_update/kfmclient_3_2.upd
-share/kde/apps/kconf_update/kfmclient_3_2_update.sh
-share/kde/apps/kconf_update/move_favicons.sh
share/kde/apps/kcontrol/pics/onlyone.png
share/kde/apps/kcontrol/pics/overlapping.png
share/kde/apps/kdm/pics/users/Blackbox.png
diff --git a/x11/kde-baseapps4/distinfo b/x11/kde-baseapps4/distinfo
index af1c38f87c9..243febf5e44 100644
--- a/x11/kde-baseapps4/distinfo
+++ b/x11/kde-baseapps4/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:39 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:49 markd Exp $
-SHA1 (kde-baseapps-4.8.4.tar.xz) = a1d6951b27c868c738a36dbd21702b658f3d6245
-RMD160 (kde-baseapps-4.8.4.tar.xz) = 779de14275b475bf556d47515b5219119c7ac969
-Size (kde-baseapps-4.8.4.tar.xz) = 2780696 bytes
+SHA1 (kde-baseapps-4.10.2.tar.xz) = 7f505292e95b35205cec3baa67e9e9b24f79b9b9
+RMD160 (kde-baseapps-4.10.2.tar.xz) = 74646825112ebaa313f1ab542b5d848d049c3260
+Size (kde-baseapps-4.10.2.tar.xz) = 2611976 bytes
diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile
index 238e80cdede..f0507007f4b 100644
--- a/x11/kde-runtime4/Makefile
+++ b/x11/kde-runtime4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2013/03/16 06:20:49 obache Exp $
+# $NetBSD: Makefile,v 1.19 2013/04/03 10:51:49 markd Exp $
DISTNAME= kde-runtime-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 10
CATEGORIES= x11
COMMENT= Runtime requirements for the KDE integrated X11 desktop
@@ -10,6 +9,7 @@ COMMENT= Runtime requirements for the KDE integrated X11 desktop
# BUILD_MAKE_FLAGS+= VERBOSE=1
CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=off
+CMAKE_ARGS+= -DWITH_LibSSH:BOOL=OFF
CMAKE_ARGS+= -DLIBLZMA_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.xz}/include
CMAKE_ARGS+= -DLIBLZMA_LIBRARY:FILEPATH=${BUILDLINK_PREFIX.xz}/lib/liblzma.so
@@ -44,9 +44,6 @@ REPLACE_PERL+= \
khelpcenter/searchhandlers/khc_mansearch.pl \
kioslave/info/kde-info2html
-REPLACE_PYTHON+= \
- nepomuk/services/storage/rcgen/nepomuk-simpleresource-rcgen.py
-
CONF_FILES+= ${PREFIX}/share/examples/kde-runtime4/kde-information.menu \
${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
CONF_FILES+= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf \
@@ -60,10 +57,12 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../audio/libcanberra/buildlink3.mk"
-.include "../../lang/python/application.mk"
+#.include "../../lang/python/application.mk"
# not the libssh the package wants
#.include "../../security/libssh/buildlink3.mk"
.include "../../security/qca2/buildlink3.mk"
+.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../multimedia/phonon/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
.include "../../graphics/exiv2/buildlink3.mk"
@@ -75,6 +74,7 @@ BUILDLINK_ABI_DEPENDS.attica?= attica>=0.1.4
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
BUILDLINK_ABI_DEPENDS.soprano?= soprano>=2.6.50
.include "../../textproc/soprano/buildlink3.mk"
+.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde-runtime4/PLIST b/x11/kde-runtime4/PLIST
index 85bf7e773e2..c2c0badfad4 100644
--- a/x11/kde-runtime4/PLIST
+++ b/x11/kde-runtime4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/09/26 09:55:39 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/04/03 10:51:49 markd Exp $
bin/kcmshell4
bin/kde-cp
bin/kde-mv
@@ -25,26 +25,13 @@ bin/ktrash
bin/kuiserver
bin/kwalletd
bin/kwriteconfig
-bin/nepomuk-simpleresource-rcgen
-bin/nepomukbackup
bin/nepomukcontroller
-bin/nepomukindexer
-bin/nepomukserver
-bin/nepomukservicestub
bin/plasma-remote-helper
bin/plasmapkg
bin/solid-hardware
include/knotify_export.h
include/knotifyconfig.h
include/knotifyplugin.h
-include/nepomuk/createresourcejob.h
-include/nepomuk/datamanagement.h
-include/nepomuk/describeresourcesjob.h
-include/nepomuk/nepomukdatamanagement_export.h
-include/nepomuk/resourcewatcher.h
-include/nepomuk/simpleresource.h
-include/nepomuk/simpleresourcegraph.h
-include/nepomuk/storeresourcesjob.h
lib/attica_kde.so
lib/kconf_update_bin/phonon_devicepreference_update
lib/kconf_update_bin/phonon_deviceuids_update
@@ -57,56 +44,79 @@ lib/kde4/htmlthumbnail.so
lib/kde4/imagethumbnail.so
lib/kde4/imports/org/kde/draganddrop/libdraganddropplugin.so
lib/kde4/imports/org/kde/draganddrop/qmldir
-lib/kde4/imports/org/kde/plasma/components/AppManager.js
+lib/kde4/imports/org/kde/locale/liblocalebindingsplugin.so
+lib/kde4/imports/org/kde/locale/qmldir
lib/kde4/imports/org/kde/plasma/components/BusyIndicator.qml
lib/kde4/imports/org/kde/plasma/components/Button.qml
lib/kde4/imports/org/kde/plasma/components/ButtonColumn.qml
lib/kde4/imports/org/kde/plasma/components/ButtonGroup.js
lib/kde4/imports/org/kde/plasma/components/ButtonRow.qml
-lib/kde4/imports/org/kde/plasma/components/ButtonShadow.qml
lib/kde4/imports/org/kde/plasma/components/CheckBox.qml
lib/kde4/imports/org/kde/plasma/components/CommonDialog.qml
+lib/kde4/imports/org/kde/plasma/components/ContextMenu.qml
lib/kde4/imports/org/kde/plasma/components/Dialog.qml
-lib/kde4/imports/org/kde/plasma/components/DualStateButton.qml
lib/kde4/imports/org/kde/plasma/components/Highlight.qml
-lib/kde4/imports/org/kde/plasma/components/IconLoader.qml
lib/kde4/imports/org/kde/plasma/components/Label.qml
lib/kde4/imports/org/kde/plasma/components/ListItem.qml
lib/kde4/imports/org/kde/plasma/components/Page.qml
-lib/kde4/imports/org/kde/plasma/components/PageStack.js
lib/kde4/imports/org/kde/plasma/components/PageStack.qml
lib/kde4/imports/org/kde/plasma/components/ProgressBar.qml
+lib/kde4/imports/org/kde/plasma/components/QueryDialog.qml
lib/kde4/imports/org/kde/plasma/components/RadioButton.qml
-lib/kde4/imports/org/kde/plasma/components/RoundShadow.qml
lib/kde4/imports/org/kde/plasma/components/ScrollBar.qml
-lib/kde4/imports/org/kde/plasma/components/ScrollBarDelegate.qml
-lib/kde4/imports/org/kde/plasma/components/ScrollDecoratorDelegate.qml
-lib/kde4/imports/org/kde/plasma/components/SectionScroller.js
lib/kde4/imports/org/kde/plasma/components/SectionScroller.qml
lib/kde4/imports/org/kde/plasma/components/SelectionDialog.qml
+lib/kde4/imports/org/kde/plasma/components/Sheet.qml
lib/kde4/imports/org/kde/plasma/components/Slider.qml
lib/kde4/imports/org/kde/plasma/components/Switch.qml
lib/kde4/imports/org/kde/plasma/components/TabBar.qml
-lib/kde4/imports/org/kde/plasma/components/TabBarLayout.qml
lib/kde4/imports/org/kde/plasma/components/TabButton.qml
-lib/kde4/imports/org/kde/plasma/components/TabGroup.js
lib/kde4/imports/org/kde/plasma/components/TabGroup.qml
lib/kde4/imports/org/kde/plasma/components/TextArea.qml
lib/kde4/imports/org/kde/plasma/components/TextField.qml
-lib/kde4/imports/org/kde/plasma/components/TextFieldFocus.qml
lib/kde4/imports/org/kde/plasma/components/ToolBar.qml
lib/kde4/imports/org/kde/plasma/components/ToolBarLayout.qml
lib/kde4/imports/org/kde/plasma/components/ToolButton.qml
lib/kde4/imports/org/kde/plasma/components/libplasmacomponentsplugin.so
+lib/kde4/imports/org/kde/plasma/components/private/AppManager.js
+lib/kde4/imports/org/kde/plasma/components/private/ButtonShadow.qml
+lib/kde4/imports/org/kde/plasma/components/private/Config.js
+lib/kde4/imports/org/kde/plasma/components/private/DualStateButton.qml
+lib/kde4/imports/org/kde/plasma/components/private/InlineDialog.qml
+lib/kde4/imports/org/kde/plasma/components/private/PageStack.js
+lib/kde4/imports/org/kde/plasma/components/private/RoundShadow.qml
+lib/kde4/imports/org/kde/plasma/components/private/ScrollBarDelegate.qml
+lib/kde4/imports/org/kde/plasma/components/private/ScrollDecoratorDelegate.qml
+lib/kde4/imports/org/kde/plasma/components/private/SectionScroller.js
+lib/kde4/imports/org/kde/plasma/components/private/TabBarLayout.qml
+lib/kde4/imports/org/kde/plasma/components/private/TabGroup.js
+lib/kde4/imports/org/kde/plasma/components/private/TextFieldFocus.qml
lib/kde4/imports/org/kde/plasma/components/qmldir
lib/kde4/imports/org/kde/plasma/core/libcorebindingsplugin.so
lib/kde4/imports/org/kde/plasma/core/qmldir
+lib/kde4/imports/org/kde/plasma/extras/App.qml
+lib/kde4/imports/org/kde/plasma/extras/ConditionalLoader.qml
+lib/kde4/imports/org/kde/plasma/extras/Heading.qml
+lib/kde4/imports/org/kde/plasma/extras/PageRow.qml
+lib/kde4/imports/org/kde/plasma/extras/Paragraph.qml
+lib/kde4/imports/org/kde/plasma/extras/ScrollArea.qml
+lib/kde4/imports/org/kde/plasma/extras/Title.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/ActivateAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/Animations.js
+lib/kde4/imports/org/kde/plasma/extras/animations/AppearAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/DisappearAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/PressedAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/animations/ReleasedAnimation.qml
+lib/kde4/imports/org/kde/plasma/extras/libplasmaextracomponentsplugin.so
+lib/kde4/imports/org/kde/plasma/extras/qmldir
lib/kde4/imports/org/kde/plasma/graphicslayouts/libgraphicslayoutsbindingsplugin.so
lib/kde4/imports/org/kde/plasma/graphicslayouts/qmldir
lib/kde4/imports/org/kde/plasma/graphicswidgets/libgraphicswidgetsbindingsplugin.so
lib/kde4/imports/org/kde/plasma/graphicswidgets/qmldir
lib/kde4/imports/org/kde/qtextracomponents/libqtextracomponentsplugin.so
lib/kde4/imports/org/kde/qtextracomponents/qmldir
+lib/kde4/imports/org/kde/runnermodel/librunnermodelplugin.so
+lib/kde4/imports/org/kde/runnermodel/qmldir
lib/kde4/jpegthumbnail.so
lib/kde4/kcm_attica.so
lib/kde4/kcm_cgi.so
@@ -121,7 +131,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
@@ -132,6 +141,7 @@ lib/kde4/kded_nepomuksearchmodule.so
lib/kde4/kded_networkstatus.so
lib/kde4/kded_networkwatcher.so
lib/kde4/kded_phononserver.so
+lib/kde4/kded_recentdocumentsnotifier.so
lib/kde4/kded_remotedirnotify.so
lib/kde4/kded_solidautoeject.so
lib/kde4/kded_soliduiserver.so
@@ -151,9 +161,11 @@ lib/kde4/kio_nepomuk.so
lib/kde4/kio_nepomuksearch.so
lib/kde4/kio_network.so
lib/kde4/kio_nfs.so
+lib/kde4/kio_recentdocuments.so
lib/kde4/kio_remote.so
lib/kde4/kio_settings.so
${PLIST.smb}lib/kde4/kio_smb.so
+lib/kde4/kio_tags.so
lib/kde4/kio_thumbnail.so
lib/kde4/kio_timeline.so
lib/kde4/kio_trash.so
@@ -177,11 +189,6 @@ lib/kde4/libkmanpart.so
lib/kde4/librenaudioplugin.so
lib/kde4/librenimageplugin.so
lib/kde4/localdomainurifilter.so
-lib/kde4/nepomukbackupsync.so
-lib/kde4/nepomukfileindexer.so
-lib/kde4/nepomukfilewatch.so
-lib/kde4/nepomukqueryservice.so
-lib/kde4/nepomukstorage.so
lib/kde4/plasma-kpart.so
lib/kde4/plasma_appletscript_declarative.so
lib/kde4/plasma_appletscript_simple_javascript.so
@@ -189,43 +196,35 @@ lib/kde4/plasma_containment_newspaper.so
lib/kde4/plasma_dataenginescript_javascript.so
lib/kde4/plasma_packagestructure_javascriptaddon.so
lib/kde4/plasma_runnerscript_javascript.so
-lib/kde4/platformimports/touch/org/kde/plasma/components/AppManager.js
lib/kde4/platformimports/touch/org/kde/plasma/components/BusyIndicator.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Button.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ButtonColumn.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ButtonGroup.js
lib/kde4/platformimports/touch/org/kde/plasma/components/ButtonRow.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/ButtonShadow.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/CheckBox.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/CommonDialog.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Dialog.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/DualStateButton.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/EditBubble.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/EditBubble.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Highlight.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/IconLoader.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Label.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ListItem.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Menu.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/MenuItem.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Page.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/PageStack.js
lib/kde4/platformimports/touch/org/kde/plasma/components/PageStack.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ProgressBar.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/QueryDialog.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/RadioButton.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/RoundShadow.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ScrollBar.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/ScrollBarDelegate.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ScrollDecorator.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/ScrollDecoratorDelegate.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/SectionScroller.js
lib/kde4/platformimports/touch/org/kde/plasma/components/SectionScroller.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/SelectionDialog.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/Sheet.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Slider.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Switch.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/TabBar.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/TabBarLayout.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/TabButton.qml
-lib/kde4/platformimports/touch/org/kde/plasma/components/TabGroup.js
lib/kde4/platformimports/touch/org/kde/plasma/components/TabGroup.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/TextArea.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/TextField.qml
@@ -235,6 +234,19 @@ lib/kde4/platformimports/touch/org/kde/plasma/components/ToolBarLayout.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/ToolButton.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/Window.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/libplasmacomponentsplugin.so
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/AppManager.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/ButtonShadow.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/Config.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/DualStateButton.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/InlineDialog.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/PageStack.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/RoundShadow.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/ScrollBarDelegate.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/ScrollDecoratorDelegate.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/SectionScroller.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/TabBarLayout.qml
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/TabGroup.js
+lib/kde4/platformimports/touch/org/kde/plasma/components/private/TextFieldFocus.qml
lib/kde4/platformimports/touch/org/kde/plasma/components/qmldir
lib/kde4/plugins/phonon_platform/kde.so
lib/kde4/svgthumbnail.so
@@ -246,45 +258,23 @@ lib/libkdeinit4_kglobalaccel.so
lib/libkdeinit4_khelpcenter.so
lib/libkdeinit4_kuiserver.so
lib/libkdeinit4_kwalletd.so
-lib/libkdeinit4_nepomukserver.so
lib/libknotifyplugin.so
lib/libkwalletbackend.so
lib/libkwalletbackend.so.4
-lib/libkwalletbackend.so.4.8.0
+lib/libkwalletbackend.so.${PKGVERSION}
lib/libmolletnetwork.so
lib/libmolletnetwork.so.4
-lib/libmolletnetwork.so.4.8.0
-lib/libnepomukcommon.so
-lib/libnepomukdatamanagement.so
-lib/libnepomukdatamanagement.so.4
-lib/libnepomukdatamanagement.so.4.8.0
-lib/libnepomuksync.so
-lib/libnepomuksync.so.4
-lib/libnepomuksync.so.4.8.0
+lib/libmolletnetwork.so.${PKGVERSION}
man/man1/kdesu.1
+man/man1/plasmapkg.1
man/man8/nepomukserver.8
man/man8/nepomukservicestub.8
share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy
share/applications/kde4/Help.desktop
share/applications/kde4/knetattach.desktop
-share/applications/kde4/nepomukbackup.desktop
share/applications/kde4/nepomukcontroller.desktop
share/dbus-1/interfaces/org.kde.KTimeZoned.xml
-share/dbus-1/interfaces/org.kde.NepomukServer.xml
share/dbus-1/interfaces/org.kde.khelpcenter.kcmhelpcenter.xml
-share/dbus-1/interfaces/org.kde.nepomuk.BackupSync.xml
-share/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml
-share/dbus-1/interfaces/org.kde.nepomuk.FileIndexer.xml
-share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
-share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
-share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
-share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcher.xml
-share/dbus-1/interfaces/org.kde.nepomuk.ResourceWatcherConnection.xml
-share/dbus-1/interfaces/org.kde.nepomuk.ServiceControl.xml
-share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
-share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
-share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.backupmanager.xml
-share/dbus-1/interfaces/org.kde.nepomuk.services.nepomukbackupsync.syncmanager.xml
share/dbus-1/interfaces/org.kde.network.kioslavenotifier.xml
share/dbus-1/services/org.kde.knotify.service
share/dbus-1/services/org.kde.kuiserver.service
@@ -328,6 +318,33 @@ share/desktop-directories/kde-utilities-peripherals.directory
share/desktop-directories/kde-utilities-pim.directory
share/desktop-directories/kde-utilities-xutils.directory
share/desktop-directories/kde-utilities.directory
+share/doc/kde/HTML/en/fundamentals/colors.png
+share/doc/kde/HTML/en/fundamentals/common
+share/doc/kde/HTML/en/fundamentals/config.docbook
+share/doc/kde/HTML/en/fundamentals/files-locationbar-breadcrumb.png
+share/doc/kde/HTML/en/fundamentals/files-locationbar-context-menu.png
+share/doc/kde/HTML/en/fundamentals/files-locationbar-editable.png
+share/doc/kde/HTML/en/fundamentals/files-locationbar-places-icon.png
+share/doc/kde/HTML/en/fundamentals/files-open.png
+share/doc/kde/HTML/en/fundamentals/files-save.png
+share/doc/kde/HTML/en/fundamentals/find-find-inline.png
+share/doc/kde/HTML/en/fundamentals/find-find.png
+share/doc/kde/HTML/en/fundamentals/find-found.png
+share/doc/kde/HTML/en/fundamentals/find-replace-inline.png
+share/doc/kde/HTML/en/fundamentals/find-replace.png
+share/doc/kde/HTML/en/fundamentals/fonts.png
+share/doc/kde/HTML/en/fundamentals/index.cache.bz2
+share/doc/kde/HTML/en/fundamentals/index.docbook
+share/doc/kde/HTML/en/fundamentals/install.docbook
+share/doc/kde/HTML/en/fundamentals/menus.png
+share/doc/kde/HTML/en/fundamentals/shortcuts-schemes.png
+share/doc/kde/HTML/en/fundamentals/shortcuts-search.png
+share/doc/kde/HTML/en/fundamentals/shortcuts-set.png
+share/doc/kde/HTML/en/fundamentals/spellcheck-check.png
+share/doc/kde/HTML/en/fundamentals/tasks.docbook
+share/doc/kde/HTML/en/fundamentals/toolbars-configure.png
+share/doc/kde/HTML/en/fundamentals/toolbars-toolbar.png
+share/doc/kde/HTML/en/fundamentals/ui.docbook
share/doc/kde/HTML/en/kcontrol/attica/common
share/doc/kde/HTML/en/kcontrol/attica/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/attica/index.docbook
@@ -604,6 +621,7 @@ share/kde/apps/desktoptheme/default/icons/notification.svgz
share/kde/apps/desktoptheme/default/icons/preferences.svgz
share/kde/apps/desktoptheme/default/icons/printer.svgz
share/kde/apps/desktoptheme/default/icons/quassel.svgz
+share/kde/apps/desktoptheme/default/icons/slc.svgz
share/kde/apps/desktoptheme/default/icons/wallet.svgz
share/kde/apps/desktoptheme/default/metadata.desktop
share/kde/apps/desktoptheme/default/opaque/dialogs/background.svgz
@@ -612,6 +630,12 @@ share/kde/apps/desktoptheme/default/opaque/dialogs/shutdowndialog.svgz
share/kde/apps/desktoptheme/default/opaque/widgets/extender-background.svgz
share/kde/apps/desktoptheme/default/opaque/widgets/panel-background.svgz
share/kde/apps/desktoptheme/default/opaque/widgets/tooltip.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/configure.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/edit.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/go.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/list.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/media.svgz
+share/kde/apps/desktoptheme/default/toolbar-icons/window.svgz
share/kde/apps/desktoptheme/default/translucent/dialogs/background.svgz
share/kde/apps/desktoptheme/default/translucent/dialogs/krunner.svgz
share/kde/apps/desktoptheme/default/translucent/widgets/extender-background.svgz
@@ -647,6 +671,7 @@ share/kde/apps/desktoptheme/default/widgets/media-delegate.svgz
share/kde/apps/desktoptheme/default/widgets/monitor.svgz
share/kde/apps/desktoptheme/default/widgets/pager.svgz
share/kde/apps/desktoptheme/default/widgets/panel-background.svgz
+share/kde/apps/desktoptheme/default/widgets/picker.svgz
share/kde/apps/desktoptheme/default/widgets/plot-background.svgz
share/kde/apps/desktoptheme/default/widgets/scrollbar.svgz
share/kde/apps/desktoptheme/default/widgets/scrollwidget.svgz
@@ -692,6 +717,7 @@ share/kde/apps/desktoptheme/oxygen/widgets/frame.svgz
share/kde/apps/desktoptheme/oxygen/widgets/glowbar.svgz
share/kde/apps/desktoptheme/oxygen/widgets/line.svgz
share/kde/apps/desktoptheme/oxygen/widgets/lineedit.svgz
+share/kde/apps/desktoptheme/oxygen/widgets/media-delegate.svgz
share/kde/apps/desktoptheme/oxygen/widgets/monitor.svgz
share/kde/apps/desktoptheme/oxygen/widgets/pager.svgz
share/kde/apps/desktoptheme/oxygen/widgets/panel-background.svgz
@@ -713,7 +739,6 @@ share/kde/apps/drkonqi/debuggers/internal/gdbrc
share/kde/apps/drkonqi/debuggers/internal/kdbgwinrc
share/kde/apps/drkonqi/mappings
share/kde/apps/drkonqi/pics/crash.png
-share/kde/apps/fileindexerservice/nepomukfileindexer.notifyrc
share/kde/apps/hardwarenotifications/hardwarenotifications.notifyrc
share/kde/apps/kcm_componentchooser/kcm_browser.desktop
share/kde/apps/kcm_componentchooser/kcm_filemanager.desktop
@@ -724,7 +749,6 @@ share/kde/apps/kcm_phonon/listview-background.png
share/kde/apps/kcmlocale/pics/background.png
share/kde/apps/kconf_update/devicepreference.upd
share/kde/apps/kconf_update/kuriikwsfilter.upd
-share/kde/apps/kconf_update/nepomukstrigiservice-migrate.upd
share/kde/apps/kde/kde.notifyrc
share/kde/apps/kglobalaccel/kglobalaccel.notifyrc
share/kde/apps/khelpcenter/glossary.html.in
@@ -743,6 +767,7 @@ share/kde/apps/khelpcenter/plugins/Manpages/man7.desktop
share/kde/apps/khelpcenter/plugins/Manpages/man8.desktop
share/kde/apps/khelpcenter/plugins/Scrollkeeper/.directory
share/kde/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
+share/kde/apps/khelpcenter/plugins/fundamentals.desktop
share/kde/apps/khelpcenter/plugins/info.desktop
share/kde/apps/khelpcenter/plugins/kcontrolmodules.desktop
share/kde/apps/khelpcenter/plugins/kicmodules.desktop
@@ -771,13 +796,10 @@ share/kde/apps/ksmserver/windowmanagers/metacity.desktop
share/kde/apps/ksmserver/windowmanagers/openbox.desktop
share/kde/apps/kwalletd/kwalletd.notifyrc
share/kde/apps/libphonon/hardwaredatabase
-share/kde/apps/nepomukfilewatch/nepomukfilewatch.notifyrc
-share/kde/apps/nepomukstorage/nepomukstorage.notifyrc
share/kde/apps/phonon/phonon.notifyrc
share/kde/apps/remoteview/network.desktop
${PLIST.smb}share/kde/apps/remoteview/smb-network.desktop
share/kde/autostart/nepomukcontroller.desktop
-share/kde/autostart/nepomukserver.desktop
share/kde/config.kcfg/jpegcreatorsettings.kcfg
share/kde/config.kcfg/khelpcenter.kcfg
share/kde/config/emoticons.knsrc
@@ -817,7 +839,6 @@ share/kde4/services/kcm_attica.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
@@ -830,6 +851,7 @@ share/kde4/services/kded/nepomuksearchmodule.desktop
share/kde4/services/kded/networkstatus.desktop
share/kde4/services/kded/networkwatcher.desktop
share/kde4/services/kded/phononserver.desktop
+share/kde4/services/kded/recentdocumentsnotifier.desktop
share/kde4/services/kded/remotedirnotify.desktop
share/kde4/services/kded/solidautoeject.desktop
share/kde4/services/kded/soliduiserver.desktop
@@ -847,16 +869,7 @@ share/kde4/services/localdomainurifilter.desktop
share/kde4/services/lzma.protocol
share/kde4/services/man.protocol
share/kde4/services/nepomuk.protocol
-share/kde4/services/nepomukactivitiesservice.desktop
-share/kde4/services/nepomukbackupsync.desktop
-share/kde4/services/nepomukfileindexer.desktop
-share/kde4/services/nepomukfilewatch.desktop
-share/kde4/services/nepomukontologyloader.desktop
-share/kde4/services/nepomukqueryservice.desktop
-share/kde4/services/nepomukremovablestorageservice.desktop
share/kde4/services/nepomuksearch.protocol
-share/kde4/services/nepomukstorage.desktop
-share/kde4/services/nepomukstrigiservice.desktop
share/kde4/services/network.protocol
share/kde4/services/nfs.protocol
share/kde4/services/plasma-containment-newspaper.desktop
@@ -867,6 +880,7 @@ share/kde4/services/plasma-scriptengine-applet-simple-javascript.desktop
share/kde4/services/plasma-scriptengine-dataengine-javascript.desktop
share/kde4/services/plasma-scriptengine-runner-javascript.desktop
share/kde4/services/programs.protocol
+share/kde4/services/recentdocuments.protocol
share/kde4/services/remote.protocol
share/kde4/services/renaudiodlg.desktop
share/kde4/services/renimagedlg.desktop
@@ -999,6 +1013,7 @@ share/kde4/services/settings.protocol
${PLIST.smb}share/kde4/services/smb.protocol
share/kde4/services/spellchecking.desktop
share/kde4/services/svgthumbnail.desktop
+share/kde4/services/tags.protocol
share/kde4/services/tar.protocol
share/kde4/services/textthumbnail.desktop
share/kde4/services/thumbnail.protocol
@@ -1009,7 +1024,6 @@ share/kde4/services/windowsimagethumbnail.desktop
share/kde4/services/xz.protocol
share/kde4/services/zip.protocol
share/kde4/servicetypes/knotifynotifymethod.desktop
-share/kde4/servicetypes/nepomukservice.desktop
share/kde4/servicetypes/phononbackend.desktop
share/kde4/servicetypes/plasma-javascriptaddon.desktop
share/kde4/servicetypes/searchprovider.desktop
@@ -1723,12 +1737,6 @@ share/locale/l10n/zm/flag.png
share/locale/l10n/zw/entry.desktop
share/locale/l10n/zw/flag.png
share/mime/packages/network.xml
-share/ontology/kde/kext.ontology
-share/ontology/kde/kext.trig
-share/ontology/kde/kuvo.ontology
-share/ontology/kde/kuvo.trig
-share/ontology/kde/nrio.ontology
-share/ontology/kde/nrio.trig
share/sounds/KDE-Im-Cant-Connect.ogg
share/sounds/KDE-Im-Connection-Lost.ogg
share/sounds/KDE-Im-Contact-In.ogg
diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo
index d0047f036de..6454c3f1748 100644
--- a/x11/kde-runtime4/distinfo
+++ b/x11/kde-runtime4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:38 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:49 markd Exp $
-SHA1 (kde-runtime-4.8.4.tar.xz) = 557fada748de52e5275058c50ec3cf8a652c0001
-RMD160 (kde-runtime-4.8.4.tar.xz) = 258f7d62a763a4df1494f6eecfb8b9f1e3e18f7f
-Size (kde-runtime-4.8.4.tar.xz) = 6060492 bytes
+SHA1 (kde-runtime-4.10.2.tar.xz) = b7f3c3907b8f19dcd975b1724b8ae01c4cae638b
+RMD160 (kde-runtime-4.10.2.tar.xz) = a97a193ece40c6b1c74bc81bcfbeebedf4f69ba1
+Size (kde-runtime-4.10.2.tar.xz) = 7218688 bytes
SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c
SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e
SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4
diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile
index f956fd2f86d..e23214668bb 100644
--- a/x11/kde-workspace4/Makefile
+++ b/x11/kde-workspace4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2013/02/16 11:19:52 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2013/04/03 10:51:49 markd Exp $
DISTNAME= kde-workspace-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 11
CATEGORIES= x11
COMMENT= Base workspace for the KDE 4 integrated X11 desktop
@@ -116,6 +115,7 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/qjson/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/qimageblitz/buildlink3.mk"
.include "../../security/polkit-qt/buildlink3.mk"
@@ -125,11 +125,12 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
.include "../../sysutils/pciutils/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../multimedia/phonon/buildlink3.mk"
.include "../../x11/py-kde4/buildlink3.mk"
.include "../../x11/kactivities/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../misc/kdepimlibs4/buildlink3.mk"
.include "../../x11/libxklavier/buildlink3.mk"
.include "../../x11/libXcomposite/buildlink3.mk"
.include "../../x11/libXdamage/buildlink3.mk"
@@ -137,6 +138,8 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
.include "../../x11/libXres/buildlink3.mk"
.include "../../x11/libXxf86misc/buildlink3.mk"
.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/xcb-util-image/buildlink3.mk"
+.include "../../x11/xcb-util-renderutil/buildlink3.mk"
.include "../../mk/pam.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kde-workspace4/PLIST b/x11/kde-workspace4/PLIST
index 65c79932be8..ef569b87316 100644
--- a/x11/kde-workspace4/PLIST
+++ b/x11/kde-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/06/16 04:45:39 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/03 10:51:50 markd Exp $
bin/genkdmconf
bin/kaccess
bin/kapplymousetheme
@@ -37,10 +37,6 @@ bin/plasma-desktop
bin/plasma-netbook
bin/plasma-overlay
bin/plasma-windowed
-bin/plasmaengineexplorer
-bin/plasmawallpaperviewer
-bin/plasmoidviewer
-bin/remote-widgets-browser
bin/solid-action-desktop-gen
bin/startkde
bin/systemsettings
@@ -51,6 +47,7 @@ include/kdecorationbridge.h
include/kdecorationfactory.h
include/kgreeterplugin.h
include/kscreensaver.h
+include/kscreensaver_export.h
include/kscreensaver_vroot.h
include/ksgrd/SensorAgent.h
include/ksgrd/SensorClient.h
@@ -150,19 +147,30 @@ include/taskmanager/taskmanager.h
include/taskmanager/taskmanager_export.h
lib/cmake/KDE4Workspace/KDE4WorkspaceConfig.cmake
lib/cmake/KDE4Workspace/KDE4WorkspaceConfigVersion.cmake
-lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets-${TARGET}.cmake
lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets.cmake
+lib/kconf_update_bin/force_krunner_lock_shortcut_unreg
lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
+lib/kconf_update_bin/kwin_update_settings_410
+lib/kconf_update_bin/kwin_update_settings_49
lib/kconf_update_bin/kwin_update_tabbox_qml_settings
lib/kconf_update_bin/kwin_update_tabbox_settings
-lib/kconf_update_bin/kwin_update_window_settings
+lib/kconf_update_bin/notifications-to-orgkdenotifications
lib/kconf_update_bin/plasma-add-shortcut-to-menu
lib/kconf_update_bin/plasma-to-plasma-desktop
lib/kde4/classic_mode.so
lib/kde4/devinfo.so
lib/kde4/fontthumbnail.so
lib/kde4/icon_mode.so
+lib/kde4/imports/org/kde/kwin/decoration/ButtonGroup.qml
+lib/kde4/imports/org/kde/kwin/decoration/Decoration.qml
+lib/kde4/imports/org/kde/kwin/decoration/DecorationButton.qml
+lib/kde4/imports/org/kde/kwin/decoration/MenuButton.qml
+lib/kde4/imports/org/kde/kwin/decoration/libdecorationplugin.so
+lib/kde4/imports/org/kde/kwin/decoration/qmldir
+lib/kde4/imports/org/kde/kwin/decorations/plastik/libplastikplugin.so
+lib/kde4/imports/org/kde/kwin/decorations/plastik/qmldir
lib/kde4/ion_bbcukmet.so
lib/kde4/ion_debianweather.so
lib/kde4/ion_envcan.so
@@ -189,6 +197,7 @@ lib/kde4/kcm_keys.so
lib/kde4/kcm_krunner_kill.so
lib/kde4/kcm_ksplashthemes.so
lib/kde4/kcm_kwin4_effect_builtins.so
+lib/kde4/kcm_kwin_scripts.so
lib/kde4/kcm_kwincompositing.so
lib/kde4/kcm_kwindecoration.so
lib/kde4/kcm_kwindesktop.so
@@ -214,12 +223,13 @@ lib/kde4/kcm_standard_actions.so
lib/kde4/kcm_style.so
lib/kde4/kcm_usb.so
lib/kde4/kcm_workspaceoptions.so
-lib/kde4/kcm_xinerama.so
+lib/kde4/kded_appmenu.so
lib/kde4/kded_freespacenotifier.so
lib/kde4/kded_kephal.so
lib/kde4/kded_keyboard.so
lib/kde4/kded_khotkeys.so
${PLIST.utempter}lib/kde4/kded_kwrited.so
+lib/kde4/kded_ktouchpadenabler.so
lib/kde4/kded_powerdevil.so
lib/kde4/kded_randrmonitor.so
lib/kde4/kded_statusnotifierwatcher.so
@@ -251,13 +261,9 @@ lib/kde4/kwin3_aurorae.so
lib/kde4/kwin3_b2.so
lib/kde4/kwin3_laptop.so
lib/kde4/kwin3_oxygen.so
-lib/kde4/kwin3_plastik.so
-lib/kde4/kwin3_tabstrip.so
lib/kde4/kwin4_effect_builtins.so
lib/kde4/kwin_b2_config.so
lib/kde4/kwin_oxygen_config.so
-lib/kde4/kwin_plastik_config.so
-lib/kde4/kwin_tabstrip_config.so
lib/kde4/libexec/backlighthelper
lib/kde4/libexec/fontinst
lib/kde4/libexec/fontinst_helper
@@ -269,16 +275,14 @@ lib/kde4/libexec/kdm_config
lib/kde4/libexec/kdm_greet
lib/kde4/libexec/kfontprint
lib/kde4/libexec/krootimage
-lib/kde4/libexec/kscreenlocker
+lib/kde4/libexec/kscreenlocker_greet
lib/kde4/libexec/ksysguardprocesslist_helper
lib/kde4/libexec/kwin_killer_helper
lib/kde4/libexec/kwin_opengl_test
lib/kde4/libexec/kwin_rules_dialog
-lib/kde4/libexec/test_kcm_xinerama
lib/kde4/plasma-geolocation-ip.so
lib/kde4/plasma_animator_default.so
lib/kde4/plasma_applet_activitybar.so
-lib/kde4/plasma_applet_battery.so
lib/kde4/plasma_applet_calendar.so
lib/kde4/plasma_applet_clock.so
lib/kde4/plasma_applet_currentappcontrol.so
@@ -286,16 +290,14 @@ lib/kde4/plasma_applet_dig_clock.so
lib/kde4/plasma_applet_icon.so
lib/kde4/plasma_applet_keyboard.so
lib/kde4/plasma_applet_launcher.so
-lib/kde4/plasma_applet_lockout.so
-lib/kde4/plasma_applet_notifications.so
lib/kde4/plasma_applet_pager.so
lib/kde4/plasma_applet_panelspacer_internal.so
lib/kde4/plasma_applet_quicklaunch.so
lib/kde4/plasma_applet_searchbox.so
-lib/kde4/plasma_applet_showActivityManager.so
lib/kde4/plasma_applet_simplelauncher.so
lib/kde4/plasma_applet_sm_cpu.so
lib/kde4/plasma_applet_sm_hdd.so
+lib/kde4/plasma_applet_sm_hdd_activity.so
lib/kde4/plasma_applet_sm_hwinfo.so
lib/kde4/plasma_applet_sm_net.so
lib/kde4/plasma_applet_sm_ram.so
@@ -335,6 +337,7 @@ lib/kde4/plasma_engine_hotplug.so
lib/kde4/plasma_engine_keystate.so
lib/kde4/plasma_engine_metadata.so
lib/kde4/plasma_engine_mouse.so
+lib/kde4/plasma_engine_mpris2.so
lib/kde4/plasma_engine_network.so
lib/kde4/plasma_engine_notifications.so
lib/kde4/plasma_engine_nowplaying.so
@@ -373,7 +376,7 @@ lib/kde4/solid_fakenet.so
lib/kde4/solid_wicd.so
lib/libkdecorations.so
lib/libkdecorations.so.4
-lib/libkdecorations.so.4.8.0
+lib/libkdecorations.so.${PKGVERSION}
lib/libkdeinit4_kaccess.so
lib/libkdeinit4_kcminit.so
lib/libkdeinit4_kcminit_startup.so
@@ -389,25 +392,25 @@ lib/libkdeinit4_plasma-netbook.so
lib/libkdeinit4_plasma-windowed.so
lib/libkephal.so
lib/libkephal.so.4
-lib/libkephal.so.4.8.0
+lib/libkephal.so.${PKGVERSION}
lib/libkfontinst.so
lib/libkfontinst.so.4
-lib/libkfontinst.so.4.8.0
+lib/libkfontinst.so.${PKGVERSION}
lib/libkfontinstui.so
lib/libkfontinstui.so.4
-lib/libkfontinstui.so.4.8.0
+lib/libkfontinstui.so.${PKGVERSION}
lib/libkhotkeysprivate.so.4
-lib/libkhotkeysprivate.so.4.8.0
+lib/libkhotkeysprivate.so.${PKGVERSION}
lib/libkickoff.so
lib/libkscreensaver.so
lib/libkscreensaver.so.5
lib/libkscreensaver.so.5.0.0
lib/libksgrd.so
lib/libksgrd.so.4
-lib/libksgrd.so.4.8.0
+lib/libksgrd.so.${PKGVERSION}
lib/libksignalplotter.so
lib/libksignalplotter.so.4
-lib/libksignalplotter.so.4.8.0
+lib/libksignalplotter.so.${PKGVERSION}
lib/libkwineffects.so
lib/libkwineffects.so.1
lib/libkwineffects.so.1.0.0
@@ -415,66 +418,63 @@ lib/libkwinglutils.so
lib/libkwinglutils.so.1
lib/libkwinglutils.so.1.0.0
lib/libkwinnvidiahack.so.4
-lib/libkwinnvidiahack.so.4.8.0
+lib/libkwinnvidiahack.so.${PKGVERSION}
lib/libkworkspace.so
lib/libkworkspace.so.4
-lib/libkworkspace.so.4.8.0
+lib/libkworkspace.so.${PKGVERSION}
lib/liblsofui.so
lib/liblsofui.so.4
-lib/liblsofui.so.4.8.0
+lib/liblsofui.so.${PKGVERSION}
lib/liboxygenstyle.so
lib/liboxygenstyle.so.4
-lib/liboxygenstyle.so.4.8.0
+lib/liboxygenstyle.so.${PKGVERSION}
lib/liboxygenstyleconfig.so
lib/liboxygenstyleconfig.so.4
-lib/liboxygenstyleconfig.so.4.8.0
+lib/liboxygenstyleconfig.so.${PKGVERSION}
lib/libplasma-geolocation-interface.so
lib/libplasma-geolocation-interface.so.4
-lib/libplasma-geolocation-interface.so.4.8.0
+lib/libplasma-geolocation-interface.so.${PKGVERSION}
lib/libplasma_applet-system-monitor.so
lib/libplasma_applet-system-monitor.so.4
-lib/libplasma_applet-system-monitor.so.4.8.0
+lib/libplasma_applet-system-monitor.so.${PKGVERSION}
lib/libplasmaclock.so
lib/libplasmaclock.so.4
-lib/libplasmaclock.so.4.8.0
+lib/libplasmaclock.so.${PKGVERSION}
lib/libplasmagenericshell.so
lib/libplasmagenericshell.so.4
-lib/libplasmagenericshell.so.4.8.0
+lib/libplasmagenericshell.so.${PKGVERSION}
lib/libpowerdevilconfigcommonprivate.so
lib/libpowerdevilconfigcommonprivate.so.4
-lib/libpowerdevilconfigcommonprivate.so.4.8.0
+lib/libpowerdevilconfigcommonprivate.so.${PKGVERSION}
lib/libpowerdevilcore.so
lib/libpowerdevilcore.so.0
lib/libpowerdevilcore.so.0.1.0
lib/libpowerdevilui.so
lib/libpowerdevilui.so.4
-lib/libpowerdevilui.so.4.8.0
+lib/libpowerdevilui.so.${PKGVERSION}
lib/libprocesscore.so
lib/libprocesscore.so.4
-lib/libprocesscore.so.4.8.0
+lib/libprocesscore.so.${PKGVERSION}
lib/libprocessui.so
lib/libprocessui.so.4
-lib/libprocessui.so.4.8.0
+lib/libprocessui.so.${PKGVERSION}
lib/libsolidcontrol.so
lib/libsolidcontrol.so.4
-lib/libsolidcontrol.so.4.8.0
+lib/libsolidcontrol.so.${PKGVERSION}
lib/libsolidcontrolifaces.so
lib/libsolidcontrolifaces.so.4
-lib/libsolidcontrolifaces.so.4.8.0
+lib/libsolidcontrolifaces.so.${PKGVERSION}
lib/libsystemsettingsview.so
lib/libsystemsettingsview.so.2
lib/libtaskmanager.so
lib/libtaskmanager.so.4
-lib/libtaskmanager.so.4.8.0
+lib/libtaskmanager.so.${PKGVERSION}
lib/libweather_ion.so
lib/libweather_ion.so.6
lib/libweather_ion.so.6.0.0
${PYSITELIB}/PyKDE4/plasmascript.py
${PYSITELIB}/PyKDE4/plasmascript.pyc
lib/strigi/strigita_font.so
-man/man1/plasmaengineexplorer.1
-man/man1/plasmapkg.1
-man/man1/plasmoidviewer.1
share/PolicyKit/policy/org.kde.fontinst.policy
share/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy
share/PolicyKit/policy/org.kde.kcontrol.kcmkdm.policy
@@ -488,12 +488,12 @@ share/applications/kde4/kmenuedit.desktop
share/applications/kde4/krandrtray.desktop
share/applications/kde4/ksysguard.desktop
share/applications/kde4/systemsettings.desktop
-share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml
+share/dbus-1/interfaces/com.canonical.AppMenu.Registrar.xml
share/dbus-1/interfaces/org.kde.KSMServerInterface.xml
share/dbus-1/interfaces/org.kde.KWin.xml
+share/dbus-1/interfaces/org.kde.kded.appmenu.xml
share/dbus-1/interfaces/org.kde.khotkeys.xml
share/dbus-1/interfaces/org.kde.krunner.App.xml
-share/dbus-1/interfaces/org.kde.screensaver.xml
share/dbus-1/services/org.kde.fontinst.service
share/dbus-1/services/org.kde.krunner.service
share/dbus-1/system-services/org.kde.fontinst.service
@@ -558,6 +558,7 @@ share/doc/kde/HTML/en/kcontrol/khotkeys/groups-comment.png
share/doc/kde/HTML/en/kcontrol/khotkeys/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/khotkeys/index.docbook
share/doc/kde/HTML/en/kcontrol/khotkeys/manage-export.png
+share/doc/kde/HTML/en/kcontrol/khotkeys/oxygen-22x22-edit-clear-locationbar-rtl.png
share/doc/kde/HTML/en/kcontrol/khotkeys/settings.png
share/doc/kde/HTML/en/kcontrol/khotkeys/shortcuts-action-command.png
share/doc/kde/HTML/en/kcontrol/khotkeys/shortcuts-action-keyboard.png
@@ -581,11 +582,6 @@ share/doc/kde/HTML/en/kcontrol/kwintabbox/index.docbook
share/doc/kde/HTML/en/kcontrol/mouse/common
share/doc/kde/HTML/en/kcontrol/mouse/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/mouse/index.docbook
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/common
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/index.docbook
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/multiplemonitors-error.png
-share/doc/kde/HTML/en/kcontrol/multiplemonitors/multiplemonitors.png
share/doc/kde/HTML/en/kcontrol/paths/common
share/doc/kde/HTML/en/kcontrol/paths/index.cache.bz2
share/doc/kde/HTML/en/kcontrol/paths/index.docbook
@@ -712,7 +708,7 @@ share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf
share/examples/kde4-dbus/org.kde.powerdevil.backlighthelper.conf
share/examples/rc.d/kdm
share/icons/Daemon.png
-share/icons/NetBSD-flag.png
+share/icons/${OPSYS}-flag.png
share/icons/Oxygen_Black/cursors/00000000000000020006000e7e9ffc3f
share/icons/Oxygen_Black/cursors/00008160000006810000408080010102
share/icons/Oxygen_Black/cursors/03b6e0fcb3499374a867c041f52298f0
@@ -1181,40 +1177,24 @@ share/kde/apps/kcmkeys/win3.kksrc
share/kde/apps/kcmkeys/win4.kksrc
share/kde/apps/kcmkeys/wm3.kksrc
share/kde/apps/kcmsolidactions/solid-action-template.desktop
+share/kde/apps/kcmstyle/kcmstyle.notifyrc
share/kde/apps/kcmusb/usb.ids
-share/kde/apps/kconf_update/convertShortcuts.pl
-share/kde/apps/kconf_update/kaccel.upd
-share/kde/apps/kconf_update/kcmdisplayrc.upd
share/kde/apps/kconf_update/klipper-kconfigxt.upd
share/kde/apps/kconf_update/krdb_libpathwipe.upd
-share/kde/apps/kconf_update/ksmserver.upd
+share/kde/apps/kconf_update/kscreenlocker_locksession-shortcut.upd
share/kde/apps/kconf_update/ksmserver_shortcuts.upd
-share/kde/apps/kconf_update/kwin.upd
-share/kde/apps/kconf_update/kwin3_plugin.pl
-share/kde/apps/kconf_update/kwin3_plugin.upd
-share/kde/apps/kconf_update/kwin_focus1.sh
-share/kde/apps/kconf_update/kwin_focus1.upd
-share/kde/apps/kconf_update/kwin_focus2.sh
-share/kde/apps/kconf_update/kwin_focus2.upd
share/kde/apps/kconf_update/kwin_fsp_workarounds_1.upd
-share/kde/apps/kconf_update/kwin_on_off.upd
share/kde/apps/kconf_update/kwin_remove_delay_focus.sh
share/kde/apps/kconf_update/kwin_remove_delay_focus.upd
share/kde/apps/kconf_update/kwin_remove_effects.upd
+share/kde/apps/kconf_update/kwin_update_410.upd
+share/kde/apps/kconf_update/kwin_update_49.upd
share/kde/apps/kconf_update/kwin_update_tabbox_qml_settings.upd
share/kde/apps/kconf_update/kwin_update_tabbox_settings.upd
-share/kde/apps/kconf_update/kwin_window_shortcuts.sh
-share/kde/apps/kconf_update/kwin_window_shortcuts.upd
-share/kde/apps/kconf_update/kwiniconify.upd
-share/kde/apps/kconf_update/kwinsticky.upd
-share/kde/apps/kconf_update/kwinupdatewindowsettings.upd
-share/kde/apps/kconf_update/mouse_cursor_theme.upd
-share/kde/apps/kconf_update/move_session_config.sh
-share/kde/apps/kconf_update/on-off_to_true-false.sh
+share/kde/apps/kconf_update/notifications-to-orgkdenotifications.upd
share/kde/apps/kconf_update/plasma-add-shortcut-to-menu.upd
share/kde/apps/kconf_update/plasma-to-plasmadesktop-shortcuts.upd
share/kde/apps/kconf_update/plasmarc-to-plasmadesktoprc.upd
-share/kde/apps/kconf_update/pluginlibFix.pl
share/kde/apps/kcontrol/pics/anchor.png
share/kde/apps/kcontrol/pics/logo.png
share/kde/apps/kcontrol/pics/mini-world.png
@@ -1333,6 +1313,20 @@ share/kde/apps/kdm/themes/circles/flower.png
share/kde/apps/kdm/themes/circles/help.png
share/kde/apps/kdm/themes/circles/options.png
share/kde/apps/kdm/themes/circles/screenshot.png
+share/kde/apps/kdm/themes/elarun/KdmGreeterTheme.desktop
+share/kde/apps/kdm/themes/elarun/elarun.xml
+share/kde/apps/kdm/themes/elarun/lineedit_active.png
+share/kde/apps/kdm/themes/elarun/lineedit_normal.png
+share/kde/apps/kdm/themes/elarun/lock.png
+share/kde/apps/kdm/themes/elarun/login_active.png
+share/kde/apps/kdm/themes/elarun/login_normal.png
+share/kde/apps/kdm/themes/elarun/pw_icon.png
+share/kde/apps/kdm/themes/elarun/rectangle.png
+share/kde/apps/kdm/themes/elarun/rectangle_overlay.png
+share/kde/apps/kdm/themes/elarun/screenshot.png
+share/kde/apps/kdm/themes/elarun/session_normal.png
+share/kde/apps/kdm/themes/elarun/system_normal.png
+share/kde/apps/kdm/themes/elarun/user_icon.png
share/kde/apps/kdm/themes/horos/KdmGreeterTheme.desktop
share/kde/apps/kdm/themes/horos/horos.xml
share/kde/apps/kdm/themes/horos/lineedit_active.png
@@ -1387,34 +1381,29 @@ share/kde/apps/khotkeys/kde32b1.khotkeys
share/kde/apps/khotkeys/konqueror_gestures_kde321.khotkeys
share/kde/apps/khotkeys/printscreen.khotkeys
share/kde/apps/kinfocenter/kinfocenterui.rc
-share/kde/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new.png
-share/kde/apps/kmenuedit/icons/oxygen/22x22/actions/menu_new_sep.png
-share/kde/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new.png
-share/kde/apps/kmenuedit/icons/oxygen/32x32/actions/menu_new_sep.png
+share/kde/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new.png
+share/kde/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new_sep.png
+share/kde/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new.png
+share/kde/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new_sep.png
share/kde/apps/kmenuedit/kmenueditui.rc
share/kde/apps/konqsidebartng/virtual_folders/services/fonts.desktop
-share/kde/apps/kscreenlocker/kscreenlocker.notifyrc
-share/kde/apps/ksplash/Themes/Default/1024x768/background.png
-share/kde/apps/ksplash/Themes/Default/1280x1024/background.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/background.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/description.txt
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon1.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon1_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon2.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon2_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon3.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon3_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon4.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon4_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon5.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/icon5_anim.png
-share/kde/apps/ksplash/Themes/Default/1600x1200/rectangle.png
-share/kde/apps/ksplash/Themes/Default/1920x1080/background.png
-share/kde/apps/ksplash/Themes/Default/1920x1200/background.png
-share/kde/apps/ksplash/Themes/Default/600x400/background.png
-share/kde/apps/ksplash/Themes/Default/800x600/background.png
-share/kde/apps/ksplash/Themes/Default/Preview.png
-share/kde/apps/ksplash/Themes/Default/Theme.rc
+share/kde/apps/ksmserver/ksmserver.notifyrc
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/AccelButton.qml
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/Greeter.qml
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/SessionSwitching.qml
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui/main.qml
+share/kde/apps/ksmserver/screenlocker/org.kde.passworddialog/metadata.desktop
+share/kde/apps/ksmserver/themes/contour/ContourButton.qml
+share/kde/apps/ksmserver/themes/contour/main.qml
+share/kde/apps/ksmserver/themes/contour/metadata.desktop
+share/kde/apps/ksmserver/themes/contour/screenshot.png
+share/kde/apps/ksmserver/themes/default/ContextMenu.qml
+share/kde/apps/ksmserver/themes/default/KSMButton.qml
+share/kde/apps/ksmserver/themes/default/MenuItem.qml
+share/kde/apps/ksmserver/themes/default/helper.js
+share/kde/apps/ksmserver/themes/default/main.qml
+share/kde/apps/ksmserver/themes/default/metadata.desktop
+share/kde/apps/ksmserver/themes/default/screenshot.png
share/kde/apps/ksplash/Themes/Minimalistic/Preview.png
share/kde/apps/ksplash/Themes/Minimalistic/Theme.rc
share/kde/apps/ksplash/Themes/Minimalistic/images/kdegear.png
@@ -1470,8 +1459,14 @@ share/kde/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.pn
share/kde/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
-share/kde/apps/kwin/DefaultTabBoxLayouts.xml
share/kde/apps/kwin/aurorae.desktop
+share/kde/apps/kwin/aurorae/AuroraeButton.qml
+share/kde/apps/kwin/aurorae/AuroraeButtonGroup.qml
+share/kde/apps/kwin/aurorae/AuroraeMaximizeButton.qml
+share/kde/apps/kwin/aurorae/Decoration.qml
+share/kde/apps/kwin/aurorae/DecorationButton.qml
+share/kde/apps/kwin/aurorae/MenuButton.qml
+share/kde/apps/kwin/aurorae/aurorae.qml
share/kde/apps/kwin/b2.desktop
share/kde/apps/kwin/blinking-startup-fragment.glsl
share/kde/apps/kwin/coverswitch-reflection.glsl
@@ -1480,12 +1475,28 @@ share/kde/apps/kwin/cube-reflection.glsl
share/kde/apps/kwin/cubecap.png
share/kde/apps/kwin/cylinder.frag
share/kde/apps/kwin/cylinder.vert
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/config/main.xml
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/PlastikButton.qml
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/config.ui
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui/main.qml
+share/kde/apps/kwin/decorations/kwin4_decoration_qml_plastik/metadata.desktop
share/kde/apps/kwin/default_rules/fsp_workarounds_1.kwinrules
share/kde/apps/kwin/default_rules/plasma_desktop_containment.kwinrules
+share/kde/apps/kwin/effects/kwin4_effect_fade/contents/code/main.js
+share/kde/apps/kwin/effects/kwin4_effect_fade/contents/config/main.xml
+share/kde/apps/kwin/effects/kwin4_effect_fade/metadata.desktop
+share/kde/apps/kwin/effects/kwin4_effect_fadedesktop/contents/code/main.js
+share/kde/apps/kwin/effects/kwin4_effect_fadedesktop/metadata.desktop
+share/kde/apps/kwin/effects/kwin4_effect_maximize/contents/code/maximize.js
+share/kde/apps/kwin/effects/kwin4_effect_maximize/metadata.desktop
share/kde/apps/kwin/explosion-end.png
share/kde/apps/kwin/explosion-start.png
share/kde/apps/kwin/explosion.frag
share/kde/apps/kwin/invert.frag
+share/kde/apps/kwin/kcm_kwindecoration/AuroraeDecoration.qml
+share/kde/apps/kwin/kcm_kwindecoration/AuroraePreview.qml
+share/kde/apps/kwin/kcm_kwindecoration/DecorationPreview.qml
+share/kde/apps/kwin/kcm_kwindecoration/main.qml
share/kde/apps/kwin/kcm_kwintabbox/dolphin.png
share/kde/apps/kwin/kcm_kwintabbox/kmail.png
share/kde/apps/kwin/kcm_kwintabbox/konqueror.png
@@ -1493,24 +1504,53 @@ share/kde/apps/kwin/kcm_kwintabbox/main.qml
share/kde/apps/kwin/kcm_kwintabbox/systemsettings.png
share/kde/apps/kwin/kwin.notifyrc
share/kde/apps/kwin/laptop.desktop
+share/kde/apps/kwin/logout-blur.frag
share/kde/apps/kwin/lookingglass.frag
share/kde/apps/kwin/oxygenclient.desktop
-share/kde/apps/kwin/plastik.desktop
+share/kde/apps/kwin/scripts/desktopchangeosd/contents/ui/main.qml
+share/kde/apps/kwin/scripts/desktopchangeosd/metadata.desktop
+share/kde/apps/kwin/scripts/synchronizeskipswitcher/contents/code/main.js
+share/kde/apps/kwin/scripts/synchronizeskipswitcher/metadata.desktop
+share/kde/apps/kwin/scripts/videowall/contents/code/main.js
+share/kde/apps/kwin/scripts/videowall/metadata.desktop
share/kde/apps/kwin/sphere.vert
-share/kde/apps/kwin/tabbox/IconTabBox.qml
-share/kde/apps/kwin/tabbox/big_icons.qml
-share/kde/apps/kwin/tabbox/compact.qml
-share/kde/apps/kwin/tabbox/informative.qml
-share/kde/apps/kwin/tabbox/small_icons.qml
+share/kde/apps/kwin/stripTitle.js
+share/kde/apps/kwin/tabbox/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/big_icons/contents/ui/IconTabBox.qml
+share/kde/apps/kwin/tabbox/big_icons/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/big_icons/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/big_icons/metadata.desktop
+share/kde/apps/kwin/tabbox/compact/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/compact/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/compact/metadata.desktop
+share/kde/apps/kwin/tabbox/desktop.qml
+share/kde/apps/kwin/tabbox/informative/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/informative/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/informative/metadata.desktop
+share/kde/apps/kwin/tabbox/present_windows/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/present_windows/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/present_windows/metadata.desktop
+share/kde/apps/kwin/tabbox/small_icons/contents/ui/IconTabBox.qml
+share/kde/apps/kwin/tabbox/small_icons/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/small_icons/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/small_icons/metadata.desktop
share/kde/apps/kwin/tabbox/tabbox.qml
-share/kde/apps/kwin/tabbox/text.qml
-share/kde/apps/kwin/tabbox/thumbnails.qml
-share/kde/apps/kwin/tabstrip.desktop
-share/kde/apps/kwin/trackmouse.png
+share/kde/apps/kwin/tabbox/text/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/text/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/text/metadata.desktop
+share/kde/apps/kwin/tabbox/thumbnails/contents/ui/ShadowedSvgItem.qml
+share/kde/apps/kwin/tabbox/thumbnails/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/thumbnails/metadata.desktop
+share/kde/apps/kwin/tabbox/window_strip/contents/ui/main.qml
+share/kde/apps/kwin/tabbox/window_strip/metadata.desktop
+share/kde/apps/kwin/tm_inner.png
+share/kde/apps/kwin/tm_outer.png
+share/kde/apps/kwin/vignetting.frag
share/kde/apps/kwrited/kwrited.notifyrc
share/kde/apps/plasma-desktop/init/00-defaultLayout.js
share/kde/apps/plasma-desktop/plasma-desktop.notifyrc
share/kde/apps/plasma-desktop/updates/addShowActivitiesManagerPlasmoid.js
+share/kde/apps/plasma-desktop/updates/set-hidden-single-vd-pager.js
share/kde/apps/plasma-desktop/updates/systray-to-notifications-widget.js
share/kde/apps/plasma-netbook/init/00-defaultLayout.js
share/kde/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
@@ -1536,6 +1576,40 @@ share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/conte
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/metadata.desktop
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents/layout.js
share/kde/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/.directory
+share/kde/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/ActivityDelegate.qml
+share/kde/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.desktop.activitymanager/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/Messages.sh
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/AppletDelegate.qml
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/Tooltip.qml
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.desktop.widgetexplorer/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.pager/contents/ui/main.qml
+share/kde/apps/plasma/packages/org.kde.pager/contents/ui/utils.js
+share/kde/apps/plasma/packages/org.kde.pager/metadata.desktop
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/code/IconsList.js
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/code/TasksSet.js
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/code/main.js
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/ArrowArea.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/IconsGrid.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/IconsList.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/StatusNotifierItem.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/TrayIcon.qml
+share/kde/apps/plasma/packages/org.kde.systemtray/contents/ui/main.qml
+share/kde/apps/plasma/plasmoids/battery/contents/code/logic.js
+share/kde/apps/plasma/plasmoids/battery/contents/code/platform.js
+share/kde/apps/plasma/plasmoids/battery/contents/config/main.xml
+share/kde/apps/plasma/plasmoids/battery/contents/ui/BatteryIcon.qml
+share/kde/apps/plasma/plasmoids/battery/contents/ui/PopupDialog.qml
+share/kde/apps/plasma/plasmoids/battery/contents/ui/batterymonitor.qml
+share/kde/apps/plasma/plasmoids/battery/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/battery/metadata.desktop
+share/kde/apps/plasma/plasmoids/lockout/contents/config/main.xml
+share/kde/apps/plasma/plasmoids/lockout/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/lockout/contents/ui/data.js
+share/kde/apps/plasma/plasmoids/lockout/contents/ui/lockout.qml
+share/kde/apps/plasma/plasmoids/lockout/metadata.desktop
share/kde/apps/plasma/plasmoids/notifier/contents/config/main.xml
share/kde/apps/plasma/plasmoids/notifier/contents/ui/ActionItem.qml
share/kde/apps/plasma/plasmoids/notifier/contents/ui/DeviceItem.qml
@@ -1543,11 +1617,30 @@ share/kde/apps/plasma/plasmoids/notifier/contents/ui/StatusBar.qml
share/kde/apps/plasma/plasmoids/notifier/contents/ui/config.ui
share/kde/apps/plasma/plasmoids/notifier/contents/ui/devicenotifier.qml
share/kde/apps/plasma/plasmoids/notifier/metadata.desktop
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/config/main.xml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/JobDelegate.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Jobs.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/LastNotificationPopup.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationDelegate/NotificationDelegate.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationDelegate/qmldir
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationIcon.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Notifications.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/Title.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/config.ui
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/main.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/contents/ui/uiproperties.js
+share/kde/apps/plasma/plasmoids/org.kde.notifications/metadata.desktop
+share/kde/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/NotificationDelegate/NotificationDelegate.qml
+share/kde/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/NotificationDelegate/qmldir
+share/kde/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/uiproperties.js
+share/kde/apps/plasma/plasmoids/org.kde.showActivityManager/contents/ui/main.qml
+share/kde/apps/plasma/plasmoids/org.kde.showActivityManager/metadata.desktop
share/kde/apps/plasma/services/activities.operations
share/kde/apps/plasma/services/applicationjobs.operations
share/kde/apps/plasma/services/apps.operations
share/kde/apps/plasma/services/hotplug.operations
share/kde/apps/plasma/services/modifierkeystate.operations
+share/kde/apps/plasma/services/mpris2.operations
share/kde/apps/plasma/services/notifications.operations
share/kde/apps/plasma/services/nowplaying.operations
share/kde/apps/plasma/services/org.kde.places.operations
@@ -1621,7 +1714,6 @@ share/kde/autostart/plasma-desktop.desktop
share/kde/autostart/plasma.desktop
share/kde/config.kcfg/freespacenotifier.kcfg
share/kde/config.kcfg/klaunch.kcfg
-share/kde/config.kcfg/kscreensaversettings.kcfg
share/kde/config.kcfg/kwin.kcfg
share/kde/config.kcfg/plasma-shell-desktop.kcfg
share/kde/config/activities.knsrc
@@ -1641,6 +1733,9 @@ share/kde/config/kdm/kdmrc
share/kde/config/kfontinst.knsrc
share/kde/config/ksplash.knsrc
share/kde/config/ksysguard.knsrc
+share/kde/config/kwineffect.knsrc
+share/kde/config/kwinscripts.knsrc
+share/kde/config/kwinswitcher.knsrc
share/kde/config/plasma-overlayrc
share/kde/config/plasma-themes.knsrc
share/kde/config/wallpaper.knsrc
@@ -1684,11 +1779,13 @@ share/kde4/services/kcmaccess.desktop
share/kde4/services/kcmlaunch.desktop
share/kde4/services/kcmsmserver.desktop
share/kde4/services/kcmusb.desktop
+share/kde4/services/kded/appmenu.desktop
share/kde4/services/kded/freespacenotifier.desktop
share/kde4/services/kded/kephal.desktop
share/kde4/services/kded/keyboard.desktop
share/kde4/services/kded/khotkeys.desktop
${PLIST.utempter}share/kde4/services/kded/kwrited.desktop
+share/kde4/services/kded/ktouchpadenabler.desktop
share/kde4/services/kded/powerdevil.desktop
share/kde4/services/kded/randrmonitor.desktop
share/kde4/services/kded/statusnotifierwatcher.desktop
@@ -1697,6 +1794,9 @@ share/kde4/services/keys.desktop
share/kde4/services/kfontviewpart.desktop
share/kde4/services/khotkeys.desktop
share/kde4/services/ksplashthememgr.desktop
+share/kde4/services/kwin-script-desktopchangeosd.desktop
+share/kde4/services/kwin-script-synchronizeskipswitcher.desktop
+share/kde4/services/kwin-script-videowall.desktop
share/kde4/services/kwin/blur.desktop
share/kde4/services/kwin/blur_config.desktop
share/kde4/services/kwin/boxswitch.desktop
@@ -1716,8 +1816,6 @@ share/kde4/services/kwin/diminactive.desktop
share/kde4/services/kwin/diminactive_config.desktop
share/kde4/services/kwin/dimscreen.desktop
share/kde4/services/kwin/explosion.desktop
-share/kde4/services/kwin/fade.desktop
-share/kde4/services/kwin/fadedesktop.desktop
share/kde4/services/kwin/fallapart.desktop
share/kde4/services/kwin/flipswitch.desktop
share/kde4/services/kwin/flipswitch_config.desktop
@@ -1726,6 +1824,18 @@ share/kde4/services/kwin/glide_config.desktop
share/kde4/services/kwin/highlightwindow.desktop
share/kde4/services/kwin/invert.desktop
share/kde4/services/kwin/invert_config.desktop
+share/kde4/services/kwin/kwin4_decoration_qml_plastik.desktop
+share/kde4/services/kwin/kwin4_effect_fade.desktop
+share/kde4/services/kwin/kwin4_effect_fadedesktop.desktop
+share/kde4/services/kwin/kwin4_effect_maximize.desktop
+share/kde4/services/kwin/kwin4_window_switcher_big_icons.desktop
+share/kde4/services/kwin/kwin4_window_switcher_compact.desktop
+share/kde4/services/kwin/kwin4_window_switcher_informative.desktop
+share/kde4/services/kwin/kwin4_window_switcher_present_windows.desktop
+share/kde4/services/kwin/kwin4_window_switcher_small_icons.desktop
+share/kde4/services/kwin/kwin4_window_switcher_text.desktop
+share/kde4/services/kwin/kwin4_window_switcher_thumbnails.desktop
+share/kde4/services/kwin/kwin4_window_switcher_window_strip.desktop
share/kde4/services/kwin/login.desktop
share/kde4/services/kwin/login_config.desktop
share/kde4/services/kwin/logout.desktop
@@ -1736,6 +1846,8 @@ share/kde4/services/kwin/magiclamp_config.desktop
share/kde4/services/kwin/magnifier.desktop
share/kde4/services/kwin/magnifier_config.desktop
share/kde4/services/kwin/minimizeanimation.desktop
+share/kde4/services/kwin/mouseclick.desktop
+share/kde4/services/kwin/mouseclick_config.desktop
share/kde4/services/kwin/mousemark.desktop
share/kde4/services/kwin/mousemark_config.desktop
share/kde4/services/kwin/outline.desktop
@@ -1776,6 +1888,7 @@ share/kde4/services/kwinmoving.desktop
share/kde4/services/kwinoptions.desktop
share/kde4/services/kwinrules.desktop
share/kde4/services/kwinscreenedges.desktop
+share/kde4/services/kwinscripts.desktop
share/kde4/services/kwintabbox.desktop
share/kde4/services/lostfoundcategory.desktop
share/kde4/services/mouse.desktop
@@ -1785,6 +1898,7 @@ share/kde4/services/opengl.desktop
share/kde4/services/plasma-animator-default.desktop
share/kde4/services/plasma-applet-activitybar.desktop
share/kde4/services/plasma-applet-analogclock.desktop
+share/kde4/services/plasma-applet-batterymonitor.desktop
share/kde4/services/plasma-applet-calendar.desktop
share/kde4/services/plasma-applet-currentappcontrol.desktop
share/kde4/services/plasma-applet-devicenotifier.desktop
@@ -1792,7 +1906,7 @@ share/kde4/services/plasma-applet-digitalclock.desktop
share/kde4/services/plasma-applet-icon.desktop
share/kde4/services/plasma-applet-launcher.desktop
share/kde4/services/plasma-applet-lockout.desktop
-share/kde4/services/plasma-applet-notifications.desktop
+share/kde4/services/plasma-applet-org.kde.notifications.desktop
share/kde4/services/plasma-applet-org.kde.showActivityManager.desktop
share/kde4/services/plasma-applet-panelspacer-internal.desktop
share/kde4/services/plasma-applet-quicklaunch.desktop
@@ -1800,6 +1914,7 @@ share/kde4/services/plasma-applet-searchbox.desktop
share/kde4/services/plasma-applet-simplelauncher.desktop
share/kde4/services/plasma-applet-sm_cpu.desktop
share/kde4/services/plasma-applet-sm_hdd.desktop
+share/kde4/services/plasma-applet-sm_hdd_activity.desktop
share/kde4/services/plasma-applet-sm_hwinfo.desktop
share/kde4/services/plasma-applet-sm_net.desktop
share/kde4/services/plasma-applet-sm_ram.desktop
@@ -1809,7 +1924,6 @@ share/kde4/services/plasma-applet-systemtray.desktop
share/kde4/services/plasma-applet-trash.desktop
share/kde4/services/plasma-applet-webbrowser.desktop
share/kde4/services/plasma-applet-windowlist.desktop
-share/kde4/services/plasma-battery-default.desktop
share/kde4/services/plasma-containment-desktop.desktop
share/kde4/services/plasma-containment-desktopdashboard.desktop
share/kde4/services/plasma-containment-netpanel.desktop
@@ -1835,6 +1949,7 @@ share/kde4/services/plasma-dataengine-geolocation.desktop
share/kde4/services/plasma-dataengine-hotplug.desktop
share/kde4/services/plasma-dataengine-keystate.desktop
share/kde4/services/plasma-dataengine-mouse.desktop
+share/kde4/services/plasma-dataengine-mpris2.desktop
share/kde4/services/plasma-dataengine-network.desktop
share/kde4/services/plasma-dataengine-notifications.desktop
share/kde4/services/plasma-dataengine-nowplaying.desktop
@@ -1966,10 +2081,12 @@ share/kde4/services/solidbackends/solid_wicd.desktop
share/kde4/services/standard_actions.desktop
share/kde4/services/style.desktop
share/kde4/services/workspaceoptions.desktop
-share/kde4/services/xinerama.desktop
share/kde4/services/xserver.desktop
share/kde4/servicetypes/kinfocentercategory.desktop
+share/kde4/servicetypes/kwindecoration.desktop
share/kde4/servicetypes/kwineffect.desktop
+share/kde4/servicetypes/kwinscript.desktop
+share/kde4/servicetypes/kwinwindowswitcher.desktop
share/kde4/servicetypes/plasma-geolocationprovider.desktop
share/kde4/servicetypes/plasma-layout-template.desktop
share/kde4/servicetypes/plasma-sal-menu.desktop
@@ -1979,6 +2096,7 @@ share/kde4/servicetypes/screensaver.desktop
share/kde4/servicetypes/solid-device-type.desktop
share/kde4/servicetypes/solidmodemmanager.desktop
share/kde4/servicetypes/solidnetworkmanager.desktop
+share/kde4/servicetypes/solidremotecontrolmanager.desktop
share/kde4/servicetypes/systemsettingscategory.desktop
share/kde4/servicetypes/systemsettingsexternalapp.desktop
share/kde4/servicetypes/systemsettingsview.desktop
diff --git a/x11/kde-workspace4/distinfo b/x11/kde-workspace4/distinfo
index f3b3706a95a..cbae502663f 100644
--- a/x11/kde-workspace4/distinfo
+++ b/x11/kde-workspace4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2013/01/17 16:05:53 joerg Exp $
+$NetBSD: distinfo,v 1.6 2013/04/03 10:51:50 markd Exp $
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -9,16 +9,16 @@ Size (Daemon.png) = 15725 bytes
SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
Size (NetBSD-flag-1.0.png) = 4532 bytes
-SHA1 (kde-workspace-4.8.4.tar.xz) = a732ceacf34dfb79c8ab243f17cd5a70b9183212
-RMD160 (kde-workspace-4.8.4.tar.xz) = 3d7e1bf7dfd094dea8129681ac311db137b32710
-Size (kde-workspace-4.8.4.tar.xz) = 35841792 bytes
+SHA1 (kde-workspace-4.10.2.tar.xz) = 12b10e8bea44f3aafa0c8d776eadfee14d71c3f8
+RMD160 (kde-workspace-4.10.2.tar.xz) = 1584cee3c208fbbe6e56d25e75e5cd2c51e9bba2
+Size (kde-workspace-4.10.2.tar.xz) = 13564908 bytes
SHA1 (patch-kcontrol_keyboard_xkb_rules.cpp) = e4569e0671c55e990cbc0913e5abaead046a8e71
SHA1 (patch-kdm_config.def) = ac0907cc59c5f0976cdbe152bb7fb0a4592bbe84
SHA1 (patch-kdm_kcm_main.cpp) = bb692c83fa189342105744cc9c3c180b970571b7
SHA1 (patch-kdm_kfrontend_CMakeLists.txt) = 0b0c541c7305d31e01a45f0a6a7f5ddb2d2e57fe
SHA1 (patch-kdm_kfrontend_genkdmconf.c) = 12986752a1062199833df5aeba8163277ddb7361
SHA1 (patch-ksysguard_example_CMakeLists.txt) = bd10f03a308442b8febe8864010987fb504b2d21
-SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 42970c40f8e0e18f36570b504f708c7c100e96b8
+SHA1 (patch-ksysguard_ksysguard_FreeBSD_ProcessList.c) = 716f1e75fb23f7d6ddf31092e9a60961f078845c
SHA1 (patch-ksysguard_ksysguard_FreeBSD_cpuinfo.c) = e827d09a853b479294a7771b47534d4ba71ef7cb
SHA1 (patch-ksysguard_ksysguard_FreeBSD_uptime.c) = 96169c0c846c7337b65986dc1ce0b1c1b386ff30
SHA1 (patch-ksysguard_ksysguardd_NetBSD_CPU.c) = 05312793f0c66cacf1bb61c081a8b15e6e7a2619
@@ -31,6 +31,6 @@ SHA1 (patch-libs_ksysguard_processcore_CMakeLists.txt) = 61b886388aa5d0831581eac
SHA1 (patch-libs_ksysguard_processcore_processes.cpp) = 8bfcc8b7e91eafd6b444f4103d3860fb6434a535
SHA1 (patch-libs_ksysguard_processcore_processes__netbsd__p.cpp) = 9fa5c51c28537c4b242847d3d54c893d28ddcaf4
SHA1 (patch-mkpamserv) = 736fc439a34298f51c9fb09200b9dc8628eabc43
-SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = 75f8a7baf99151232e4f29c71da51be61efc6c4a
+SHA1 (patch-plasma_generic_applets_digital-clock_clock.cpp) = dd052f6c36fbd62dd5fecc0bcf162f22e500463c
SHA1 (patch-plasma_generic_dataengines_rss_CMakeLists.txt) = 6a12cb3cb54a8b1899f29e7f50a1171862dce66e
-SHA1 (patch-startkde.cmake) = 415b06854b02d8dd0e2807d9c02a5cc754b59540
+SHA1 (patch-startkde.cmake) = bf651bde0a44520124453aa2f60fa956f237a6cf
diff --git a/x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c b/x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c
index 0e30feec30f..9e22cdbf6e3 100644
--- a/x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c
+++ b/x11/kde-workspace4/patches/patch-ksysguard_ksysguard_FreeBSD_ProcessList.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-ksysguard_ksysguard_FreeBSD_ProcessList.c,v 1.1 2012/03/31 06:39:20 marino Exp $
+$NetBSD: patch-ksysguard_ksysguard_FreeBSD_ProcessList.c,v 1.2 2013/04/03 10:51:50 markd Exp $
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig 2012-03-30 20:44:17.924143000 +0000
+--- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig 2013-03-01 06:32:24.000000000 +0000
+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c
@@ -54,6 +54,24 @@
@@ -70,8 +70,8 @@ $NetBSD: patch-ksysguard_ksysguard_FreeBSD_ProcessList.c,v 1.1 2012/03/31 06:39:
}
+#if defined(__DragonFly__)
-+ /* XXX */
-+ load = 0;
++ /* XXX */
++ load = 0;
+#else
if (last_ps != NULL)
load = (ps->ki_runtime - last_ps->ki_runtime) / 1000000.0 / scale;
@@ -80,4 +80,4 @@ $NetBSD: patch-ksysguard_ksysguard_FreeBSD_ProcessList.c,v 1.1 2012/03/31 06:39:
+#endif
if (!ps->ki_pid)
- // XXX: TODO: add support for displaying kernel process
+ /* XXX: TODO: add support for displaying kernel process */
diff --git a/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp b/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp
index 4d7b265dbfa..5d68deb70b7 100644
--- a/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp
+++ b/x11/kde-workspace4/patches/patch-plasma_generic_applets_digital-clock_clock.cpp
@@ -1,15 +1,17 @@
-$NetBSD: patch-plasma_generic_applets_digital-clock_clock.cpp,v 1.1 2012/03/19 19:44:04 markd Exp $
+$NetBSD: patch-plasma_generic_applets_digital-clock_clock.cpp,v 1.2 2013/04/03 10:51:50 markd Exp $
avoid an infinite loop when starting plasma. (from Sverre Froyen)
---- plasma/generic/applets/digital-clock/clock.cpp.orig 2012-01-09 10:32:10.000000000 -0700
-+++ plasma/generic/applets/digital-clock/clock.cpp 2012-01-10 11:57:19.000000000 -0700
-@@ -687,23 +687,36 @@ void Clock::generatePixmap()
+--- plasma/generic/applets/digital-clock/clock.cpp.orig 2013-03-01 06:32:24.000000000 +0000
++++ plasma/generic/applets/digital-clock/clock.cpp
+@@ -678,32 +678,38 @@ void Clock::generatePixmap()
void Clock::expandFontToMax(QFont &font, const QString &text)
{
- bool first = true;
const QRect rect = contentsRect().toRect();
+ int oldWidth = 0;
+ int oldHeight = 0;
+ int tryMax = 10;
+ int trys = 0;
+ int pointSize = font.pointSize();
@@ -28,7 +30,8 @@ avoid an infinite loop when starting plasma. (from Sverre Froyen)
+ font.setPointSize(font.pointSize() + 1);
const QFontMetrics fm(font);
QRect fr = fm.boundingRect(rect, Qt::TextSingleLine, text);
-- if (fr.width() >= rect.width() || fr.height() >= rect.height()) {
+- if (oldWidth == fr.width() && oldHeight == fr.height()) {
+- // Largest font size reached.
- break;
+ if (fr.width() > width || fr.height() > height) {
+ width = fr.width();
@@ -40,11 +43,16 @@ avoid an infinite loop when starting plasma. (from Sverre Froyen)
+ pointSize = font.pointSize();
+ trys = 0;
}
-- } while (true);
+- oldWidth = fr.width();
+- oldHeight = fr.height();
+-
+- if (fr.width() >= rect.width() || fr.height() >= rect.height()) {
+- break;
+ else {
+ // Real point size did not change
+ trys++;
-+ }
+ }
+- } while (true);
+ } while (trys < tryMax);
+
+ font.setPointSize(pointSize);
diff --git a/x11/kde-workspace4/patches/patch-startkde.cmake b/x11/kde-workspace4/patches/patch-startkde.cmake
index f5aba28f43f..2e9a82e2628 100644
--- a/x11/kde-workspace4/patches/patch-startkde.cmake
+++ b/x11/kde-workspace4/patches/patch-startkde.cmake
@@ -1,8 +1,8 @@
-$NetBSD: patch-startkde.cmake,v 1.1 2012/03/19 19:44:04 markd Exp $
+$NetBSD: patch-startkde.cmake,v 1.2 2013/04/03 10:51:50 markd Exp $
---- startkde.cmake.orig 2007-11-29 02:29:24.000000000 +1300
+--- startkde.cmake.orig 2013-03-01 06:32:24.000000000 +0000
+++ startkde.cmake
-@@ -38,6 +38,12 @@ if [ -n "$bindir" ]; then
+@@ -32,6 +32,12 @@ if [ -n "$bindir" ]; then
esac
fi
@@ -12,10 +12,10 @@ $NetBSD: patch-startkde.cmake,v 1.1 2012/03/19 19:44:04 markd Exp $
+ *) PATH=$qtbindir:$PATH; export PATH;;
+esac
+
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -219,11 +225,11 @@ usr_fdir=$HOME/.fonts
+ # Check if a KDE session already is running and whether it's possible to connect to X
+ kcheckrunning
+ kcheckrunning_result=$?
+@@ -192,11 +198,11 @@ usr_fdir=$HOME/.fonts
if test -n "$KDEDIRS"; then
kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index fae5000756f..2a8ba534f84 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2013/02/16 11:19:50 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2013/04/03 10:51:44 markd Exp $
DISTNAME= kdelibs-${_KDE_VERSION}
PKGNAME= ${DISTNAME:S/-4/4-4/}
-PKGREVISION= 9
CATEGORIES= x11
COMMENT= Support libraries for the KDE integrated X11 desktop
@@ -41,6 +40,7 @@ REPLACE_PERL+= \
kio/proxytype.pl \
kio/useragent.pl \
kio/misc/fileshareset \
+ kioslave/http/kcookiejar/kcookiescfg.pl \
kdeui/preparetips \
plasma/data/kconfig_updates/plasma_popupapplet_fix_groups.pl
@@ -58,7 +58,7 @@ SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g'
SUBST_CLASSES+= phononrelpath
SUBST_STAGE.phononrelpath= post-configure
SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path
-SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake
+SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET_NAME}.cmake
SUBST_SED.phononrelpath= -e 's:[^"]*/\.buildlink/lib/libphonon\.so::'
USE_TOOLS+= flex gmake
@@ -82,7 +82,7 @@ BUILDLINK_DEPMETHOD.qt4-tools= full
BUILDLINK_API_DEPENDS.strigi+= strigi>=0.5.11
BUILDLINK_API_DEPENDS.soprano+= soprano>=2.5.60
-BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.6.5
+BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.10.0
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../archivers/xz/buildlink3.mk"
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index f16292925d5..65892343f5d 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/06/16 04:45:39 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2013/04/03 10:51:44 markd Exp $
bin/checkXML
bin/kbuildsycoca4
bin/kconfig_compiler
@@ -11,8 +11,10 @@ bin/kdeinit4_wrapper
bin/kfilemetadatareader
bin/kjs
bin/kjscmd
+bin/kmailservice
bin/kross
bin/kshell4
+bin/ktelnetservice
bin/kunittestmodrunner
bin/kwrapper4
bin/makekdewidgets
@@ -229,6 +231,7 @@ include/KDE/KAuth/ActionWatcher
include/KDE/KAuth/HelperSupport
include/KDE/KAuthorized
include/KDE/KAutoMount
+include/KDE/KAutoSaveFile
include/KDE/KAutoUnmount
include/KDE/KAutostart
include/KDE/KBookmark
@@ -244,6 +247,7 @@ include/KDE/KBookmarkImporterBase
include/KDE/KBookmarkManager
include/KDE/KBookmarkMenu
include/KDE/KBookmarkOwner
+include/KDE/KBreadcrumbSelectionModel
include/KDE/KBugReport
include/KDE/KBuildSycocaProgressDialog
include/KDE/KButtonGroup
@@ -255,6 +259,7 @@ include/KDE/KCModuleProxy
include/KDE/KCMultiDialog
include/KDE/KCalendarSystem
include/KDE/KCalendarSystemFactory
+include/KDE/KCapacityBar
include/KDE/KCategorizedSortFilterProxyModel
include/KDE/KCategorizedView
include/KDE/KCategoryDrawer
@@ -264,6 +269,7 @@ include/KDE/KCharsets
include/KDE/KCheckableProxyModel
include/KDE/KCmdLineArgs
include/KDE/KCmdLineOptions
+include/KDE/KCodecAction
include/KDE/KCodecs
include/KDE/KColor
include/KDE/KColorButton
@@ -299,6 +305,7 @@ include/KDE/KCurrencyCode
include/KDE/KCursor
include/KDE/KDBusServiceStarter
include/KDE/KDEDModule
+include/KDE/KDEPrintDialog
include/KDE/KDEsuClient
include/KDE/KDataTool
include/KDE/KDataToolAction
@@ -314,8 +321,10 @@ include/KDE/KDateWidget
include/KDE/KDebug
include/KDE/KDescendantsProxyModel
include/KDE/KDesktopFile
+include/KDE/KDeviceListModel
include/KDE/KDialog
include/KDE/KDialogButtonBox
+include/KDE/KDialogJobUiDelegate
include/KDE/KDirLister
include/KDE/KDirModel
include/KDE/KDirNotify
@@ -359,6 +368,7 @@ include/KDE/KFileSharePropsPlugin
include/KDE/KFileTreeBranch
include/KDE/KFileTreeView
include/KDE/KFileWidget
+include/KDE/KFileWritePlugin
include/KDE/KFilterBase
include/KDE/KFilterDev
include/KDE/KFilterProxySearchLine
@@ -377,6 +387,7 @@ include/KDE/KGenericFactoryBase
include/KDE/KGlobal
include/KDE/KGlobalAccel
include/KDE/KGlobalSettings
+include/KDE/KGlobalShortcutInfo
include/KDE/KGradientSelector
include/KDE/KGraphicsWebView
include/KDE/KGuiItem
@@ -440,6 +451,7 @@ include/KDE/KIconDialog
include/KDE/KIconEffect
include/KDE/KIconLoader
include/KDE/KIconTheme
+include/KDE/KIdentityProxyModel
include/KDE/KIdleTime
include/KDE/KImageCache
include/KDE/KImageFilePreview
@@ -449,6 +461,7 @@ include/KDE/KIntNumInput
include/KDE/KIntSpinBox
include/KDE/KIntValidator
include/KDE/KJob
+include/KDE/KJobTrackerInterface
include/KDE/KJobUiDelegate
include/KDE/KKeySequenceWidget
include/KDE/KLanguageButton
@@ -457,9 +470,11 @@ include/KDE/KLibFactory
include/KDE/KLibLoader
include/KDE/KLibrary
include/KDE/KLineEdit
+include/KDE/KLinkItemSelectionModel
include/KDE/KListWidget
include/KDE/KListWidgetSearchLine
include/KDE/KLocale
+include/KDE/KLocalizedDate
include/KDE/KLocalizedString
include/KDE/KLockFile
include/KDE/KMD5
@@ -481,7 +496,9 @@ include/KDE/KMimeTypeChooserDialog
include/KDE/KMimeTypeResolver
include/KDE/KMimeTypeTrader
include/KDE/KMimeTypeValidator
+include/KDE/KModelIndexProxyMapper
include/KDE/KModifierKeyInfo
+include/KDE/KMountPoint
include/KDE/KMozillaBookmarkImporterImpl
include/KDE/KMultiTabBar
include/KDE/KMultiTabBarButton
@@ -502,6 +519,7 @@ include/KDE/KNSBookmarkExporterImpl
include/KDE/KNSBookmarkImporter
include/KDE/KNSBookmarkImporterImpl
include/KDE/KNTLM
+include/KDE/KNameAndUrlInputDialog
include/KDE/KNetwork/KActiveSocketBase
include/KDE/KNetwork/KBufferedSocket
include/KDE/KNetwork/KClientSocketBase
@@ -524,6 +542,7 @@ include/KDE/KNetwork/KSocksSocketDevice
include/KDE/KNetwork/KStreamSocket
include/KDE/KNetwork/KUnixSocketAddress
include/KDE/KNewFileMenu
+include/KDE/KNewPasswordDialog
include/KDE/KNotification
include/KDE/KNotificationRestrictions
include/KDE/KNotifyConfigWidget
@@ -553,6 +572,7 @@ include/KDE/KParts/GenericFactory
include/KDE/KParts/GenericFactoryBase
include/KDE/KParts/HistoryProvider
include/KDE/KParts/HtmlExtension
+include/KDE/KParts/ListingExtension
include/KDE/KParts/LiveConnectExtension
include/KDE/KParts/MainWindow
include/KDE/KParts/OpenUrlEvent
@@ -600,10 +620,12 @@ include/KDE/KPtyProcess
include/KDE/KPushButton
include/KDE/KRandom
include/KDE/KRandomSequence
+include/KDE/KRatingPainter
include/KDE/KRatingWidget
include/KDE/KRecentDocument
include/KDE/KRecentFilesAction
include/KDE/KRecursiveFilterProxyModel
+include/KDE/KRegExpEditorInterface
include/KDE/KRemoteEncoding
include/KDE/KReplace
include/KDE/KReplaceDialog
@@ -623,6 +645,7 @@ include/KDE/KSelectionWatcher
include/KDE/KSelector
include/KDE/KSeparator
include/KDE/KService
+include/KDE/KServiceAction
include/KDE/KServiceGroup
include/KDE/KServiceType
include/KDE/KServiceTypeProfile
@@ -655,6 +678,8 @@ include/KDE/KStartupInfo
include/KDE/KStartupInfoData
include/KDE/KStartupInfoId
include/KDE/KStatusBar
+include/KDE/KStatusBarJobTracker
+include/KDE/KStatusBarOfflineIndicator
include/KDE/KStatusNotifierItem
include/KDE/KStringHandler
include/KDE/KStringListValidator
@@ -763,12 +788,14 @@ include/KDE/KUser
include/KDE/KUserGroup
include/KDE/KVBox
include/KDE/KViewStateMaintainer
+include/KDE/KViewStateSaver
include/KDE/KWallet/Wallet
include/KDE/KWebPage
include/KDE/KWebPluginFactory
include/KDE/KWebView
include/KDE/KWebWallet
include/KDE/KWidgetItemDelegate
+include/KDE/KWidgetJobTracker
include/KDE/KWindowInfo
include/KDE/KWindowSystem
include/KDE/KWordMacroExpander
@@ -1451,6 +1478,7 @@ include/kparts/genericfactory.h
include/kparts/historyprovider.h
include/kparts/htmlextension.h
include/kparts/kparts_export.h
+include/kparts/listingextension.h
include/kparts/mainwindow.h
include/kparts/part.h
include/kparts/partmanager.h
@@ -1908,7 +1936,7 @@ include/threadweaver/WeaverObserver.h
include/threadweaver/threadweaver_export.h
lib/cmake/KDeclarative/KDeclarativeConfig.cmake
lib/cmake/KDeclarative/KDeclarativeConfigVersion.cmake
-lib/cmake/KDeclarative/KDeclarativeLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KDeclarative/KDeclarativeLibraryTargets-${TARGET}.cmake
lib/cmake/KDeclarative/KDeclarativeLibraryTargets.cmake
lib/kde4/emoticonstheme_adium.so
lib/kde4/emoticonstheme_kde.so
@@ -1945,10 +1973,8 @@ ${PLIST.kgrantpty}lib/kde4/libexec/kgrantpty
lib/kde4/libexec/kio_http_cache_cleaner
lib/kde4/libexec/kioslave
lib/kde4/libexec/klauncher
-lib/kde4/libexec/kmailservice
lib/kde4/libexec/kpac_dhcp_helper
lib/kde4/libexec/ksendbugmail
-lib/kde4/libexec/ktelnetservice
lib/kde4/libexec/lnusertemp
lib/kde4/libexec/start_kdeinit
lib/kde4/libexec/start_kdeinit_wrapper
@@ -1975,23 +2001,23 @@ lib/kde4/plugins/kauth/backend/kauth_backend_plugin.so
lib/kde4/plugins/kauth/helper/kauth_helper_plugin.so
lib/kde4/plugins/script/libkrossqtsplugin.so
lib/kde4/plugins/script/libkrossqtsplugin.so.4
-lib/kde4/plugins/script/libkrossqtsplugin.so.4.8.0
+lib/kde4/plugins/script/libkrossqtsplugin.so.${PKGVERSION}
lib/kde4/spellcheckplugin.so
lib/libkcmutils.so
lib/libkcmutils.so.4
-lib/libkcmutils.so.4.8.0
+lib/libkcmutils.so.${PKGVERSION}
lib/libkde3support.so
lib/libkde3support.so.4
-lib/libkde3support.so.4.8.0
+lib/libkde3support.so.${PKGVERSION}
lib/libkdeclarative.so
lib/libkdeclarative.so.5
-lib/libkdeclarative.so.5.8.0
+lib/libkdeclarative.so.5.10.2
lib/libkdecore.so
lib/libkdecore.so.5
-lib/libkdecore.so.5.8.0
+lib/libkdecore.so.5.10.2
lib/libkdefakes.so
lib/libkdefakes.so.5
-lib/libkdefakes.so.5.8.0
+lib/libkdefakes.so.5.10.2
lib/libkdeinit4_kbuildsycoca4.so
lib/libkdeinit4_kconf_update.so
lib/libkdeinit4_kded4.so
@@ -1999,103 +2025,103 @@ lib/libkdeinit4_kio_http_cache_cleaner.so
lib/libkdeinit4_klauncher.so
lib/libkdesu.so
lib/libkdesu.so.5
-lib/libkdesu.so.5.8.0
+lib/libkdesu.so.5.10.2
lib/libkdeui.so
lib/libkdeui.so.5
-lib/libkdeui.so.5.8.0
+lib/libkdeui.so.5.10.2
lib/libkdewebkit.so
lib/libkdewebkit.so.5
-lib/libkdewebkit.so.5.8.0
+lib/libkdewebkit.so.5.10.2
lib/libkdnssd.so
lib/libkdnssd.so.4
-lib/libkdnssd.so.4.8.0
+lib/libkdnssd.so.${PKGVERSION}
lib/libkemoticons.so
lib/libkemoticons.so.4
-lib/libkemoticons.so.4.8.0
+lib/libkemoticons.so.${PKGVERSION}
lib/libkfile.so
lib/libkfile.so.4
-lib/libkfile.so.4.8.0
+lib/libkfile.so.${PKGVERSION}
lib/libkhtml.so
lib/libkhtml.so.5
-lib/libkhtml.so.5.8.0
+lib/libkhtml.so.5.10.2
lib/libkidletime.so
lib/libkidletime.so.4
-lib/libkidletime.so.4.8.0
+lib/libkidletime.so.${PKGVERSION}
lib/libkimproxy.so
lib/libkimproxy.so.4
-lib/libkimproxy.so.4.8.0
+lib/libkimproxy.so.${PKGVERSION}
lib/libkio.so
lib/libkio.so.5
-lib/libkio.so.5.8.0
+lib/libkio.so.5.10.2
lib/libkjs.so
lib/libkjs.so.4
-lib/libkjs.so.4.8.0
+lib/libkjs.so.${PKGVERSION}
lib/libkjsapi.so
lib/libkjsapi.so.4
-lib/libkjsapi.so.4.8.0
+lib/libkjsapi.so.${PKGVERSION}
lib/libkjsembed.so
lib/libkjsembed.so.4
-lib/libkjsembed.so.4.8.0
+lib/libkjsembed.so.${PKGVERSION}
lib/libkmediaplayer.so
lib/libkmediaplayer.so.4
-lib/libkmediaplayer.so.4.8.0
+lib/libkmediaplayer.so.${PKGVERSION}
lib/libknewstuff2.so
lib/libknewstuff2.so.4
-lib/libknewstuff2.so.4.8.0
+lib/libknewstuff2.so.${PKGVERSION}
lib/libknewstuff3.so
lib/libknewstuff3.so.4
-lib/libknewstuff3.so.4.8.0
+lib/libknewstuff3.so.${PKGVERSION}
lib/libknotifyconfig.so
lib/libknotifyconfig.so.4
-lib/libknotifyconfig.so.4.8.0
+lib/libknotifyconfig.so.${PKGVERSION}
lib/libkntlm.so
lib/libkntlm.so.4
-lib/libkntlm.so.4.8.0
+lib/libkntlm.so.${PKGVERSION}
lib/libkparts.so
lib/libkparts.so.4
-lib/libkparts.so.4.8.0
+lib/libkparts.so.${PKGVERSION}
lib/libkprintutils.so
lib/libkprintutils.so.4
-lib/libkprintutils.so.4.8.0
+lib/libkprintutils.so.${PKGVERSION}
lib/libkpty.so
lib/libkpty.so.4
-lib/libkpty.so.4.8.0
+lib/libkpty.so.${PKGVERSION}
lib/libkrosscore.so
lib/libkrosscore.so.4
-lib/libkrosscore.so.4.8.0
+lib/libkrosscore.so.${PKGVERSION}
lib/libkrossui.so
lib/libkrossui.so.4
-lib/libkrossui.so.4.8.0
+lib/libkrossui.so.${PKGVERSION}
lib/libktexteditor.so
lib/libktexteditor.so.4
-lib/libktexteditor.so.4.8.0
+lib/libktexteditor.so.${PKGVERSION}
lib/libkunitconversion.so
lib/libkunitconversion.so.4
-lib/libkunitconversion.so.4.8.0
+lib/libkunitconversion.so.${PKGVERSION}
lib/libkunittest.so
lib/libkunittest.so.4
-lib/libkunittest.so.4.8.0
+lib/libkunittest.so.${PKGVERSION}
lib/libkutils.so
lib/libkutils.so.4
-lib/libkutils.so.4.8.0
+lib/libkutils.so.${PKGVERSION}
lib/libnepomuk.so
lib/libnepomuk.so.4
-lib/libnepomuk.so.4.8.0
+lib/libnepomuk.so.${PKGVERSION}
lib/libnepomukquery.so
lib/libnepomukquery.so.4
-lib/libnepomukquery.so.4.8.0
+lib/libnepomukquery.so.${PKGVERSION}
lib/libnepomukutils.so
lib/libnepomukutils.so.4
-lib/libnepomukutils.so.4.8.0
+lib/libnepomukutils.so.${PKGVERSION}
lib/libplasma.so
lib/libplasma.so.3
lib/libplasma.so.3.0.0
lib/libsolid.so
lib/libsolid.so.4
-lib/libsolid.so.4.8.0
+lib/libsolid.so.${PKGVERSION}
lib/libthreadweaver.so
lib/libthreadweaver.so.4
-lib/libthreadweaver.so.4.8.0
+lib/libthreadweaver.so.${PKGVERSION}
man/man1/checkXML.1
man/man1/kconfig_compiler.1
man/man1/kde4-config.1
@@ -2232,10 +2258,6 @@ share/kde/apps/LICENSES/LGPL_V2
share/kde/apps/LICENSES/LGPL_V3
share/kde/apps/LICENSES/QPL_V1.0
share/kde/apps/cmake/modules/BasicFindPackageVersion.cmake.in
-share/kde/apps/cmake/modules/CMakeParseArguments.cmake
-share/kde/apps/cmake/modules/CheckCXXSourceCompiles.cmake
-share/kde/apps/cmake/modules/CheckCXXSourceRuns.cmake
-share/kde/apps/cmake/modules/CheckCXXSymbolExists.cmake
share/kde/apps/cmake/modules/CheckPointerMember.cmake
share/kde/apps/cmake/modules/CheckPrototypeExists.cmake
share/kde/apps/cmake/modules/CheckStructMember.cmake
@@ -2248,7 +2270,6 @@ share/kde/apps/cmake/modules/FindAvahi.cmake
share/kde/apps/cmake/modules/FindBerkeleyDB.cmake
share/kde/apps/cmake/modules/FindBlitz.cmake
share/kde/apps/cmake/modules/FindBlueZ.cmake
-share/kde/apps/cmake/modules/FindBoost.cmake
share/kde/apps/cmake/modules/FindCarbon.cmake
share/kde/apps/cmake/modules/FindDBusMenuQt.cmake
share/kde/apps/cmake/modules/FindDNSSD.cmake
@@ -2261,8 +2282,6 @@ share/kde/apps/cmake/modules/FindFFmpeg.cmake
share/kde/apps/cmake/modules/FindFlac.cmake
share/kde/apps/cmake/modules/FindFlex.cmake
share/kde/apps/cmake/modules/FindFontconfig.cmake
-share/kde/apps/cmake/modules/FindFreetype.cmake
-share/kde/apps/cmake/modules/FindGIF.cmake
share/kde/apps/cmake/modules/FindGLIB2.cmake
share/kde/apps/cmake/modules/FindGMP.cmake
share/kde/apps/cmake/modules/FindGObject.cmake
@@ -2289,7 +2308,6 @@ share/kde/apps/cmake/modules/FindLibAttica.cmake
share/kde/apps/cmake/modules/FindLibKonq.cmake
share/kde/apps/cmake/modules/FindLibLZMA.cmake
share/kde/apps/cmake/modules/FindLibPython.py
-share/kde/apps/cmake/modules/FindLibXml2.cmake
share/kde/apps/cmake/modules/FindLibXslt.cmake
share/kde/apps/cmake/modules/FindLibintl.cmake
share/kde/apps/cmake/modules/FindLibraryWithDebug.cmake
@@ -2301,11 +2319,8 @@ share/kde/apps/cmake/modules/FindNepomuk.cmake
share/kde/apps/cmake/modules/FindNetworkManager.cmake
share/kde/apps/cmake/modules/FindOggVorbis.cmake
share/kde/apps/cmake/modules/FindOpenEXR.cmake
-share/kde/apps/cmake/modules/FindOpenSSL.cmake
share/kde/apps/cmake/modules/FindPCRE.cmake
-share/kde/apps/cmake/modules/FindPackageHandleStandardArgs.cmake
share/kde/apps/cmake/modules/FindPhonon.cmake
-share/kde/apps/cmake/modules/FindPkgConfig.cmake
share/kde/apps/cmake/modules/FindPlasma.cmake
share/kde/apps/cmake/modules/FindPopplerQt4.cmake
share/kde/apps/cmake/modules/FindPostgreSQL.cmake
@@ -2339,9 +2354,9 @@ share/kde/apps/cmake/modules/FindXmms.cmake
share/kde/apps/cmake/modules/HandleImportedTargetsInCMakeRequiredLibraries.cmake
share/kde/apps/cmake/modules/KDE4Defaults.cmake
share/kde/apps/cmake/modules/KDE4Macros.cmake
-share/kde/apps/cmake/modules/KDELibs4LibraryTargets-relwithdebinfo.cmake
+share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET}.cmake
share/kde/apps/cmake/modules/KDELibs4LibraryTargets.cmake
-share/kde/apps/cmake/modules/KDELibs4ToolsTargets-relwithdebinfo.cmake
+share/kde/apps/cmake/modules/KDELibs4ToolsTargets-${TARGET}.cmake
share/kde/apps/cmake/modules/KDELibs4ToolsTargets.cmake
share/kde/apps/cmake/modules/KDELibsDependencies.cmake
share/kde/apps/cmake/modules/KDEPlatformProfile.cmake
@@ -2383,6 +2398,7 @@ share/kde/apps/kauth/dbus_service.stub
share/kde/apps/kcharselect/kcharselect-data
share/kde/apps/kcm_componentchooser/kcm_instantmessenger.desktop
share/kde/apps/kcm_componentchooser/kcm_ktexteditor.desktop
+share/kde/apps/kconf_update/kcookiescfg.pl
share/kde/apps/kconf_update/kcookiescfg.upd
share/kde/apps/kconf_update/kded.upd
share/kde/apps/kconf_update/kio_help.upd
@@ -2400,7 +2416,7 @@ share/kde/apps/kdeui/about/bar-middle-right.png
share/kde/apps/kdeui/about/bar-top-left.png
share/kde/apps/kdeui/about/bar-top-middle.png
share/kde/apps/kdeui/about/bar-top-right.png
-share/kde/apps/kdeui/about/body-background.jpg
+share/kde/apps/kdeui/about/body-background.png
share/kde/apps/kdeui/about/box-bottom-left.png
share/kde/apps/kdeui/about/box-bottom-middle.png
share/kde/apps/kdeui/about/box-bottom-right.png
@@ -3279,6 +3295,7 @@ share/kde/apps/ksgmltools2/customization/xh/user.entities
share/kde/apps/ksgmltools2/customization/xsl/README
share/kde/apps/ksgmltools2/customization/xsl/all-l10n.xml
share/kde/apps/ksgmltools2/customization/xsl/ca.xml
+share/kde/apps/ksgmltools2/customization/xsl/cs.xml
share/kde/apps/ksgmltools2/customization/xsl/de.xml
share/kde/apps/ksgmltools2/customization/xsl/el.xml
share/kde/apps/ksgmltools2/customization/xsl/en.xml
@@ -3286,6 +3303,7 @@ share/kde/apps/ksgmltools2/customization/xsl/es.xml
share/kde/apps/ksgmltools2/customization/xsl/et.xml
share/kde/apps/ksgmltools2/customization/xsl/fr.xml
share/kde/apps/ksgmltools2/customization/xsl/gl.xml
+share/kde/apps/ksgmltools2/customization/xsl/hu.xml
share/kde/apps/ksgmltools2/customization/xsl/it.xml
share/kde/apps/ksgmltools2/customization/xsl/lt.xml
share/kde/apps/ksgmltools2/customization/xsl/nds.xml
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 562ad12379d..339dd3b8c27 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.32 2012/11/11 22:24:01 joerg Exp $
+$NetBSD: distinfo,v 1.33 2013/04/03 10:51:44 markd Exp $
-SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49
-RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec
-Size (kdelibs-4.8.4.tar.xz) = 12182912 bytes
+SHA1 (kdelibs-4.10.2.tar.xz) = 2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85
+RMD160 (kdelibs-4.10.2.tar.xz) = b1cb62464e146c2f65cf4bb2487be7001ee4fc7b
+Size (kdelibs-4.10.2.tar.xz) = 11979652 bytes
SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
@@ -14,13 +14,10 @@ SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
+SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = 4b1e7a68fe6f3766deca6d557e80ceafb37a3ee3
SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
-SHA1 (patch-kdecore_CMakeLists.txt) = 1b517aa2d8c39988251c95bcd1daa012ea9bcfaa
SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
-SHA1 (patch-kparts_componentfactory.h) = e670cd8f35b5186bf76e0cc285da65cc8832b82f
SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
-SHA1 (patch-nepomuk_core_nepomukmainmodel.cpp) = bba701025aa1d33b9d6ce4b6d1fec2a92b4f5552
-SHA1 (patch-nepomuk_core_resourcemanager.cpp) = 99a1e6c319f4798e5c929e77bd6717ffb2e3f571
diff --git a/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake
new file mode 100644
index 00000000000..00bf990e098
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-cmake_modules_FindKDE4Internal.cmake
@@ -0,0 +1,19 @@
+$NetBSD: patch-cmake_modules_FindKDE4Internal.cmake,v 1.1 2013/04/03 10:51:44 markd Exp $
+
+Dont pass -std=iso9899:1990 on NetBSD. Breaks ksysguardd at least.
+
+--- cmake/modules/FindKDE4Internal.cmake.orig 2013-03-01 06:26:13.000000000 +0000
++++ cmake/modules/FindKDE4Internal.cmake
+@@ -1204,7 +1204,11 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
+ set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++ if (CMAKE_SYSTEM_NAME MATCHES NetBSD)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++ else (CMAKE_SYSTEM_NAME MATCHES NetBSD)
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++ endif (CMAKE_SYSTEM_NAME MATCHES NetBSD)
+ # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
+
diff --git a/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt b/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt
deleted file mode 100644
index b4081d96660..00000000000
--- a/x11/kdelibs4/patches/patch-kdecore_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-kdecore_CMakeLists.txt,v 1.1 2012/07/05 18:48:33 joerg Exp $
-
---- kdecore/CMakeLists.txt.orig 2012-07-05 12:21:26.000000000 +0000
-+++ kdecore/CMakeLists.txt
-@@ -384,8 +384,9 @@ if(NOT WIN32)
- set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache.cpp)
- set(kdecore_OPTIONAL_LIBS ${kdecore_OPTIONAL_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-
-- set_source_files_properties(util/kshareddatacache.cpp
-- PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS})
-+ if (KDE4_ENABLE_EXCEPTIONS)
-+ set_source_files_properties(util/kshareddatacache.cpp PROPERTIES COMPILE_FLAGS ${KDE4_ENABLE_EXCEPTIONS})
-+ endif (KDE4_ENABLE_EXCEPTIONS)
- else(NOT WIN32)
- set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} util/kshareddatacache_win.cpp)
- set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} io/kdirwatch_win.cpp)
diff --git a/x11/kdelibs4/patches/patch-kparts_componentfactory.h b/x11/kdelibs4/patches/patch-kparts_componentfactory.h
deleted file mode 100644
index 3279e6981f3..00000000000
--- a/x11/kdelibs4/patches/patch-kparts_componentfactory.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-kparts_componentfactory.h,v 1.1 2012/11/11 22:24:01 joerg Exp $
-
---- kparts/componentfactory.h.orig 2012-06-06 20:49:52.000000000 +0000
-+++ kparts/componentfactory.h
-@@ -81,7 +81,7 @@ namespace KParts
- const QStringList &args = QStringList(),
- int *error = 0 )
- {
-- KLibrary *library = KLibLoader::self()->library( QString( libraryName ) ); // compatibility hack
-+ KLibrary *library = KLibLoader::self()->library( QString::fromAscii( libraryName ) ); // compatibility hack
- if ( !library )
- {
- if ( error )
diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp
deleted file mode 100644
index 177635f110c..00000000000
--- a/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-nepomuk_core_nepomukmainmodel.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
-
-ID: 76e0376d7582cfe5b898c56bf3779ca2279dace8
-Revert "Disconnect before re-connecting. Soprano does not do that for us."
-
---- nepomuk/core/nepomukmainmodel.cpp.orig 2012-06-06 20:49:52.000000000 +0000
-+++ nepomuk/core/nepomukmainmodel.cpp
-@@ -97,7 +97,6 @@ public:
- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
- delete localSocketModel;
- localSocketModel = 0;
-- localSocketClient.disconnect();
- QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
- kDebug() << "Connecting to local socket" << socketName;
- if ( localSocketClient.connect( socketName ) ) {
diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp
deleted file mode 100644
index e36e50c6bd8..00000000000
--- a/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-nepomuk_core_resourcemanager.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
-
-ID: 528144c444ea983470b1cff678d40b1967bce3d5
-Increase the ResourceManager cache size to 10000
-
---- nepomuk/core/resourcemanager.cpp.orig 2012-06-06 20:49:52.000000000 +0000
-+++ nepomuk/core/resourcemanager.cpp
-@@ -178,7 +178,7 @@ QList<Nepomuk::ResourceData*> Nepomuk::R
-
- bool Nepomuk::ResourceManagerPrivate::dataCacheFull() const
- {
-- return dataCnt >= 1000;
-+ return dataCnt >= 10000;
- }
-
-
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index 276bb9093f8..58085e0a6b7 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2013/02/16 11:25:20 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/03 10:51:51 markd Exp $
DISTNAME= konsole-${_KDE_VERSION}
-PKGREVISION= 7
CATEGORIES= x11
COMMENT= a terminal emulator for the K Desktop Environment
diff --git a/x11/konsole/PLIST b/x11/konsole/PLIST
index 2fce4d6596d..b8973326c06 100644
--- a/x11/konsole/PLIST
+++ b/x11/konsole/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/20 05:07:48 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:51:51 markd Exp $
bin/konsole
bin/konsoleprofile
lib/kde4/libkonsolepart.so
@@ -8,16 +8,22 @@ share/applications/kde4/konsole.desktop
share/doc/kde/HTML/en/konsole/common
share/doc/kde/HTML/en/konsole/index.cache.bz2
share/doc/kde/HTML/en/konsole/index.docbook
-share/kde/apps/konsole/BlackOnLightYellow.schema
+share/kde/apps/kconf_update/konsole-2.10.0-remove-menuindex-from-profiles.sh
+share/kde/apps/kconf_update/konsole-2.9.0-colorscheme-bold-key.sh
+share/kde/apps/kconf_update/konsole-2.9.0-global-options.sh
+share/kde/apps/kconf_update/konsole.upd
+share/kde/apps/konsole/BlackOnLightYellow.colorscheme
share/kde/apps/konsole/BlackOnRandomLight.colorscheme
-share/kde/apps/konsole/BlackOnWhite.schema
+share/kde/apps/konsole/BlackOnWhite.colorscheme
+share/kde/apps/konsole/BlueOnBlack.colorscheme
share/kde/apps/konsole/DarkPastels.colorscheme
share/kde/apps/konsole/GreenOnBlack.colorscheme
share/kde/apps/konsole/Linux.colorscheme
share/kde/apps/konsole/README.KeyTab
+share/kde/apps/konsole/RedOnBlack.colorscheme
share/kde/apps/konsole/Shell.profile
share/kde/apps/konsole/Solarized.colorscheme
-share/kde/apps/konsole/WhiteOnBlack.schema
+share/kde/apps/konsole/WhiteOnBlack.colorscheme
share/kde/apps/konsole/default.keytab
share/kde/apps/konsole/konsole.notifyrc
share/kde/apps/konsole/konsoleui.rc
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index 939e216c06f..d9700a30709 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/06/16 04:45:39 markd Exp $
+$NetBSD: distinfo,v 1.4 2013/04/03 10:51:51 markd Exp $
-SHA1 (konsole-4.8.4.tar.xz) = a5900aa089a28fcaa69b45cfc7b46f556a38bd11
-RMD160 (konsole-4.8.4.tar.xz) = c4fa6494ea63cc7a8d7ad00f3987698f87dd509d
-Size (konsole-4.8.4.tar.xz) = 441968 bytes
-SHA1 (patch-src_ProcessInfo.cpp) = aa0c1d6bfa7462681b82bdee4609e0cf26211300
+SHA1 (konsole-4.10.2.tar.xz) = 171824f4d06c66a4373274da01cad84853bec821
+RMD160 (konsole-4.10.2.tar.xz) = 52c0b634ee9f40b9cb5add8eaa91e1c416a23644
+Size (konsole-4.10.2.tar.xz) = 447576 bytes
+SHA1 (patch-src_ProcessInfo.cpp) = 3a1e078e344bdb22c092f8ce9ee18a5e2a8c5eef
diff --git a/x11/konsole/patches/patch-src_ProcessInfo.cpp b/x11/konsole/patches/patch-src_ProcessInfo.cpp
index b9b1f4eb57b..baea8722af8 100644
--- a/x11/konsole/patches/patch-src_ProcessInfo.cpp
+++ b/x11/konsole/patches/patch-src_ProcessInfo.cpp
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_ProcessInfo.cpp,v 1.1.1.1 2012/03/20 05:07:49 markd Exp $
+$NetBSD: patch-src_ProcessInfo.cpp,v 1.2 2013/04/03 10:51:51 markd Exp $
---- src/ProcessInfo.cpp.orig 2010-03-26 17:26:32.000000000 +0000
+--- src/ProcessInfo.cpp.orig 2013-03-01 06:37:14.000000000 +0000
+++ src/ProcessInfo.cpp
-@@ -894,6 +894,171 @@ private:
+@@ -1030,6 +1030,171 @@ private:
}
- } ;
+ };
+class NetBSDProcessInfo : public UnixProcessInfo
+{
@@ -172,14 +172,14 @@ $NetBSD: patch-src_ProcessInfo.cpp,v 1.1.1.1 2012/03/20 05:07:49 markd Exp $
+} ;
+
SSHProcessInfo::SSHProcessInfo(const ProcessInfo& process)
- : _process(process)
+ : _process(process)
{
-@@ -1039,6 +1204,8 @@ ProcessInfo* ProcessInfo::newInstance(in
- return new LinuxProcessInfo(pid,enableEnvironmentRead);
+@@ -1184,6 +1349,8 @@ ProcessInfo* ProcessInfo::newInstance(in
+ return new LinuxProcessInfo(aPid, enableEnvironmentRead);
#elif defined(Q_OS_SOLARIS)
- return new SolarisProcessInfo(pid,enableEnvironmentRead);
+ return new SolarisProcessInfo(aPid, enableEnvironmentRead);
+#elif defined(Q_OS_NETBSD)
-+ return new NetBSDProcessInfo(pid,enableEnvironmentRead);
++ return new NetBSDProcessInfo(aPid, enableEnvironmentRead);
#elif defined(Q_OS_MAC)
- return new MacProcessInfo(pid,enableEnvironmentRead);
+ return new MacProcessInfo(aPid, enableEnvironmentRead);
#elif defined(Q_OS_FREEBSD)
diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
index f7bf454b80c..7ae5b8da58d 100644
--- a/x11/py-kde4/Makefile
+++ b/x11/py-kde4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2013/02/16 11:25:23 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2013/04/03 10:52:21 markd Exp $
PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION}
DISTNAME= pykde4-${_KDE_VERSION}
-PKGREVISION= 11
CATEGORIES= misc
COMMENT= Python bindings for the KDE integrated X11 desktop
@@ -31,14 +30,15 @@ SUBST_SED.pykdeuic4= -e 's:/usr/bin/env python$$:${PYTHONBIN}:'
# ${CP} ${FILESDIR}/FindPolkitQt.cmake ${WRKSRC}/cmake/modules
# remove when file not patched any longer
-post-install:
- ${RM} -f ${DESTDIR}${PREFIX}/share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/typedefs.sip.orig
+#post-install:
+# ${RM} -f ${DESTDIR}${PREFIX}/share/sip${PYVERSSUFFIX}/PyKDE4/kdecore/typedefs.sip.orig
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../misc/kdepimlibs4/buildlink3.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
.include "../../security/polkit-qt/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.10
diff --git a/x11/py-kde4/PLIST b/x11/py-kde4/PLIST
index ad21513060c..249cd7875cb 100644
--- a/x11/py-kde4/PLIST
+++ b/x11/py-kde4/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2012/03/19 19:44:04 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/03 10:52:21 markd Exp $
bin/pykdeuic4
+bin/pykdeuic4-${PYVERSSUFFIX}
lib/kde4/kpythonpluginfactory.so
${PYSITELIB}/PyKDE4/__init__.py
${PYSITELIB}/PyKDE4/__init__.pyc
@@ -107,10 +108,12 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatistics.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsdelegate.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionstatisticsmodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionutils_p.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/collectionview.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/control.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/differencesalgorithminterface.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entity.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitydeletedattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitydisplayattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entityhiddenattribute.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/entitylistview.sip
@@ -171,6 +174,10 @@ share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/statisticsproxymodel.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transactionjobs.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transactionsequence.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/transportresourcebase.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashfilterproxymodel.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashjob.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashrestorejob.sip
+share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/trashsettings.sip
share/sip${PYVERSSUFFIX}/PyKDE4/akonadi/unlinkjob.sip
share/sip${PYVERSSUFFIX}/PyKDE4/dnssd/dnssdmod.sip
share/sip${PYVERSSUFFIX}/PyKDE4/dnssd/domainbrowser.sip
diff --git a/x11/py-kde4/distinfo b/x11/py-kde4/distinfo
index 1b2d7e906c8..883c9e5f801 100644
--- a/x11/py-kde4/distinfo
+++ b/x11/py-kde4/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/10/11 13:17:09 wiz Exp $
+$NetBSD: distinfo,v 1.5 2013/04/03 10:52:21 markd Exp $
-SHA1 (pykde4-4.8.4.tar.xz) = e629d7a1d7d1aa1d1dd24769dc5412a60b6ac256
-RMD160 (pykde4-4.8.4.tar.xz) = 563cca881a3f9c298be1c18979b6fcbc5eb8dcc0
-Size (pykde4-4.8.4.tar.xz) = 2111428 bytes
-SHA1 (patch-CMakeLists.txt) = 6981a91671511739e63568d7bc2ee8899d28f8a9
+SHA1 (pykde4-4.10.2.tar.xz) = a17d533fca8126970ec8886f55297f1005df3eb5
+RMD160 (pykde4-4.10.2.tar.xz) = a594a297b18ee4f22f87af3295bb889dd5a58a01
+Size (pykde4-4.10.2.tar.xz) = 2033256 bytes
+SHA1 (patch-CMakeLists.txt) = 605557b9bdbc1b726e32132a21e5b575db18d386
SHA1 (patch-__init__.py) = 721287a0ec82b79ea4a502526ed98ba44c6d979f
-SHA1 (patch-sip_kdecore_typedefs.sip) = 7e8332a4c0d661f564a4cfea800f4fcee945df4c
diff --git a/x11/py-kde4/patches/patch-CMakeLists.txt b/x11/py-kde4/patches/patch-CMakeLists.txt
index 2f490531917..99a2480fe54 100644
--- a/x11/py-kde4/patches/patch-CMakeLists.txt
+++ b/x11/py-kde4/patches/patch-CMakeLists.txt
@@ -1,13 +1,24 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2012/03/19 19:44:04 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2013/04/03 10:52:21 markd Exp $
---- CMakeLists.txt.orig 2010-11-02 12:51:11.000000000 +0000
+Retain the python version number in sip install directory
+
+--- CMakeLists.txt.orig 2013-03-01 06:38:30.000000000 +0000
+++ CMakeLists.txt
-@@ -15,6 +15,8 @@ endif(${CMAKE_SOURCE_DIR} STREQUAL ${CMA
- # This module can be built independant from the rest of kdebindings.
- SET(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+@@ -20,6 +20,8 @@ option(PYKDEUIC4_ALTINSTALL "Enable para
+
+ set(CMAKE_MODULE_PATH ${pykde4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
+add_definitions(${KDE4_ENABLE_EXCEPTIONS})
+
- # Fix output file conflict with the Ruby bindings
- IF(CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 6)
- SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib/pykde)
+ find_package(PythonLibrary)
+
+ set_package_properties(KDE4 PROPERTIES DESCRIPTION "The KDE libraries"
+@@ -241,7 +243,7 @@ endforeach (_X ${SIP_DISABLE_FEATURES})
+
+ get_filename_component(LIB_DIR ${KDE4_LIB_DIR} NAME)
+
+-set (SIP_FILES_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/sip)
++set (SIP_FILES_INSTALL_DIR ${SIP_DEFAULT_SIP_DIR})
+
+ set(SIP_CONFIGURATION "
+ kde_version_parts = '${KDE_VERSION}'.split('.')
diff --git a/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip b/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip
deleted file mode 100644
index b81c977f993..00000000000
--- a/x11/py-kde4/patches/patch-sip_kdecore_typedefs.sip
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-sip_kdecore_typedefs.sip,v 1.1 2012/10/11 13:17:09 wiz Exp $
-
-py-qt4 defines this itself since about 4.9.5; avoid conflict.
-
---- sip/kdecore/typedefs.sip.orig 2011-07-27 18:37:15.000000000 +0000
-+++ sip/kdecore/typedefs.sip
-@@ -951,77 +951,3 @@ template <TYPE1>
- %End
- };
-
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
-- // Create the list.
-- PyObject *l;
--
-- if ((l = PyList_New(sipCpp->size())) == NULL)
-- return NULL;
--
-- // Set the list elements.
-- for (int i = 0; i < sipCpp->size(); ++i)
-- {
-- int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3
-- PyObject *tobj = PyLong_FromLong(t);
--#else
-- PyObject *tobj = PyInt_FromLong(t);
--#endif
--
-- PyList_SET_ITEM(l, i, tobj);
-- }
--
-- return l;
--%End
--
--%ConvertToTypeCode
-- // Check the type if that is all that is required.
-- if (sipIsErr == NULL)
-- {
-- if (!PyList_Check(sipPy))
-- return 0;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
-- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
-- if (!PyNumber_Check(tobj))
--#else
-- if (!PyInt_Check(tobj))
--#endif
-- return 0;
-- }
-- return 1;
-- }
--
-- QVector<int> *qv = new QVector<int>;
--
-- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
-- {
-- PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
-- int t = PyLong_AsLong (tobj);
--#else
-- int t = PyInt_AS_LONG (tobj);
--#endif
--
-- if (*sipIsErr)
-- {
-- delete qv;
-- return 0;
-- }
--
-- qv->append(t);
-- }
--
-- *sipCppPtr = qv;
--
-- return sipGetState(sipTransferObj);
--%End
--};