aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/kactivities/Makefile5
-rw-r--r--x11/kactivities/distinfo4
-rw-r--r--x11/kactivities/pkg-descr2
-rw-r--r--x11/kactivities/pkg-plist11
-rw-r--r--x11/kactivitymanagerd/Makefile5
-rw-r--r--x11/kactivitymanagerd/pkg-descr2
-rw-r--r--x11/kactivitymanagerd/pkg-plist3
-rw-r--r--x11/kde4-baseapps/Makefile7
-rw-r--r--x11/kde4-baseapps/distinfo4
-rw-r--r--x11/kde4-baseapps/pkg-plist54
-rw-r--r--x11/kde4-runtime/Makefile3
-rw-r--r--x11/kde4-runtime/distinfo4
-rw-r--r--x11/kde4-runtime/pkg-plist406
-rw-r--r--x11/kde4-workspace/Makefile6
-rw-r--r--x11/kde4-workspace/distinfo4
-rw-r--r--x11/kde4-workspace/files/patch-git172480033
-rw-r--r--x11/kde4-workspace/pkg-plist342
-rw-r--r--x11/kde4/Makefile1
-rw-r--r--x11/kdelibs4/Makefile5
-rw-r--r--x11/kdelibs4/distinfo4
-rw-r--r--x11/kdelibs4/files/patch-CVE-2014-349456
-rw-r--r--x11/kdelibs4/files/patch-CVE-2014-503348
-rw-r--r--x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake39
-rw-r--r--x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a44
-rw-r--r--x11/kdelibs4/files/patch-mimetypes_kde.xml424
-rw-r--r--x11/kdelibs4/pkg-plist193
-rw-r--r--x11/kgamma/Makefile3
-rw-r--r--x11/kgamma/distinfo4
-rw-r--r--x11/kgamma/pkg-plist3
-rw-r--r--x11/konsole/Makefile3
-rw-r--r--x11/konsole/distinfo4
-rw-r--r--x11/konsole/pkg-plist3
-rw-r--r--x11/libkonq/Makefile3
-rw-r--r--x11/libkonq/pkg-descr2
-rw-r--r--x11/libkonq/pkg-plist2
-rw-r--r--x11/plasma-scriptengine-python/Makefile3
-rw-r--r--x11/plasma-scriptengine-python/pkg-descr2
-rw-r--r--x11/plasma-scriptengine-python/pkg-plist4
-rw-r--r--x11/plasma-scriptengine-ruby/Makefile3
-rw-r--r--x11/plasma-scriptengine-ruby/pkg-descr2
-rw-r--r--x11/plasma-scriptengine-ruby/pkg-plist1
41 files changed, 484 insertions, 1267 deletions
diff --git a/x11/kactivities/Makefile b/x11/kactivities/Makefile
index f5b92d058387..604b4aaf2b6f 100644
--- a/x11/kactivities/Makefile
+++ b/x11/kactivities/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kactivities
-PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
+PORTVERSION= ${KDE4_ACTIVITES_VERSION}
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -10,7 +9,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Kactivities library
-USE_KDE4= automoc4 kdehier kdelibs kdeprefix soprano nepomuk-core
+USE_KDE4= automoc4 kdelibs kdeprefix soprano nepomuk-core
USES= cmake:outsource compiler:c++11-lib tar:xz
USE_QT4= declarative moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
index eb8d5a6fb89f..7b5b7f854976 100644
--- a/x11/kactivities/distinfo
+++ b/x11/kactivities/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kactivities-4.12.5.tar.xz) = 4f0269d91f0f6e61548c4fc42cc5be75e210c33500ff4c31be035e430bba8e7c
-SIZE (KDE/4.12.5/kactivities-4.12.5.tar.xz) = 87132
+SHA256 (KDE/4.13.3/kactivities-4.13.3.tar.xz) = c7cb9d023f6e5cd01d76568c3590303ea3ecb4ebe9535b31862957846f5e898a
+SIZE (KDE/4.13.3/kactivities-4.13.3.tar.xz) = 87476
diff --git a/x11/kactivities/pkg-descr b/x11/kactivities/pkg-descr
index 2e025b7c05e8..a55db2790896 100644
--- a/x11/kactivities/pkg-descr
+++ b/x11/kactivities/pkg-descr
@@ -1,3 +1,3 @@
KDE activities library.
-WWW: http://www.kde.org
+WWW: http://www.kde.org
diff --git a/x11/kactivities/pkg-plist b/x11/kactivities/pkg-plist
index 833e24e12b88..469a02c5f265 100644
--- a/x11/kactivities/pkg-plist
+++ b/x11/kactivities/pkg-plist
@@ -34,14 +34,3 @@ libdata/pkgconfig/libkactivities-models.pc
libdata/pkgconfig/libkactivities.pc
share/ontology/kde/kao.ontology
share/ontology/kde/kao.trig
-@dirrmtry share/ontology/kde
-@dirrmtry share/ontology
-@dirrm lib/kde4/imports/org/kde/activities/models
-@dirrm lib/kde4/imports/org/kde/activities
-@dirrm lib/cmake/KActivities-Models
-@dirrm lib/cmake/KActivities
-@dirrmtry lib/cmake
-@dirrm include/kactivities-models
-@dirrm include/kactivities
-@dirrm include/KDE/KActivities/Models
-@dirrm include/KDE/KActivities
diff --git a/x11/kactivitymanagerd/Makefile b/x11/kactivitymanagerd/Makefile
index d352e062f542..8b4f122f113d 100644
--- a/x11/kactivitymanagerd/Makefile
+++ b/x11/kactivitymanagerd/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kactivitymanagerd
-PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
+PORTVERSION= ${KDE4_ACTIVITES_VERSION}
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DISTNAME= kactivities-${PORTVERSION}
@@ -11,7 +10,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Activity Manager daemon
-USE_KDE4= automoc4 kdehier kdelibs kdeprefix soprano nepomuk-core \
+USE_KDE4= automoc4 kdelibs kdeprefix soprano nepomuk-core \
kactivities
USES= cmake:outsource compiler:c++11-lib tar:xz
USE_QT4= declarative opengl script sql \
diff --git a/x11/kactivitymanagerd/pkg-descr b/x11/kactivitymanagerd/pkg-descr
index 2e025b7c05e8..a55db2790896 100644
--- a/x11/kactivitymanagerd/pkg-descr
+++ b/x11/kactivitymanagerd/pkg-descr
@@ -1,3 +1,3 @@
KDE activities library.
-WWW: http://www.kde.org
+WWW: http://www.kde.org
diff --git a/x11/kactivitymanagerd/pkg-plist b/x11/kactivitymanagerd/pkg-plist
index 6ba0218f09e2..1dc91894eade 100644
--- a/x11/kactivitymanagerd/pkg-plist
+++ b/x11/kactivitymanagerd/pkg-plist
@@ -20,6 +20,3 @@ share/kde4/services/kactivitymanagerd.desktop
share/kde4/services/kactivitymanagerd_fileitem_linking_plugin.desktop
share/kde4/services/kcm_activities.desktop
share/kde4/servicetypes/activitymanager-plugin.desktop
-@dirrm share/apps/activitymanager/workspace/settings
-@dirrm share/apps/activitymanager/workspace
-@dirrm share/apps/activitymanager
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index f5a621eb3583..688da8908a57 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -2,7 +2,6 @@
PORTNAME= kde-baseapps
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -13,9 +12,9 @@ COMMENT= Basic applications for KDE
LIB_DEPENDS= libtidy.so:${PORTSDIR}/www/tidy-lib
USE_GNOME= glib20
-USE_KDE4= kdehier kdelibs kdeprefix libkonq \
- automoc4 soprano strigi nepomuk-core \
- nepomuk-widgets kactivities
+USE_KDE4= kdelibs kdeprefix baloo baloo-widgets libkonq \
+ automoc4 soprano strigi nepomuk-core nepomuk-widgets \
+ kactivities
USES= cmake:outsource gettext tar:xz
USE_QT4= corelib dbus gui script xml \
moc_build qmake_build rcc_build uic_build
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 89a6397b038f..5017588bd7a5 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kde-baseapps-4.12.5.tar.xz) = 577f89eb4a0301f6e1e4efb6ee9f983c5b940e9effd0e540e58bc820fd36d078
-SIZE (KDE/4.12.5/kde-baseapps-4.12.5.tar.xz) = 2533496
+SHA256 (KDE/4.14.2/kde-baseapps-4.14.2.tar.xz) = dfe3728522be0d10b1b79f54fe06b26be89b62cc88025d394c5750a31a26defe
+SIZE (KDE/4.14.2/kde-baseapps-4.14.2.tar.xz) = 2548072
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 22d78d3e9499..f330d4a1f6c2 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -72,6 +72,7 @@ lib/libkonquerorprivate.so.4
lib/libkonquerorprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
man/man1/kbookmarkmerger.1.gz
man/man1/kfind.1.gz
+share/appdata/dolphin.appdata.xml
share/applications/kde4/Home.desktop
share/applications/kde4/dolphin.desktop
share/applications/kde4/kdepasswd.desktop
@@ -337,7 +338,12 @@ share/kde4/services/smb.desktop
share/kde4/services/useragent.desktop
share/kde4/services/useragentstrings/android10.desktop
share/kde4/services/useragentstrings/chrome10onwinnt51.desktop
+share/kde4/services/useragentstrings/chrome22oncurrent.desktop
+share/kde4/services/useragentstrings/chrome23oncurrent.desktop
+share/kde4/services/useragentstrings/chrome24oncurrent.desktop
share/kde4/services/useragentstrings/chrome50oncurrent.desktop
+share/kde4/services/useragentstrings/firefox15oncurrent.desktop
+share/kde4/services/useragentstrings/firefox16oncurrent.desktop
share/kde4/services/useragentstrings/firefox20oncurrent.desktop
share/kde4/services/useragentstrings/firefox30oncurrent.desktop
share/kde4/services/useragentstrings/firefox36oncurrent.desktop
@@ -348,12 +354,16 @@ share/kde4/services/useragentstrings/ie55onwinnt5.desktop
share/kde4/services/useragentstrings/ie60oncurrent.desktop
share/kde4/services/useragentstrings/ie60onwinnt51.desktop
share/kde4/services/useragentstrings/ie70onwinnt51.desktop
+share/kde4/services/useragentstrings/ie80onwinnt60.desktop
+share/kde4/services/useragentstrings/ie90onwinnt71.desktop
share/kde4/services/useragentstrings/lynxoncurrent.desktop
share/kde4/services/useragentstrings/nn301oncurrent.desktop
share/kde4/services/useragentstrings/nn475oncurrent.desktop
share/kde4/services/useragentstrings/nn475onwin95.desktop
share/kde4/services/useragentstrings/ns71oncurrent.desktop
share/kde4/services/useragentstrings/ns71onwinnt51.desktop
+share/kde4/services/useragentstrings/op1162oncurrent.desktop
+share/kde4/services/useragentstrings/op1202oncurrent.desktop
share/kde4/services/useragentstrings/op403onwinnt4.desktop
share/kde4/services/useragentstrings/op85oncurrent.desktop
share/kde4/services/useragentstrings/op90oncurrent.desktop
@@ -362,51 +372,11 @@ share/kde4/services/useragentstrings/safari20.desktop
share/kde4/services/useragentstrings/safari30oniphone.desktop
share/kde4/services/useragentstrings/safari32.desktop
share/kde4/services/useragentstrings/safari40.desktop
+share/kde4/services/useragentstrings/safari517.desktop
+share/kde4/services/useragentstrings/safari60.desktop
share/kde4/services/useragentstrings/w3moncurrent.desktop
share/kde4/services/useragentstrings/wgetoncurrent.desktop
share/kde4/services/webarchivethumbnail.desktop
share/kde4/servicetypes/fileviewversioncontrolplugin.desktop
share/kde4/servicetypes/konqaboutpage.desktop
share/kde4/servicetypes/uasprovider.desktop
-@dirrm share/kde4/services/useragentstrings
-@dirrm share/doc/HTML/en/konqueror
-@dirrm share/doc/HTML/en/kfind
-@dirrm share/doc/HTML/en/kdepasswd
-@dirrm share/doc/HTML/en/dolphin
-@dirrm share/apps/nsplugin
-@dirrmtry share/apps/kwebkitpart/kpartplugins
-@dirrmtry share/apps/kwebkitpart
-@dirrm share/apps/konqueror/profiles
-@dirrmtry share/apps/konqueror/pics
-@dirrm share/apps/konqueror/opensearch
-@dirrm share/apps/konqueror/kpartplugins
-@dirrm share/apps/konqueror/icons/oxygen/scalable/actions
-@dirrm share/apps/konqueror/icons/oxygen/scalable
-@dirrm share/apps/konqueror/icons/oxygen/64x64/actions
-@dirrm share/apps/konqueror/icons/oxygen/64x64
-@dirrm share/apps/konqueror/icons/oxygen/48x48/actions
-@dirrm share/apps/konqueror/icons/oxygen/48x48
-@dirrm share/apps/konqueror/icons/oxygen/32x32/actions
-@dirrm share/apps/konqueror/icons/oxygen/32x32
-@dirrm share/apps/konqueror/icons/oxygen/22x22/actions
-@dirrm share/apps/konqueror/icons/oxygen/22x22
-@dirrm share/apps/konqueror/icons/oxygen/16x16/actions
-@dirrm share/apps/konqueror/icons/oxygen/16x16
-@dirrm share/apps/konqueror/icons/oxygen
-@dirrm share/apps/konqueror/icons
-@dirrm share/apps/konqueror/about
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/plugins
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/keditbookmarks
-@dirrm share/apps/kcmcss
-@dirrm share/apps/fsview
-@dirrm share/apps/domtreeviewer
-@dirrmtry share/apps/dolphinpart/kpartplugins
-@dirrmtry share/apps/dolphinpart
-@dirrmtry share/apps/dolphin
-@dirrmtry share/apps/akregator/pics
-@dirrmtry share/apps/akregator
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index b9fb97a49bc1..5e62f83a93ab 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -2,7 +2,6 @@
PORTNAME= kde-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -23,7 +22,7 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
RUN_DEPENDS= cagibid:${PORTSDIR}/net/cagibi
-USE_KDE4= kactivities kdehier kdelibs kdeprefix oxygen \
+USE_KDE4= kactivities kdelibs kdeprefix oxygen \
attica automoc4 pimlibs strigi nepomuk-core
USES= cmake:outsource gettext gmake shared-mime-info shebangfix tar:xz
USE_QT4= corelib dbus declarative designer_build gui phonon \
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index bf9166a1e8f5..d96abd1dc82b 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kde-runtime-4.12.5.tar.xz) = b43e1aebd7e9dd13677f2205bb6eef7ee02a7085ae9fd34a39bad55d5df56fe7
-SIZE (KDE/4.12.5/kde-runtime-4.12.5.tar.xz) = 7856352
+SHA256 (KDE/4.14.2/kde-runtime-4.14.2.tar.xz) = 22bcced462b785b8e50b666101ecbec04a0135656842ef5718530da621342fec
+SIZE (KDE/4.14.2/kde-runtime-4.14.2.tar.xz) = 7867216
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index ba063a173920..22bbe6193417 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -131,7 +131,6 @@ lib/kde4/kcm_kded.so
lib/kde4/kcm_kdnssd.so
lib/kde4/kcm_knotify.so
lib/kde4/kcm_locale.so
-lib/kde4/kcm_nepomuk.so
lib/kde4/kcm_phonon.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
@@ -139,7 +138,6 @@ lib/kde4/kded_desktopnotifier.so
lib/kde4/kded_device_automounter.so
lib/kde4/kded_kpasswdserver.so
lib/kde4/kded_ktimezoned.so
-lib/kde4/kded_nepomuksearchmodule.so
lib/kde4/kded_networkstatus.so
lib/kde4/kded_networkwatcher.so
lib/kde4/kded_phononserver.so
@@ -159,8 +157,6 @@ lib/kde4/kio_fish.so
lib/kde4/kio_floppy.so
lib/kde4/kio_info.so
lib/kde4/kio_man.so
-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
@@ -168,9 +164,7 @@ lib/kde4/kio_remote.so
lib/kde4/kio_settings.so
lib/kde4/kio_sftp.so
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
lib/kde4/kshorturifilter.so
lib/kde4/kuriikwsfilter.so
@@ -271,8 +265,6 @@ lib/libmolletnetwork.so.4
lib/libmolletnetwork.so.%%KDE4_GENERIC_LIB_VERSION%%
man/man1/kdesu.1.gz
man/man1/plasmapkg.1.gz
-man/man8/nepomukserver.8.gz
-man/man8/nepomukservicestub.8.gz
share/applications/kde4/Help.desktop
share/applications/kde4/knetattach.desktop
share/apps/cmake/modules/FindCLucene.cmake
@@ -432,6 +424,7 @@ share/apps/kcmlocale/pics/background.png
share/apps/kconf_update/devicepreference.upd
share/apps/kconf_update/drkonqi-rename-config-section.upd
share/apps/kconf_update/kuriikwsfilter.upd
+share/apps/kconf_update/kwallet-4.13.upd
share/apps/kde/kde.notifyrc
share/apps/kglobalaccel/kglobalaccel.notifyrc
share/apps/khelpcenter/glossary.html.in
@@ -450,12 +443,16 @@ share/apps/khelpcenter/plugins/Manpages/man7.desktop
share/apps/khelpcenter/plugins/Manpages/man8.desktop
share/apps/khelpcenter/plugins/Scrollkeeper/.directory
share/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
+share/apps/khelpcenter/plugins/browsercontrolmodules.desktop
+share/apps/khelpcenter/plugins/filemanagercontrolmodules.desktop
share/apps/khelpcenter/plugins/fundamentals.desktop
share/apps/khelpcenter/plugins/info.desktop
share/apps/khelpcenter/plugins/kcontrolmodules.desktop
share/apps/khelpcenter/plugins/kicmodules.desktop
share/apps/khelpcenter/plugins/kioslaves.desktop
+share/apps/khelpcenter/plugins/konquerorcontrolmodules.desktop
share/apps/khelpcenter/plugins/onlinehelp.desktop
+share/apps/khelpcenter/plugins/othercontrolmodules.desktop
share/apps/khelpcenter/plugins/plasma.desktop
share/apps/khelpcenter/searchhandlers/docbook.desktop
share/apps/khelpcenter/searchhandlers/htdig.desktop
@@ -760,6 +757,9 @@ share/doc/HTML/en/kioslave/man/index.docbook
share/doc/HTML/en/kioslave/nepomuksearch/common
share/doc/HTML/en/kioslave/nepomuksearch/index.cache.bz2
share/doc/HTML/en/kioslave/nepomuksearch/index.docbook
+share/doc/HTML/en/kioslave/network/common
+share/doc/HTML/en/kioslave/network/index.cache.bz2
+share/doc/HTML/en/kioslave/network/index.docbook
share/doc/HTML/en/kioslave/nfs/common
share/doc/HTML/en/kioslave/nfs/index.cache.bz2
share/doc/HTML/en/kioslave/nfs/index.docbook
@@ -786,9 +786,6 @@ share/doc/HTML/en/knetattach/screenshot1.png
share/doc/HTML/en/knetattach/screenshot2.png
share/doc/HTML/en/knetattach/screenshot3.png
share/doc/HTML/en/knetattach/screenshot4.png
-share/doc/HTML/en/network/common
-share/doc/HTML/en/network/index.cache.bz2
-share/doc/HTML/en/network/index.docbook
share/doc/HTML/en/onlinehelp/common
share/doc/HTML/en/onlinehelp/index.cache.bz2
share/doc/HTML/en/onlinehelp/index.docbook
@@ -852,7 +849,6 @@ share/kde4/services/cgi.protocol
share/kde4/services/comicbookthumbnail.desktop
share/kde4/services/componentchooser.desktop
share/kde4/services/cursorthumbnail.desktop
-share/kde4/services/desktop-search.desktop
share/kde4/services/desktop.protocol
share/kde4/services/desktopthumbnail.desktop
share/kde4/services/device_automounter_kcm.desktop
@@ -873,7 +869,6 @@ share/kde4/services/info.protocol
share/kde4/services/jpegthumbnail.desktop
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/kcmcgi.desktop
share/kde4/services/kcmkded.desktop
@@ -883,7 +878,6 @@ share/kde4/services/kded/desktopnotifier.desktop
share/kde4/services/kded/device_automounter.desktop
share/kde4/services/kded/kpasswdserver.desktop
share/kde4/services/kded/ktimezoned.desktop
-share/kde4/services/kded/nepomuksearchmodule.desktop
share/kde4/services/kded/networkstatus.desktop
share/kde4/services/kded/networkwatcher.desktop
share/kde4/services/kded/phononserver.desktop
@@ -904,8 +898,6 @@ share/kde4/services/language.desktop
share/kde4/services/localdomainurifilter.desktop
share/kde4/services/lzma.protocol
share/kde4/services/man.protocol
-share/kde4/services/nepomuk.protocol
-share/kde4/services/nepomuksearch.protocol
share/kde4/services/network.protocol
share/kde4/services/nfs.protocol
share/kde4/services/plasma-containment-newspaper.desktop
@@ -1016,6 +1008,12 @@ share/kde4/services/searchproviders/php.desktop
share/kde4/services/searchproviders/python.desktop
share/kde4/services/searchproviders/qt.desktop
share/kde4/services/searchproviders/qt4.desktop
+share/kde4/services/searchproviders/qwant.desktop
+share/kde4/services/searchproviders/qwant_images.desktop
+share/kde4/services/searchproviders/qwant_news.desktop
+share/kde4/services/searchproviders/qwant_shopping.desktop
+share/kde4/services/searchproviders/qwant_social.desktop
+share/kde4/services/searchproviders/qwant_videos.desktop
share/kde4/services/searchproviders/rae.desktop
share/kde4/services/searchproviders/rag.desktop
share/kde4/services/searchproviders/rfc.desktop
@@ -1047,11 +1045,9 @@ share/kde4/services/sftp.protocol
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
-share/kde4/services/timeline.protocol
share/kde4/services/trash.protocol
share/kde4/services/windowsexethumbnail.desktop
share/kde4/services/windowsimagethumbnail.desktop
@@ -1822,377 +1818,3 @@ share/sounds/KDE-Window-Move-Stop.ogg
share/sounds/KDE-Window-Move.ogg
share/sounds/KDE-Window-Shade-Down.ogg
share/sounds/KDE-Window-Shade-Up.ogg
-@dirrm share/locale/l10n/zw
-@dirrm share/locale/l10n/zm
-@dirrm share/locale/l10n/za
-@dirrm share/locale/l10n/yt
-@dirrm share/locale/l10n/ye
-@dirrm share/locale/l10n/ws
-@dirrm share/locale/l10n/wf
-@dirrm share/locale/l10n/vu
-@dirrm share/locale/l10n/vn
-@dirrm share/locale/l10n/vi
-@dirrm share/locale/l10n/vg
-@dirrm share/locale/l10n/ve
-@dirrm share/locale/l10n/vc
-@dirrm share/locale/l10n/va
-@dirrm share/locale/l10n/uz
-@dirrm share/locale/l10n/uy
-@dirrm share/locale/l10n/us
-@dirrm share/locale/l10n/ug
-@dirrm share/locale/l10n/ua
-@dirrm share/locale/l10n/tz
-@dirrm share/locale/l10n/tw
-@dirrm share/locale/l10n/tv
-@dirrm share/locale/l10n/tt
-@dirrm share/locale/l10n/tr
-@dirrm share/locale/l10n/tp
-@dirrm share/locale/l10n/to
-@dirrm share/locale/l10n/tn
-@dirrm share/locale/l10n/tm
-@dirrm share/locale/l10n/tl
-@dirrm share/locale/l10n/tk
-@dirrm share/locale/l10n/tj
-@dirrm share/locale/l10n/th
-@dirrm share/locale/l10n/tg
-@dirrm share/locale/l10n/td
-@dirrm share/locale/l10n/tc
-@dirrm share/locale/l10n/sz
-@dirrm share/locale/l10n/sy
-@dirrm share/locale/l10n/sv
-@dirrm share/locale/l10n/st
-@dirrm share/locale/l10n/ss
-@dirrm share/locale/l10n/sr
-@dirrm share/locale/l10n/so
-@dirrm share/locale/l10n/sn
-@dirrm share/locale/l10n/sm
-@dirrm share/locale/l10n/sl
-@dirrm share/locale/l10n/sk
-@dirrm share/locale/l10n/si
-@dirrm share/locale/l10n/sh
-@dirrm share/locale/l10n/sg
-@dirrm share/locale/l10n/se
-@dirrm share/locale/l10n/sd
-@dirrm share/locale/l10n/sc
-@dirrm share/locale/l10n/sb
-@dirrm share/locale/l10n/sa
-@dirrm share/locale/l10n/rw
-@dirrm share/locale/l10n/ru
-@dirrm share/locale/l10n/rs
-@dirrm share/locale/l10n/ro
-@dirrm share/locale/l10n/re
-@dirrm share/locale/l10n/qa
-@dirrm share/locale/l10n/py
-@dirrm share/locale/l10n/pw
-@dirrm share/locale/l10n/pt
-@dirrm share/locale/l10n/ps
-@dirrm share/locale/l10n/pr
-@dirrm share/locale/l10n/pn
-@dirrm share/locale/l10n/pm
-@dirrm share/locale/l10n/pl
-@dirrm share/locale/l10n/pk
-@dirrm share/locale/l10n/ph
-@dirrm share/locale/l10n/pg
-@dirrm share/locale/l10n/pf
-@dirrm share/locale/l10n/pe
-@dirrm share/locale/l10n/pa
-@dirrm share/locale/l10n/om
-@dirrm share/locale/l10n/nz
-@dirrm share/locale/l10n/nu
-@dirrm share/locale/l10n/nr
-@dirrm share/locale/l10n/np
-@dirrm share/locale/l10n/no
-@dirrm share/locale/l10n/nl
-@dirrm share/locale/l10n/ni
-@dirrm share/locale/l10n/ng
-@dirrm share/locale/l10n/nf
-@dirrm share/locale/l10n/ne
-@dirrm share/locale/l10n/nc
-@dirrm share/locale/l10n/na
-@dirrm share/locale/l10n/mz
-@dirrm share/locale/l10n/my
-@dirrm share/locale/l10n/mx
-@dirrm share/locale/l10n/mw
-@dirrm share/locale/l10n/mv
-@dirrm share/locale/l10n/mu
-@dirrm share/locale/l10n/mt
-@dirrm share/locale/l10n/ms
-@dirrm share/locale/l10n/mr
-@dirrm share/locale/l10n/mq
-@dirrm share/locale/l10n/mp
-@dirrm share/locale/l10n/mo
-@dirrm share/locale/l10n/mn
-@dirrm share/locale/l10n/mm
-@dirrm share/locale/l10n/ml
-@dirrm share/locale/l10n/mk
-@dirrm share/locale/l10n/mh
-@dirrm share/locale/l10n/mg
-@dirrm share/locale/l10n/mf
-@dirrm share/locale/l10n/me
-@dirrm share/locale/l10n/md
-@dirrm share/locale/l10n/mc
-@dirrm share/locale/l10n/ma
-@dirrm share/locale/l10n/ly
-@dirrm share/locale/l10n/lv
-@dirrm share/locale/l10n/lu
-@dirrm share/locale/l10n/lt
-@dirrm share/locale/l10n/ls
-@dirrm share/locale/l10n/lr
-@dirrm share/locale/l10n/lk
-@dirrm share/locale/l10n/li
-@dirrm share/locale/l10n/lc
-@dirrm share/locale/l10n/lb
-@dirrm share/locale/l10n/la
-@dirrm share/locale/l10n/kz
-@dirrm share/locale/l10n/ky
-@dirrm share/locale/l10n/kw
-@dirrm share/locale/l10n/kr
-@dirrm share/locale/l10n/kp
-@dirrm share/locale/l10n/kn
-@dirrm share/locale/l10n/km
-@dirrm share/locale/l10n/ki
-@dirrm share/locale/l10n/kh
-@dirrm share/locale/l10n/kg
-@dirrm share/locale/l10n/ke
-@dirrm share/locale/l10n/jp
-@dirrm share/locale/l10n/jo
-@dirrm share/locale/l10n/jm
-@dirrm share/locale/l10n/je
-@dirrm share/locale/l10n/it
-@dirrm share/locale/l10n/is
-@dirrm share/locale/l10n/ir
-@dirrm share/locale/l10n/iq
-@dirrm share/locale/l10n/in
-@dirrm share/locale/l10n/im
-@dirrm share/locale/l10n/il
-@dirrm share/locale/l10n/ie
-@dirrm share/locale/l10n/id
-@dirrm share/locale/l10n/hu
-@dirrm share/locale/l10n/ht
-@dirrm share/locale/l10n/hr
-@dirrm share/locale/l10n/hn
-@dirrm share/locale/l10n/hk
-@dirrm share/locale/l10n/gy
-@dirrm share/locale/l10n/gw
-@dirrm share/locale/l10n/gu
-@dirrm share/locale/l10n/gt
-@dirrm share/locale/l10n/gr
-@dirrm share/locale/l10n/gq
-@dirrm share/locale/l10n/gp
-@dirrm share/locale/l10n/gn
-@dirrm share/locale/l10n/gm
-@dirrm share/locale/l10n/gl
-@dirrm share/locale/l10n/gi
-@dirrm share/locale/l10n/gh
-@dirrm share/locale/l10n/gg
-@dirrm share/locale/l10n/gf
-@dirrm share/locale/l10n/ge
-@dirrm share/locale/l10n/gd
-@dirrm share/locale/l10n/gb
-@dirrm share/locale/l10n/ga
-@dirrm share/locale/l10n/fr
-@dirrm share/locale/l10n/fo
-@dirrm share/locale/l10n/fm
-@dirrm share/locale/l10n/fk
-@dirrm share/locale/l10n/fj
-@dirrm share/locale/l10n/fi
-@dirrm share/locale/l10n/et
-@dirrm share/locale/l10n/es
-@dirrm share/locale/l10n/er
-@dirrm share/locale/l10n/eh
-@dirrm share/locale/l10n/eg
-@dirrm share/locale/l10n/ee
-@dirrm share/locale/l10n/ec
-@dirrm share/locale/l10n/dz
-@dirrm share/locale/l10n/do
-@dirrm share/locale/l10n/dm
-@dirrm share/locale/l10n/dk
-@dirrm share/locale/l10n/dj
-@dirrm share/locale/l10n/de
-@dirrm share/locale/l10n/cz
-@dirrm share/locale/l10n/cy
-@dirrm share/locale/l10n/cx
-@dirrm share/locale/l10n/cv
-@dirrm share/locale/l10n/cu
-@dirrm share/locale/l10n/cr
-@dirrm share/locale/l10n/co
-@dirrm share/locale/l10n/cn
-@dirrm share/locale/l10n/cm
-@dirrm share/locale/l10n/cl
-@dirrm share/locale/l10n/ck
-@dirrm share/locale/l10n/ci
-@dirrm share/locale/l10n/ch
-@dirrm share/locale/l10n/cg
-@dirrm share/locale/l10n/cf
-@dirrm share/locale/l10n/cd
-@dirrm share/locale/l10n/cc
-@dirrm share/locale/l10n/ca
-@dirrm share/locale/l10n/bz
-@dirrm share/locale/l10n/by
-@dirrm share/locale/l10n/bw
-@dirrm share/locale/l10n/bt
-@dirrm share/locale/l10n/bs
-@dirrm share/locale/l10n/br
-@dirrm share/locale/l10n/bo
-@dirrm share/locale/l10n/bn
-@dirrm share/locale/l10n/bm
-@dirrm share/locale/l10n/bl
-@dirrm share/locale/l10n/bj
-@dirrm share/locale/l10n/bi
-@dirrm share/locale/l10n/bh
-@dirrm share/locale/l10n/bg
-@dirrm share/locale/l10n/bf
-@dirrm share/locale/l10n/be
-@dirrm share/locale/l10n/bd
-@dirrm share/locale/l10n/bb
-@dirrm share/locale/l10n/ba
-@dirrm share/locale/l10n/az
-@dirrm share/locale/l10n/ax
-@dirrm share/locale/l10n/aw
-@dirrm share/locale/l10n/au
-@dirrm share/locale/l10n/at
-@dirrm share/locale/l10n/as
-@dirrm share/locale/l10n/ar
-@dirrm share/locale/l10n/ao
-@dirrm share/locale/l10n/an
-@dirrm share/locale/l10n/am
-@dirrm share/locale/l10n/al
-@dirrm share/locale/l10n/ai
-@dirrm share/locale/l10n/ag
-@dirrm share/locale/l10n/af
-@dirrm share/locale/l10n/ae
-@dirrm share/locale/l10n/ad
-@dirrm share/locale/l10n/C
-@dirrm share/locale/l10n
-@dirrm share/locale/currency
-@dirrm share/kde4/services/searchproviders
-@dirrm share/emoticons/kde4
-@dirrm share/doc/HTML/en/onlinehelp
-@dirrm share/doc/HTML/en/network
-@dirrm share/doc/HTML/en/knetattach
-@dirrm share/doc/HTML/en/kioslave/xz
-@dirrm share/doc/HTML/en/kioslave/thumbnail
-@dirrm share/doc/HTML/en/kioslave/tar
-@dirrm share/doc/HTML/en/kioslave/smb
-@dirrm share/doc/HTML/en/kioslave/sftp
-@dirrm share/doc/HTML/en/kioslave/nfs
-@dirrm share/doc/HTML/en/kioslave/nepomuksearch
-@dirrm share/doc/HTML/en/kioslave/man
-@dirrm share/doc/HTML/en/kioslave/info
-@dirrm share/doc/HTML/en/kioslave/gzip
-@dirrm share/doc/HTML/en/kioslave/floppy
-@dirrm share/doc/HTML/en/kioslave/fish
-@dirrm share/doc/HTML/en/kioslave/finger
-@dirrm share/doc/HTML/en/kioslave/cgi
-@dirrm share/doc/HTML/en/kioslave/bzip2
-@dirrm share/doc/HTML/en/kioslave/bookmarks
-@dirrm share/doc/HTML/en/khelpcenter/glossary
-@dirrm share/doc/HTML/en/khelpcenter/documentationnotfound
-@dirrm share/doc/HTML/en/khelpcenter
-@dirrm share/doc/HTML/en/kdesu
-@dirrm share/doc/HTML/en/kdebugdialog
-@dirrm share/doc/HTML/en/kcontrol/useragent
-@dirrm share/doc/HTML/en/kcontrol/trash
-@dirrm share/doc/HTML/en/kcontrol/spellchecking
-@dirrm share/doc/HTML/en/kcontrol/solid-device-automounter
-@dirrm share/doc/HTML/en/kcontrol/smb
-@dirrm share/doc/HTML/en/kcontrol/proxy
-@dirrm share/doc/HTML/en/kcontrol/phonon
-@dirrm share/doc/HTML/en/kcontrol/performance
-@dirrm share/doc/HTML/en/kcontrol/netpref
-@dirrm share/doc/HTML/en/kcontrol/nepomuk
-@dirrm share/doc/HTML/en/kcontrol/language
-@dirrm share/doc/HTML/en/kcontrol/khtml-plugins
-@dirrm share/doc/HTML/en/kcontrol/khtml-java-js
-@dirrm share/doc/HTML/en/kcontrol/khtml-general
-@dirrm share/doc/HTML/en/kcontrol/khtml-behavior
-@dirrm share/doc/HTML/en/kcontrol/khtml-adblock
-@dirrm share/doc/HTML/en/kcontrol/kded
-@dirrm share/doc/HTML/en/kcontrol/kcmnotify
-@dirrm share/doc/HTML/en/kcontrol/kcmlaunch
-@dirrm share/doc/HTML/en/kcontrol/kcmcss
-@dirrm share/doc/HTML/en/kcontrol/kcmcgi
-@dirrm share/doc/HTML/en/kcontrol/kcm_ssl
-@dirrm share/doc/HTML/en/kcontrol/icons
-@dirrm share/doc/HTML/en/kcontrol/history
-@dirrm share/doc/HTML/en/kcontrol/filetypes
-@dirrm share/doc/HTML/en/kcontrol/filemanager
-@dirrm share/doc/HTML/en/kcontrol/emoticons
-@dirrm share/doc/HTML/en/kcontrol/ebrowsing
-@dirrm share/doc/HTML/en/kcontrol/cookies
-@dirrm share/doc/HTML/en/kcontrol/componentchooser
-@dirrm share/doc/HTML/en/kcontrol/cache
-@dirrm share/doc/HTML/en/kcontrol/bookmarks
-@dirrm share/doc/HTML/en/kcontrol/attica
-@dirrm share/doc/HTML/en/fundamentals
-@dirrmtry share/desktop-directories
-@dirrm share/apps/phonon
-@dirrm share/apps/libphonon
-@dirrm share/apps/kwalletd
-@dirrm share/apps/ksmserver/windowmanagers
-@dirrmtry share/apps/ksmserver
-@dirrm share/apps/konqueror/dirtree/remote
-@dirrm share/apps/konqueror/dirtree
-@dirrmtry share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/kio_info
-@dirrm share/apps/kio_finger
-@dirrm share/apps/kio_docfilter
-@dirrm share/apps/kio_desktop/DesktopLinks
-@dirrm share/apps/kio_desktop
-@dirrm share/apps/kio_bookmarks
-@dirrm share/apps/khelpcenter/searchhandlers/htdig
-@dirrm share/apps/khelpcenter/searchhandlers
-@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
-@dirrm share/apps/khelpcenter/plugins/Manpages
-@dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/kglobalaccel
-@dirrm share/apps/kde
-@dirrm share/apps/kcmlocale/pics
-@dirrm share/apps/kcmlocale
-@dirrm share/apps/kcm_phonon
-@dirrm share/apps/hardwarenotifications
-@dirrm share/apps/drkonqi/pics
-@dirrm share/apps/drkonqi/debuggers/internal
-@dirrm share/apps/drkonqi/debuggers/external
-@dirrm share/apps/drkonqi/debuggers
-@dirrm share/apps/drkonqi
-@dirrm share/apps/desktoptheme/oxygen/widgets
-@dirrm share/apps/desktoptheme/oxygen/opaque/widgets
-@dirrm share/apps/desktoptheme/oxygen/opaque/dialogs
-@dirrm share/apps/desktoptheme/oxygen/opaque
-@dirrm share/apps/desktoptheme/oxygen/dialogs
-@dirrmtry share/apps/desktoptheme/oxygen
-@dirrm share/apps/desktoptheme/default/translucent/widgets
-@dirrm share/apps/desktoptheme/default/translucent/dialogs
-@dirrm share/apps/desktoptheme/default/translucent
-@dirrm share/apps/desktoptheme/default/toolbar-icons
-@dirrm share/apps/desktoptheme/default/opaque/widgets
-@dirrm share/apps/desktoptheme/default/opaque/dialogs
-@dirrm share/apps/desktoptheme/default/opaque
-@dirrm share/apps/desktoptheme/default/icons
-@dirrm share/apps/desktoptheme/default/dialogs
-@dirrm share/apps/desktoptheme/appdashboard/widgets
-@dirrm share/apps/desktoptheme/appdashboard
-@dirrm lib/kde4/plugins/phonon_platform
-@dirrm lib/kde4/platformimports/touch/org/kde/plasma/components/private
-@dirrm lib/kde4/platformimports/touch/org/kde/plasma/components
-@dirrm lib/kde4/platformimports/touch/org/kde/plasma
-@dirrm lib/kde4/platformimports/touch/org/kde
-@dirrm lib/kde4/platformimports/touch/org
-@dirrm lib/kde4/platformimports/touch
-@dirrm lib/kde4/platformimports
-@dirrm lib/kde4/imports/org/kde/runnermodel
-@dirrm lib/kde4/imports/org/kde/qtextracomponents
-@dirrm lib/kde4/imports/org/kde/plasma/graphicswidgets
-@dirrm lib/kde4/imports/org/kde/plasma/graphicslayouts
-@dirrm lib/kde4/imports/org/kde/plasma/extras/animations
-@dirrm lib/kde4/imports/org/kde/plasma/extras
-@dirrm lib/kde4/imports/org/kde/plasma/core
-@dirrm lib/kde4/imports/org/kde/plasma/components/private
-@dirrm lib/kde4/imports/org/kde/plasma/components
-@dirrm lib/kde4/imports/org/kde/plasma
-@dirrm lib/kde4/imports/org/kde/locale
-@dirrm lib/kde4/imports/org/kde/draganddrop
-@dirrm lib/kde4/imports/org/kde/dirmodel
-@dirrmtry etc/xdg/menus
-@dirrmtry etc/xdg
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 05bf11d29140..27b3c08df361 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -2,7 +2,6 @@
PORTNAME= kde-workspace
PORTVERSION= ${KDE4_WORKSPACE_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -43,8 +42,8 @@ RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \
USE_GL= glu
USE_GNOME= glib20
-USE_KDE4= kactivities kdehier kdelibs kdeprefix oxygen pimlibs \
- akonadi automoc4 ontologies qimageblitz soprano strigi
+USE_KDE4= kactivities kdelibs kdeprefix nepomuk-core oxygen \
+ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi
USES= cmake:outsource compiler:c++11-lib gettext gmake iconv \
pkgconfig tar:xz
USE_QT4= corelib dbus declarative designer_build gui network \
@@ -54,7 +53,6 @@ USE_XORG= kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \
xft xi xinerama xkbfile xrandr xrender xres xscrnsaver xtst
USE_LDCONFIG= yes
-# Xmms and Googlegadgets could be enabled.
CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \
-DBUILD_python:BOOL=OFF \
-DBUILD_ruby:BOOL=OFF \
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index d47d637b03c2..699b3a7cf1fa 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.11.9/kde-workspace-4.11.9.tar.xz) = aa3d12a264e7fcb6c1330e800b9c7d43c00277275d182824d42f9fe1def0c0cf
-SIZE (KDE/4.11.9/kde-workspace-4.11.9.tar.xz) = 13536252
+SHA256 (KDE/4.11.13/kde-workspace-4.11.13.tar.xz) = 80b916d49713e75250b2bd3358d0c0b062ba80b671311866ee1955e2f91a2201
+SIZE (KDE/4.11.13/kde-workspace-4.11.13.tar.xz) = 13536880
diff --git a/x11/kde4-workspace/files/patch-git1724800 b/x11/kde4-workspace/files/patch-git1724800
deleted file mode 100644
index 0f38887872a2..000000000000
--- a/x11/kde4-workspace/files/patch-git1724800
+++ /dev/null
@@ -1,33 +0,0 @@
-commit e1724800ecf3c6a7035dfa7bcaa50b2a8f48688f
-Author: David Faure <faure@kde.org>
-Date: Fri May 2 10:26:38 2014 +0200
-
- Fix crash when DesktopNames isn't set
-
- BUG: 334159
- FIXED-IN: 4.11.10
-
-diff --git a/kdm/backend/client.c b/kdm/backend/client.c
-index 335cc3e..a2d06c2 100644
---- ./kdm/backend/client.c
-+++ ./kdm/backend/client.c
-@@ -1810,12 +1810,14 @@ startClient(volatile int *pid)
- !(sessargs = iniEntry(str, "Desktop Entry", "Exec", 0)))
- sessargs = "";
- buf = iniEntry(str, "Desktop Entry", "DesktopNames", 0);
-- for (buf2 = buf; *buf2; ++buf2) {
-- if (*buf2 == ';')
-- *buf2 = ':';
-+ if (buf) {
-+ for (buf2 = buf; *buf2; ++buf2) {
-+ if (*buf2 == ';')
-+ *buf2 = ':';
-+ }
-+ userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
-+ free(buf);
- }
-- userEnviron = setEnv(userEnviron, "XDG_CURRENT_DESKTOP", buf);
-- free(buf);
- free(str);
- free(fname);
- goto gotit;
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 1025ca3a94d7..b422d272ba51 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -593,6 +593,7 @@ share/apps/kdm/sessions/qvwm.desktop
share/apps/kdm/sessions/ratpoison.desktop
share/apps/kdm/sessions/sapphire.desktop
share/apps/kdm/sessions/sawfish.desktop
+share/apps/kdm/sessions/subtle.desktop
share/apps/kdm/sessions/twm.desktop
share/apps/kdm/sessions/ude.desktop
share/apps/kdm/sessions/vtwm.desktop
@@ -1178,9 +1179,6 @@ share/doc/HTML/en/kcontrol/solid-actions/edit-action.png
share/doc/HTML/en/kcontrol/solid-actions/index.cache.bz2
share/doc/HTML/en/kcontrol/solid-actions/index.docbook
share/doc/HTML/en/kcontrol/solid-actions/main.png
-share/doc/HTML/en/kcontrol/solid-hardware/common
-share/doc/HTML/en/kcontrol/solid-hardware/index.cache.bz2
-share/doc/HTML/en/kcontrol/solid-hardware/index.docbook
share/doc/HTML/en/kcontrol/splashscreen/common
share/doc/HTML/en/kcontrol/splashscreen/get-new-theme.png
share/doc/HTML/en/kcontrol/splashscreen/index.cache.bz2
@@ -2124,341 +2122,3 @@ share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy
share/sounds/pop.wav
share/wallpapers/stripes.png
share/wallpapers/stripes.png.desktop
-@dirrm share/kde4/services/kwin
-@dirrm share/icons/Oxygen_Zion/cursors
-@dirrm share/icons/Oxygen_Zion
-@dirrm share/icons/Oxygen_Yellow/cursors
-@dirrm share/icons/Oxygen_Yellow
-@dirrm share/icons/Oxygen_White/cursors
-@dirrm share/icons/Oxygen_White
-@dirrm share/icons/Oxygen_Blue/cursors
-@dirrm share/icons/Oxygen_Blue
-@dirrm share/icons/Oxygen_Black/cursors
-@dirrm share/icons/Oxygen_Black
-@dirrm share/icons/KDE_Classic/cursors
-@dirrm share/icons/KDE_Classic
-@dirrm share/doc/HTML/en/systemsettings
-@dirrm share/doc/HTML/en/plasma-desktop
-@dirrm share/doc/HTML/en/ksysguard
-@dirrm share/doc/HTML/en/kmenuedit
-@dirrm share/doc/HTML/en/klipper
-@dirrm share/doc/HTML/en/kinfocenter
-@dirrm share/doc/HTML/en/kfontview
-@dirrm share/doc/HTML/en/kdm
-@dirrm share/doc/HTML/en/kcontrol/workspaceoptions
-@dirrm share/doc/HTML/en/kcontrol/windowspecific
-@dirrm share/doc/HTML/en/kcontrol/windowbehaviour
-@dirrm share/doc/HTML/en/kcontrol/splashscreen
-@dirrm share/doc/HTML/en/kcontrol/solid-hardware
-@dirrm share/doc/HTML/en/kcontrol/solid-actions
-@dirrm share/doc/HTML/en/kcontrol/screensaver
-@dirrm share/doc/HTML/en/kcontrol/powerdevil
-@dirrm share/doc/HTML/en/kcontrol/paths
-@dirrm share/doc/HTML/en/kcontrol/mouse
-@dirrm share/doc/HTML/en/kcontrol/kwintabbox
-@dirrm share/doc/HTML/en/kcontrol/kwinscreenedges
-@dirrm share/doc/HTML/en/kcontrol/kwindecoration
-@dirrm share/doc/HTML/en/kcontrol/kwincompositing
-@dirrm share/doc/HTML/en/kcontrol/khotkeys
-@dirrm share/doc/HTML/en/kcontrol/keys
-@dirrm share/doc/HTML/en/kcontrol/keyboard
-@dirrm share/doc/HTML/en/kcontrol/kcmstyle
-@dirrm share/doc/HTML/en/kcontrol/kcmsmserver
-@dirrm share/doc/HTML/en/kcontrol/kcmaccess
-@dirrm share/doc/HTML/en/kcontrol/joystick
-@dirrm share/doc/HTML/en/kcontrol/fonts
-@dirrm share/doc/HTML/en/kcontrol/fontinst
-@dirrm share/doc/HTML/en/kcontrol/desktopthemedetails
-@dirrm share/doc/HTML/en/kcontrol/desktop
-@dirrm share/doc/HTML/en/kcontrol/cursortheme
-@dirrm share/doc/HTML/en/kcontrol/colors
-@dirrm share/doc/HTML/en/kcontrol/clock
-@dirrm share/doc/HTML/en/kcontrol/bell
-@dirrm share/doc/HTML/en/kcontrol/autostart
-@dirrm share/apps/systemsettings/classic
-@dirrm share/apps/systemsettings
-@dirrm share/apps/solid/devices
-@dirrm share/apps/powerdevil
-@dirrm share/apps/plasma/shareprovider/wstaw/contents/code
-@dirrm share/apps/plasma/shareprovider/wstaw/contents
-@dirrm share/apps/plasma/shareprovider/wstaw
-@dirrm share/apps/plasma/shareprovider/wklej/contents/code
-@dirrm share/apps/plasma/shareprovider/wklej/contents
-@dirrm share/apps/plasma/shareprovider/wklej
-@dirrm share/apps/plasma/shareprovider/simplestimagehosting/contents/code
-@dirrm share/apps/plasma/shareprovider/simplestimagehosting/contents
-@dirrm share/apps/plasma/shareprovider/simplestimagehosting
-@dirrm share/apps/plasma/shareprovider/privatepastecom/contents/code
-@dirrm share/apps/plasma/shareprovider/privatepastecom/contents
-@dirrm share/apps/plasma/shareprovider/privatepastecom
-@dirrm share/apps/plasma/shareprovider/pasteubuntucom/contents/code
-@dirrm share/apps/plasma/shareprovider/pasteubuntucom/contents
-@dirrm share/apps/plasma/shareprovider/pasteubuntucom
-@dirrm share/apps/plasma/shareprovider/pasteopensuseorg/contents/code
-@dirrm share/apps/plasma/shareprovider/pasteopensuseorg/contents
-@dirrm share/apps/plasma/shareprovider/pasteopensuseorg
-@dirrm share/apps/plasma/shareprovider/pastebincom/contents/code
-@dirrm share/apps/plasma/shareprovider/pastebincom/contents
-@dirrm share/apps/plasma/shareprovider/pastebincom
-@dirrm share/apps/plasma/shareprovider/kde/contents/code
-@dirrm share/apps/plasma/shareprovider/kde/contents
-@dirrm share/apps/plasma/shareprovider/kde
-@dirrm share/apps/plasma/shareprovider/imgur/contents/code
-@dirrm share/apps/plasma/shareprovider/imgur/contents
-@dirrm share/apps/plasma/shareprovider/imgur
-@dirrm share/apps/plasma/shareprovider/imgsusepasteorg/contents/code
-@dirrm share/apps/plasma/shareprovider/imgsusepasteorg/contents
-@dirrm share/apps/plasma/shareprovider/imgsusepasteorg
-@dirrm share/apps/plasma/shareprovider/im9/contents/code
-@dirrm share/apps/plasma/shareprovider/im9/contents
-@dirrm share/apps/plasma/shareprovider/im9
-@dirrmtry share/apps/plasma/shareprovider
-@dirrm share/apps/plasma/plasmoids/org.kde.showActivityManager/contents/ui
-@dirrm share/apps/plasma/plasmoids/org.kde.showActivityManager/contents
-@dirrm share/apps/plasma/plasmoids/org.kde.showActivityManager
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui/NotificationDelegate
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch/ui
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications/platformcontents/touch
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications/platformcontents
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications/contents/ui/NotificationDelegate
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications/contents/ui
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications/contents/config
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications/contents
-@dirrm share/apps/plasma/plasmoids/org.kde.notifications
-@dirrm share/apps/plasma/plasmoids/notifier/contents/ui
-@dirrm share/apps/plasma/plasmoids/notifier/contents/config
-@dirrm share/apps/plasma/plasmoids/notifier/contents
-@dirrm share/apps/plasma/plasmoids/notifier
-@dirrm share/apps/plasma/plasmoids/lockout/contents/ui
-@dirrm share/apps/plasma/plasmoids/lockout/contents/config
-@dirrm share/apps/plasma/plasmoids/lockout/contents
-@dirrm share/apps/plasma/plasmoids/lockout
-@dirrm share/apps/plasma/plasmoids/battery/contents/ui
-@dirrm share/apps/plasma/plasmoids/battery/contents/config
-@dirrm share/apps/plasma/plasmoids/battery/contents/code
-@dirrm share/apps/plasma/plasmoids/battery/contents
-@dirrm share/apps/plasma/plasmoids/battery
-@dirrm share/apps/plasma/packages/org.kde.systemtray/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.systemtray/contents/code
-@dirrm share/apps/plasma/packages/org.kde.systemtray/contents
-@dirrm share/apps/plasma/packages/org.kde.systemtray
-@dirrm share/apps/plasma/packages/org.kde.plasma.tasks/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.plasma.tasks/contents/code
-@dirrm share/apps/plasma/packages/org.kde.plasma.tasks/contents
-@dirrm share/apps/plasma/packages/org.kde.plasma.tasks
-@dirrm share/apps/plasma/packages/org.kde.pager/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.pager/contents
-@dirrm share/apps/plasma/packages/org.kde.pager
-@dirrm share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.desktop.widgetexplorer/contents
-@dirrm share/apps/plasma/packages/org.kde.desktop.widgetexplorer
-@dirrm share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui
-@dirrm share/apps/plasma/packages/org.kde.desktop.activitymanager/contents
-@dirrm share/apps/plasma/packages/org.kde.desktop.activitymanager
-@dirrmtry share/apps/plasma/packages
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity/contents
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/contents
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons/contents
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.desktopIcons
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL/contents
-@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.SaL
-@dirrm share/apps/plasma/layout-templates
-@dirrm share/apps/plasma/dashboard/button
-@dirrm share/apps/plasma/dashboard/AppleClasses
-@dirrm share/apps/plasma/dashboard
-@dirrmtry share/apps/plasma-netbook/init
-@dirrmtry share/apps/plasma-netbook
-@dirrmtry share/apps/plasma-desktop/updates
-@dirrmtry share/apps/plasma-desktop/init
-@dirrmtry share/apps/plasma-desktop
-@dirrm share/apps/kwrited
-@dirrm share/apps/kwin/tabbox/window_strip/contents/ui
-@dirrm share/apps/kwin/tabbox/window_strip/contents
-@dirrm share/apps/kwin/tabbox/window_strip
-@dirrm share/apps/kwin/tabbox/thumbnails/contents/ui
-@dirrm share/apps/kwin/tabbox/thumbnails/contents
-@dirrm share/apps/kwin/tabbox/thumbnails
-@dirrm share/apps/kwin/tabbox/text/contents/ui
-@dirrm share/apps/kwin/tabbox/text/contents
-@dirrm share/apps/kwin/tabbox/text
-@dirrm share/apps/kwin/tabbox/small_icons/contents/ui
-@dirrm share/apps/kwin/tabbox/small_icons/contents
-@dirrm share/apps/kwin/tabbox/small_icons
-@dirrm share/apps/kwin/tabbox/present_windows/contents/ui
-@dirrm share/apps/kwin/tabbox/present_windows/contents
-@dirrm share/apps/kwin/tabbox/present_windows
-@dirrm share/apps/kwin/tabbox/informative/contents/ui
-@dirrm share/apps/kwin/tabbox/informative/contents
-@dirrm share/apps/kwin/tabbox/informative
-@dirrm share/apps/kwin/tabbox/compact/contents/ui
-@dirrm share/apps/kwin/tabbox/compact/contents
-@dirrm share/apps/kwin/tabbox/compact
-@dirrm share/apps/kwin/tabbox/big_icons/contents/ui
-@dirrm share/apps/kwin/tabbox/big_icons/contents
-@dirrm share/apps/kwin/tabbox/big_icons
-@dirrm share/apps/kwin/tabbox
-@dirrm share/apps/kwin/shaders/1.40
-@dirrm share/apps/kwin/shaders/1.10
-@dirrm share/apps/kwin/shaders
-@dirrm share/apps/kwin/scripts/videowall/contents/code
-@dirrm share/apps/kwin/scripts/videowall/contents
-@dirrm share/apps/kwin/scripts/videowall
-@dirrm share/apps/kwin/scripts/synchronizeskipswitcher/contents/code
-@dirrm share/apps/kwin/scripts/synchronizeskipswitcher/contents
-@dirrm share/apps/kwin/scripts/synchronizeskipswitcher
-@dirrm share/apps/kwin/scripts/desktopchangeosd/contents/ui
-@dirrm share/apps/kwin/scripts/desktopchangeosd/contents
-@dirrm share/apps/kwin/scripts/desktopchangeosd
-@dirrm share/apps/kwin/scripts
-@dirrm share/apps/kwin/kcm_kwintabbox
-@dirrm share/apps/kwin/kcm_kwindecoration
-@dirrm share/apps/kwin/effects/presentwindows
-@dirrm share/apps/kwin/effects/kwin4_effect_translucency/contents/ui
-@dirrm share/apps/kwin/effects/kwin4_effect_translucency/contents/config
-@dirrm share/apps/kwin/effects/kwin4_effect_translucency/contents/code
-@dirrm share/apps/kwin/effects/kwin4_effect_translucency/contents
-@dirrm share/apps/kwin/effects/kwin4_effect_translucency
-@dirrm share/apps/kwin/effects/kwin4_effect_scalein/contents/code
-@dirrm share/apps/kwin/effects/kwin4_effect_scalein/contents
-@dirrm share/apps/kwin/effects/kwin4_effect_scalein
-@dirrm share/apps/kwin/effects/kwin4_effect_maximize/contents/code
-@dirrm share/apps/kwin/effects/kwin4_effect_maximize/contents
-@dirrm share/apps/kwin/effects/kwin4_effect_maximize
-@dirrm share/apps/kwin/effects/kwin4_effect_login/contents/ui
-@dirrm share/apps/kwin/effects/kwin4_effect_login/contents/config
-@dirrm share/apps/kwin/effects/kwin4_effect_login/contents/code
-@dirrm share/apps/kwin/effects/kwin4_effect_login/contents
-@dirrm share/apps/kwin/effects/kwin4_effect_login
-@dirrm share/apps/kwin/effects/kwin4_effect_fadedesktop/contents/code
-@dirrm share/apps/kwin/effects/kwin4_effect_fadedesktop/contents
-@dirrm share/apps/kwin/effects/kwin4_effect_fadedesktop
-@dirrm share/apps/kwin/effects/kwin4_effect_fade/contents/config
-@dirrm share/apps/kwin/effects/kwin4_effect_fade/contents/code
-@dirrm share/apps/kwin/effects/kwin4_effect_fade/contents
-@dirrm share/apps/kwin/effects/kwin4_effect_fade
-@dirrm share/apps/kwin/effects/kwin4_effect_dialogparent/contents/code
-@dirrm share/apps/kwin/effects/kwin4_effect_dialogparent/contents
-@dirrm share/apps/kwin/effects/kwin4_effect_dialogparent
-@dirrm share/apps/kwin/effects/desktopgrid
-@dirrm share/apps/kwin/effects
-@dirrm share/apps/kwin/desktoptabbox/previews/contents/ui
-@dirrm share/apps/kwin/desktoptabbox/previews/contents
-@dirrm share/apps/kwin/desktoptabbox/previews
-@dirrm share/apps/kwin/desktoptabbox/informative/contents/ui
-@dirrm share/apps/kwin/desktoptabbox/informative/contents
-@dirrm share/apps/kwin/desktoptabbox/informative
-@dirrm share/apps/kwin/desktoptabbox
-@dirrm share/apps/kwin/default_rules
-@dirrm share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/ui
-@dirrm share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents/config
-@dirrm share/apps/kwin/decorations/kwin4_decoration_qml_plastik/contents
-@dirrm share/apps/kwin/decorations/kwin4_decoration_qml_plastik
-@dirrm share/apps/kwin/decorations
-@dirrm share/apps/kwin/aurorae
-@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
-@dirrm share/apps/kthememanager/themes/YellowOnBlue
-@dirrm share/apps/kthememanager/themes/Sunshine
-@dirrm share/apps/kthememanager/themes/Redmond
-@dirrm share/apps/kthememanager/themes/Platinum
-@dirrm share/apps/kthememanager/themes/Plastik
-@dirrm share/apps/kthememanager/themes/Keramik
-@dirrm share/apps/kthememanager/themes/KDE_Classic
-@dirrm share/apps/kthememanager/themes/HighContrastLight-big
-@dirrm share/apps/kthememanager/themes/HighContrastLight
-@dirrm share/apps/kthememanager/themes/HighContrastDark-big
-@dirrm share/apps/kthememanager/themes/HighContrastDark
-@dirrm share/apps/kthememanager/themes
-@dirrm share/apps/kthememanager
-@dirrm share/apps/ksysguard/scripts/smaps
-@dirrm share/apps/ksysguard/scripts
-@dirrm share/apps/ksysguard
-@dirrm share/apps/ksplash/Themes/SimpleSmall
-@dirrm share/apps/ksplash/Themes/Simple
-@dirrm share/apps/ksplash/Themes/None
-@dirrm share/apps/ksplash/Themes/Minimalistic/images
-@dirrm share/apps/ksplash/Themes/Minimalistic
-@dirrmtry share/apps/ksplash/Themes
-@dirrmtry share/apps/ksplash
-@dirrm share/apps/ksmserver/themes/default
-@dirrm share/apps/ksmserver/themes/contour
-@dirrm share/apps/ksmserver/themes
-@dirrm share/apps/ksmserver/screenlocker/org.kde.passworddialog/contents/ui
-@dirrm share/apps/ksmserver/screenlocker/org.kde.passworddialog/contents
-@dirrm share/apps/ksmserver/screenlocker/org.kde.passworddialog
-@dirrm share/apps/ksmserver/screenlocker
-@dirrmtry share/apps/ksmserver
-@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
-@dirrm share/apps/kmenuedit/icons/hicolor/32x32
-@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
-@dirrm share/apps/kmenuedit/icons/hicolor/22x22
-@dirrm share/apps/kmenuedit/icons/hicolor
-@dirrm share/apps/kmenuedit/icons
-@dirrm share/apps/kmenuedit
-@dirrm share/apps/kinfocenter
-@dirrm share/apps/khotkeys
-@dirrm share/apps/kfontview
-@dirrm share/apps/kfontinst/icons/oxygen/scalable/actions
-@dirrm share/apps/kfontinst/icons/oxygen/scalable
-@dirrm share/apps/kfontinst/icons/oxygen/22x22/actions
-@dirrm share/apps/kfontinst/icons/oxygen/22x22
-@dirrm share/apps/kfontinst/icons/oxygen/16x16/actions
-@dirrm share/apps/kfontinst/icons/oxygen/16x16
-@dirrm share/apps/kfontinst/icons/oxygen
-@dirrm share/apps/kfontinst/icons
-@dirrm share/apps/kfontinst
-@dirrm share/apps/kdm/themes/oxygen-air
-@dirrm share/apps/kdm/themes/oxygen
-@dirrm share/apps/kdm/themes/horos
-@dirrm share/apps/kdm/themes/elarun
-@dirrm share/apps/kdm/themes/circles
-@dirrm share/apps/kdm/themes/ariya
-@dirrmtry share/apps/kdm/themes
-@dirrm share/apps/kdm/sessions
-@dirrm share/apps/kdm/programs
-@dirrm share/apps/kdm/patterns
-@dirrm share/apps/kdisplay/app-defaults
-@dirrm share/apps/kdisplay
-@dirrm share/apps/kcmusb
-@dirrm share/apps/kcmstyle
-@dirrm share/apps/kcmsolidactions
-@dirrm share/apps/kcmkeys
-@dirrm share/apps/kcmkeyboard/pics
-@dirrm share/apps/kcmkeyboard
-@dirrm share/apps/kcminput/pics
-@dirrm share/apps/kcminput
-@dirrm share/apps/kaccess
-@dirrm share/apps/freespacenotifier
-@dirrm share/apps/doc/kdm
-@dirrm share/apps/doc
-@dirrm share/apps/desktoptheme/default/system-monitor
-@dirrm share/apps/desktoptheme/default/calendar
-@dirrm share/apps/desktoptheme/air-netbook/widgets
-@dirrm share/apps/desktoptheme/air-netbook
-@dirrm lib/kde4/plugins/gui_platform
-@dirrm lib/kde4/imports/org/kde/kwin/decorations/plastik
-@dirrm lib/kde4/imports/org/kde/kwin/decorations
-@dirrm lib/kde4/imports/org/kde/kwin/decoration
-@dirrm lib/kde4/imports/org/kde/kwin
-@dirrm lib/cmake/KDE4Workspace
-@dirrmtry lib/cmake
-@dirrm include/taskmanager
-@dirrm include/systemsettingsview
-@dirrm include/plasmaclock
-@dirrm include/plasma/weather
-@dirrm include/plasma/geolocation
-@dirrmtry include/plasma
-@dirrm include/kworkspace
-@dirrm include/ksysguard
-@dirrm include/ksgrd
-@dirrm include/KDE/Plasma/Weather
-@dirrmtry include/KDE/Plasma
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 2d2dccd00cfc..11d46a316bff 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -3,7 +3,6 @@
PORTNAME= kde
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
DISTFILES= # none
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 4b4ad7f3d0e9..c5a6b0fffe98 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,7 +3,6 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 5
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -35,7 +34,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol
${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
USE_GNOME= libxml2 libxslt
-USE_KDE4= kdehier kdeprefix oxygen \
+USE_KDE4= kdeprefix oxygen \
attica automoc4 ontologies soprano strigi
USES= cmake:outsource fam gettext perl5 shared-mime-info shebangfix tar:xz
USE_OPENSSL= yes
@@ -61,6 +60,8 @@ SHEBANG_FILES= kdecore/kconfig_compiler/checkkcfg.pl \
kdeui/preparetips \
khtml/bindings/scripts/generate-bindings.pl \
kio/misc/fileshareset \
+ kio/useragent.pl \
+ kio/proxytype.pl \
kioslave/http/kcookiejar/kcookiescfg.pl
OPTIONS_DEFAULT= MDNSRESPONDER
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index ad6d098fd98d..3b242de411f1 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kdelibs-4.12.5.tar.xz) = 9711c3a3d29387dc8b40425cc2957e9f1f2d747d83e9e0213bb8ff6638e68e09
-SIZE (KDE/4.12.5/kdelibs-4.12.5.tar.xz) = 11551604
+SHA256 (KDE/4.14.2/kdelibs-4.14.2.tar.xz) = 39745a77f019cc1280374aa5de02fbf961393d1045059aa811fc374e0afd895b
+SIZE (KDE/4.14.2/kdelibs-4.14.2.tar.xz) = 11597872
diff --git a/x11/kdelibs4/files/patch-CVE-2014-3494 b/x11/kdelibs4/files/patch-CVE-2014-3494
deleted file mode 100644
index ec4f86be9797..000000000000
--- a/x11/kdelibs4/files/patch-CVE-2014-3494
+++ /dev/null
@@ -1,56 +0,0 @@
-From: David Faure <faure@kde.org>
-Date: Wed, 18 Jun 2014 18:29:04 +0000
-Subject: Don't require a job to handle messageboxes.
-X-Git-Tag: v4.13.3
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
----
-Don't require a job to handle messageboxes.
-
-The POP3 ioslave doesn't have a job when it gets here.
----
-
-
---- kio/kio/usernotificationhandler.cpp
-+++ kio/kio/usernotificationhandler.cpp
-@@ -19,7 +19,7 @@
- #include "usernotificationhandler_p.h"
-
- #include "slave.h"
--#include "job_p.h"
-+#include "jobuidelegate.h"
-
- #include <kdebug.h>
-
-@@ -76,19 +76,18 @@
-
- if (m_cachedResults.contains(key)) {
- result = *(m_cachedResults[key]);
-- } else if (r->slave->job()) {
-- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job());
-- if (jobPrivate) {
-- result = jobPrivate->requestMessageBox(r->type,
-- r->data.value(MSG_TEXT).toString(),
-- r->data.value(MSG_CAPTION).toString(),
-- r->data.value(MSG_YES_BUTTON_TEXT).toString(),
-- r->data.value(MSG_NO_BUTTON_TEXT).toString(),
-- r->data.value(MSG_YES_BUTTON_ICON).toString(),
-- r->data.value(MSG_NO_BUTTON_ICON).toString(),
-- r->data.value(MSG_DONT_ASK_AGAIN).toString(),
-- r->data.value(MSG_META_DATA).toMap());
-- }
-+ } else {
-+ JobUiDelegate ui;
-+ const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type);
-+ result = ui.requestMessageBox(type,
-+ r->data.value(MSG_TEXT).toString(),
-+ r->data.value(MSG_CAPTION).toString(),
-+ r->data.value(MSG_YES_BUTTON_TEXT).toString(),
-+ r->data.value(MSG_NO_BUTTON_TEXT).toString(),
-+ r->data.value(MSG_YES_BUTTON_ICON).toString(),
-+ r->data.value(MSG_NO_BUTTON_ICON).toString(),
-+ r->data.value(MSG_DONT_ASK_AGAIN).toString(),
-+ r->data.value(MSG_META_DATA).toMap());
- m_cachedResults.insert(key, new int(result));
- }
- } else {
-
diff --git a/x11/kdelibs4/files/patch-CVE-2014-5033 b/x11/kdelibs4/files/patch-CVE-2014-5033
deleted file mode 100644
index 613cf739216d..000000000000
--- a/x11/kdelibs4/files/patch-CVE-2014-5033
+++ /dev/null
@@ -1,48 +0,0 @@
-commit e4e7b53b71e2659adaf52691d4accc3594203b23
-Author: Martin T. H. Sandsmark <martin.sandsmark@kde.org>
-Date: Mon Jul 21 22:52:40 2014 +0200
-
- Use dbus system bus name instead of PID for authentication.
-
- Using the PID for authentication is prone to a PID reuse
- race condition, and a security issue.
-
- REVIEW: 119323
-
-diff --git a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-index cd7f6f3..732d2cb 100644
---- kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-+++ kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-@@ -144,7 +144,7 @@ void Polkit1Backend::setupAction(const QString &action)
-
- Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
- {
-- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
-+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
- PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
- PolkitQt1::Authority::None);
- switch (r) {
-@@ -160,21 +160,12 @@ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
-
- QByteArray Polkit1Backend::callerID() const
- {
-- QByteArray a;
-- QDataStream s(&a, QIODevice::WriteOnly);
-- s << QCoreApplication::applicationPid();
--
-- return a;
-+ return QDBusConnection::systemBus().baseService().toUtf8();
- }
-
- bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
- {
-- QDataStream s(&callerID, QIODevice::ReadOnly);
-- qint64 pid;
--
-- s >> pid;
--
-- PolkitQt1::UnixProcessSubject subject(pid);
-+ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
- PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
-
- PolkitResultEventLoop e;
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake
deleted file mode 100644
index 784a90ba2d8b..000000000000
--- a/x11/kdelibs4/files/patch-cmake_modules_FindFFmpeg.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./cmake/modules/FindFFmpeg.cmake.orig 2013-06-28 17:03:40.713321000 +0000
-+++ ./cmake/modules/FindFFmpeg.cmake 2013-10-23 13:30:59.895502135 +0000
-@@ -71,13 +71,15 @@
- ${PC_LIB${_component}_INCLUDEDIR}
- ${PC_LIB${_component}_INCLUDE_DIRS}
- PATH_SUFFIXES
-- ffmpeg
-+ ffmpeg${FFMPEG_SUFFIX}
- )
-
- find_library(${_component}_LIBRARIES NAMES ${_library}
-- HINTS
-+ HINTS
- ${PC_LIB${_component}_LIBDIR}
- ${PC_LIB${_component}_LIBRARY_DIRS}
-+ PATH_SUFFIXES
-+ ffmpeg${FFMPEG_SUFFIX}
- )
-
- set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
-@@ -98,12 +100,12 @@
- if (NOT FFMPEG_LIBRARIES)
-
- # Check for all possible component.
-- find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h)
-- find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
-- find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
-- find_component(AVUTIL libavutil avutil libavutil/avutil.h)
-- find_component(SWSCALE libswscale swscale libswscale/swscale.h)
-- find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
-+ find_component(AVCODEC libavcodec${FFMPEG_SUFFIX} avcodec${FFMPEG_SUFFIX} libavcodec/avcodec.h)
-+ find_component(AVFORMAT libavformat${FFMPEG_SUFFIX} avformat${FFMPEG_SUFFIX} libavformat/avformat.h)
-+ find_component(AVDEVICE libavdevice${FFMPEG_SUFFIX} avdevice${FFMPEG_SUFFIX} libavdevice/avdevice.h)
-+ find_component(AVUTIL libavutil${FFMPEG_SUFFIX} avutil${FFMPEG_SUFFIX} libavutil/avutil.h)
-+ find_component(SWSCALE libswscale${FFMPEG_SUFFIX} swscale${FFMPEG_SUFFIX} libswscale/swscale.h)
-+ find_component(POSTPROC libpostproc${FFMPEG_SUFFIX} postproc${FFMPEG_SUFFIX} libpostproc/postprocess.h)
-
- # Check if the required components were found and add their stuff to the FFMPEG_* vars.
- foreach (_component ${FFmpeg_FIND_COMPONENTS})
diff --git a/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a b/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a
deleted file mode 100644
index 46b6be731faa..000000000000
--- a/x11/kdelibs4/files/patch-git_d4fca9ffb31a2383459c89b27f81b10b7ddece1a
+++ /dev/null
@@ -1,44 +0,0 @@
-commit d4fca9ffb31a2383459c89b27f81b10b7ddece1a
-Author: Luigi Toscano <luigi.toscano@tiscali.it>
-Date: Wed Jun 4 22:40:12 2014 +0200
-
- Explicitly load external entities (after CVE-2014-0191)
-
- Use the more modern API function for XML loading and enable the
- flags which load the external entities, so that meinproc4 can work
- again after the security changes implemented for CVE-2014-0191.
- Network loading is disabled too now.
-
- REVIEW: 118270
- BUG: 335001
- FIXED-IN: 4.13.2
-
-diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
-index e0f8faf..0467f22 100644
---- kdoctools/meinproc.cpp
-+++ kdoctools/meinproc.cpp
-@@ -207,8 +207,8 @@ int main(int argc, char **argv) {
-
- if (style_sheet != NULL) {
-
-- xmlDocPtr doc = xmlParseFile( QFile::encodeName( checkFilename ).constData() );
--
-+ xmlDocPtr doc = xmlReadFile( QFile::encodeName( checkFilename ).constData(),
-+ NULL, XML_PARSE_NOENT|XML_PARSE_DTDLOAD|XML_PARSE_NONET );
- xmlDocPtr res = xsltApplyStylesheet(style_sheet, doc, &params[0]);
-
- xmlFreeDoc(doc);
-diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
-index a7265ca..4d64de4 100644
---- kdoctools/xslt.cpp
-+++ kdoctools/xslt.cpp
-@@ -157,7 +157,8 @@ QString transform( const QString &pat, const QString& tss,
-
- INFO(i18n("Parsing document"));
-
-- xmlDocPtr doc = xmlParseFile(QFile::encodeName(pat));
-+ xmlDocPtr doc = xmlReadFile(QFile::encodeName(pat), NULL,
-+ XML_PARSE_NOENT|XML_PARSE_DTDLOAD|XML_PARSE_NONET);
- xsltTransformContextPtr ctxt;
-
- ctxt = xsltNewTransformContext(style_sheet, doc);
diff --git a/x11/kdelibs4/files/patch-mimetypes_kde.xml b/x11/kdelibs4/files/patch-mimetypes_kde.xml
index c3b051f76532..b4c249924c3c 100644
--- a/x11/kdelibs4/files/patch-mimetypes_kde.xml
+++ b/x11/kdelibs4/files/patch-mimetypes_kde.xml
@@ -1,23 +1,128 @@
---- ./mimetypes/kde.xml.orig 2012-09-27 17:09:06.000000000 -0700
-+++ ./mimetypes/kde.xml 2012-10-26 14:22:51.802005859 -0700
-@@ -13,11 +13,6 @@
+--- mimetypes/kde.xml.orig 2014-08-21 16:18:35.265799343 +0200
++++ mimetypes/kde.xml 2014-08-21 16:24:17.444776007 +0200
+@@ -13,64 +13,6 @@
the mime type there.
-->
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="application/metalink+xml">
- <sub-class-of type="application/xml"/>
- <comment>Metalink download</comment>
+- <comment xml:lang="ar">تنزيل Metalink</comment>
+- <comment xml:lang="ast">Descarga Metalink</comment>
+- <comment xml:lang="bs">metalink preuzimanje</comment>
+- <comment xml:lang="ca">Baixada de «Metalink»</comment>
+- <comment xml:lang="ca@valencia">Baixada de «Metalink»</comment>
+- <comment xml:lang="cs">Stahování Metalink</comment>
+- <comment xml:lang="da">Metalink-download</comment>
+- <comment xml:lang="de">Metalink-Download</comment>
+- <comment xml:lang="el">Λήψη Metalink</comment>
+- <comment xml:lang="en_GB">Metalink download</comment>
+- <comment xml:lang="es">Descarga Metalink</comment>
+- <comment xml:lang="et">Metalinki allalaadimine</comment>
+- <comment xml:lang="eu">Metalik deskarga</comment>
+- <comment xml:lang="fi">Metalink-lataus</comment>
+- <comment xml:lang="fr">Téléchargement par méta-liens</comment>
+- <comment xml:lang="ga">Íosluchtú Metalink</comment>
+- <comment xml:lang="gl">Descarga de Metalink</comment>
+- <comment xml:lang="hr">Metalink preuzimanje</comment>
+- <comment xml:lang="hu">Metalinkletöltés</comment>
+- <comment xml:lang="ia">Discargamento de Metalink</comment>
+- <comment xml:lang="is">Metalink niðurhal</comment>
+- <comment xml:lang="it">scaricamento Metalink</comment>
+- <comment xml:lang="ja">Metalink ダウンロード</comment>
+- <comment xml:lang="kk">Метасілтеме</comment>
+- <comment xml:lang="km">ទាញយក​តំណ​មេតា</comment>
+- <comment xml:lang="ko">Metalink 다운로드</comment>
+- <comment xml:lang="lt">Metalink atsiuntimas</comment>
+- <comment xml:lang="lv">Metalink lejupielāde</comment>
+- <comment xml:lang="ml">മെറ്റാ-കണ്ണി ഡൌണ്‍ലോഡ്</comment>
+- <comment xml:lang="mr">मेटालिंक डाउनलोड</comment>
+- <comment xml:lang="nb">Metalink nedlasting</comment>
+- <comment xml:lang="nds">Metalink-Daalladen</comment>
+- <comment xml:lang="nl">Download van metalink</comment>
+- <comment xml:lang="nn">Metalink-nedlasting</comment>
+- <comment xml:lang="pa">ਮੇਟਾਲਿੰਕ ਡਾਊਨਲੋਡ</comment>
+- <comment xml:lang="pl">Pobieranie Metalink</comment>
+- <comment xml:lang="pt">Transferência do Metalink</comment>
+- <comment xml:lang="pt_BR">Transferência do Metalink</comment>
+- <comment xml:lang="ro">Descărcare Metalink</comment>
+- <comment xml:lang="ru">метассылка</comment>
+- <comment xml:lang="se">Metalink-viežžan</comment>
+- <comment xml:lang="sk">Sťahovanie Metalink</comment>
+- <comment xml:lang="sl">Prejem Metalink</comment>
+- <comment xml:lang="sr">металинк преузимање</comment>
+- <comment xml:lang="sr@ijekavian">металинк преузимање</comment>
+- <comment xml:lang="sr@ijekavianlatin">metalink preuzimanje</comment>
+- <comment xml:lang="sr@latin">metalink preuzimanje</comment>
+- <comment xml:lang="sv">Metalink-nerladdning</comment>
+- <comment xml:lang="tr">Metalink indirmesi</comment>
+- <comment xml:lang="ug">Metalink چۈشۈرۈش</comment>
+- <comment xml:lang="uk">метапосилання звантаження</comment>
+- <comment xml:lang="zh_CN">Metalink 下载</comment>
+- <comment xml:lang="zh_TW">Metalink 下載</comment>
- <glob pattern="*.metalink"/>
- </mime-type>
<mime-type type="application/relaxng">
<sub-class-of type="application/xml"/>
<comment>RELAX NG</comment>
-@@ -66,14 +61,6 @@
+@@ -662,66 +604,6 @@
<glob pattern="*.mhtml"/>
<glob pattern="*.mht"/>
</mime-type>
- <mime-type type="application/x-nzb"> <!-- fdo #10029 -->
- <comment>NewzBin usenet index</comment>
+- <comment xml:lang="ar">فهرس يوزنت NewzBin</comment>
+- <comment xml:lang="ast">Índiz usenet de NewzBin</comment>
+- <comment xml:lang="bs">NewzBinov indeks Useneta</comment>
+- <comment xml:lang="ca">índex usenet NewzBin</comment>
+- <comment xml:lang="ca@valencia">índex usenet NewzBin</comment>
+- <comment xml:lang="cs">Index NewzBin usenet</comment>
+- <comment xml:lang="da">NewzBin usenet-indeks</comment>
+- <comment xml:lang="de">NewzBin-Usenet-Index</comment>
+- <comment xml:lang="el">Ευρετήριο νέων NewzBin</comment>
+- <comment xml:lang="en_GB">NewzBin usenet index</comment>
+- <comment xml:lang="es">Índice usenet de NewzBin</comment>
+- <comment xml:lang="et">NewzBini useneti indeks</comment>
+- <comment xml:lang="eu">NewzBin usenet indizea</comment>
+- <comment xml:lang="fi">NewzBin-keskusteluryhmäindeksi</comment>
+- <comment xml:lang="fr">Index Usenet de NewzBin</comment>
+- <comment xml:lang="ga">Innéacs usenet NewzBin</comment>
+- <comment xml:lang="gl">Índice da usenet de NewsBin</comment>
+- <comment xml:lang="hr">NewzBin usenet indeks</comment>
+- <comment xml:lang="hu">NewzBin Usenet-index</comment>
+- <comment xml:lang="ia">Indice usenet de NewzBiz</comment>
+- <comment xml:lang="is">NewzBin usenet yfirlit</comment>
+- <comment xml:lang="it">indice Usenet di NewzBin</comment>
+- <comment xml:lang="ja">NewzBin usenet インデックス</comment>
+- <comment xml:lang="kk">NewzBin usenet индексі</comment>
+- <comment xml:lang="km">លិបិក្រម​​បណ្ដាញ​ប្រើ​របស់ NewzBin</comment>
+- <comment xml:lang="ko">NewzBin 유즈넷 인덱스</comment>
+- <comment xml:lang="lt">NewzBin usenet indeksas</comment>
+- <comment xml:lang="lv">NewzBin usenet indekss</comment>
+- <comment xml:lang="ml">ന്യൂസ്ബിന്‍ യൂസ്നെറ്റ് സൂചിക</comment>
+- <comment xml:lang="mr">न्युझबिन युजनेट अनुक्रमणिका </comment>
+- <comment xml:lang="nb">NewzBin usenet index</comment>
+- <comment xml:lang="nds">NewzBin-Usenet-Index</comment>
+- <comment xml:lang="nl">NewzBin-usenet-index</comment>
+- <comment xml:lang="nn">NewzBin-temagruppeindeks</comment>
+- <comment xml:lang="pl">Indeks grup dyskusyjnych NewzBin</comment>
+- <comment xml:lang="pt">Índice de notícias do NewzBin</comment>
+- <comment xml:lang="pt_BR">Índice de notícias do NewzBin</comment>
+- <comment xml:lang="ro">index usenet NewzBin</comment>
+- <comment xml:lang="ru">индекс Usenet для NewzBin</comment>
+- <comment xml:lang="se">NewzBin usenetindeaksa</comment>
+- <comment xml:lang="sk">NewzBin usenet index</comment>
+- <comment xml:lang="sl">Kazalo novičarskih skupin NewzBin</comment>
+- <comment xml:lang="sr">Њузбинов индекс јузнета</comment>
+- <comment xml:lang="sr@ijekavian">Њузбинов индекс јузнета</comment>
+- <comment xml:lang="sr@ijekavianlatin">NewzBinov indeks Useneta</comment>
+- <comment xml:lang="sr@latin">NewzBinov indeks Useneta</comment>
+- <comment xml:lang="sv">Newzbin-diskussionsgruppindex</comment>
+- <comment xml:lang="tr">NewzBin usenet dizini</comment>
+- <comment xml:lang="ug">NewzBin usenet ئىندېكس</comment>
+- <comment xml:lang="uk">покажчик usenet NewzBin</comment>
+- <comment xml:lang="zh_CN">NewzBin usenet 索引</comment>
+- <comment xml:lang="zh_TW">NewzBin usenet 索引</comment>
- <sub-class-of type="application/xml"/>
- <magic priority="80">
- <match type="string" value="&lt;nzb" offset="0:256"/>
@@ -27,7 +132,7 @@
<mime-type type="application/x-plasma">
<sub-class-of type="application/zip"/>
<comment>plasmoid</comment>
-@@ -148,9 +135,6 @@
+@@ -1544,9 +1426,6 @@
<glob pattern="*.pnx"/>
<glob pattern="*.rdc"/>
</mime-type>
@@ -37,40 +142,297 @@
<mime-type type="text/x-hex">
<sub-class-of type="text/plain"/>
<comment>Intel® hexadecimal object file</comment>
-@@ -351,27 +335,6 @@
+@@ -3804,236 +3683,6 @@
<glob pattern="*.wmp"/>
</mime-type>
- <mime-type type="application/x-kexiproject-shortcut"> <!-- FIXED 0.70 -->
- <comment>shortcut to Kexi project on database server</comment>
+- <comment xml:lang="ar">اختصار لمشروع Kexi على خادم قاعدة بيانات</comment>
+- <comment xml:lang="ast">accesu rápidu a proyeutu Kexi en sirvidor de base de datos</comment>
+- <comment xml:lang="bs">prečica do Kexijevog projekta na serveru baze</comment>
+- <comment xml:lang="ca">drecera a un projecte Kexi en un servidor de base de dades</comment>
+- <comment xml:lang="ca@valencia">drecera a un projecte Kexi en un servidor de base de dades</comment>
+- <comment xml:lang="cs">zkratka k projektu Kexi na databázovém serveru</comment>
+- <comment xml:lang="da">genvej til Kexi-projekt på database-server</comment>
+- <comment xml:lang="de">Verknüpfung zu einem Kexi-Projekt auf einem Datenbank-Server</comment>
+- <comment xml:lang="el">συντόμευση στο έργο Kexi σε εξυπηρετητή βάσης δεδομένων</comment>
+- <comment xml:lang="en_GB">shortcut to Kexi project on database server</comment>
+- <comment xml:lang="es">acceso rápido a proyecto Kexi en servidor de base de datos</comment>
+- <comment xml:lang="et">Kexi projekti viit andmebaasiserveris</comment>
+- <comment xml:lang="eu">datubase-zerbitzaran dagoen Kexi proiektuari lasterbidea</comment>
+- <comment xml:lang="fi">pikakuvake tietokantapalvelimella olevaan Kexi-projektiin</comment>
+- <comment xml:lang="fr">Raccourcis vers un projet Kexi sur un serveur de base de données</comment>
+- <comment xml:lang="ga">aicearra go tionscadal Kexi ar fhreastalaí bunachair sonraí</comment>
+- <comment xml:lang="gl">atallo a un proxecto de Kexi nun servidor de bases de datos</comment>
+- <comment xml:lang="hr">prečac na Kexi projekt na poslužitelj baze podataka</comment>
+- <comment xml:lang="hu">link kiszolgálóalapú Kexi-projektre</comment>
+- <comment xml:lang="ia">via breve a projecto de Kexi sur servitor de base de datos</comment>
+- <comment xml:lang="is">tengill á Kexi-verkefni á gagnagrunnsþjóni</comment>
+- <comment xml:lang="it">scorciatoia a progetto Kexi su server di banca dati</comment>
+- <comment xml:lang="ja">データベースサーバの Kexi プロジェクトへのショートカット</comment>
+- <comment xml:lang="kk">Kexi деректер қоры жоба серверіне сілтеме</comment>
+- <comment xml:lang="km">ផ្លូវកាត់​ទៅ​គម្រោង Kexi នៅ​ក្នុង​ម៉ាស៊ីន​បម្រើ​មូលដ្ឋាន​ទិន្នន័យ</comment>
+- <comment xml:lang="ko">데이터베이스 서버의 Kexi 프로젝트 바로 가기</comment>
+- <comment xml:lang="lt">nuoroda į Kexi projektą duomenų bazės serveryje</comment>
+- <comment xml:lang="lv">īsceļš uz Kexi projektu datubāzes serverī</comment>
+- <comment xml:lang="ml">വിവരസഞ്ജയ സേവകനിലെ കെക്സി പദ്ധതിയിലേയ്കുള്ള കുറുക്ക്‌വഴി</comment>
+- <comment xml:lang="mr">डेटाबेस सर्व्हर वरील केक्सी परियोजनेकरिता शॉर्टकट </comment>
+- <comment xml:lang="nb">snarvei til Kexi-prosjekt på databasetjener</comment>
+- <comment xml:lang="nds">Fixtogriep op Kexi-Projekt op Datenbankserver</comment>
+- <comment xml:lang="nl">sneltoets naar Kexi-project op databaseserver</comment>
+- <comment xml:lang="nn">snarveg til Kexi-prosjekt på databasetenar</comment>
+- <comment xml:lang="pl">skrót do projektu Kexi na serwerze bazy danych</comment>
+- <comment xml:lang="pt">atalho para projectos do Kexi numa base de dados</comment>
+- <comment xml:lang="pt_BR">atalho para projeto do Kexi num banco de dados</comment>
+- <comment xml:lang="ro">scurtătură spre un proiect Kexi pe un server de baze de date</comment>
+- <comment xml:lang="ru">ссылка на проект Kexi</comment>
+- <comment xml:lang="se">njuolggobálggis Kexi-prošektii diehtovuođđobálvás</comment>
+- <comment xml:lang="sk">skratka ku projektu Kexi na databázovom serveri</comment>
+- <comment xml:lang="sl">bližnjica do projekta Kexi na strežniku podatkovne zbirke</comment>
+- <comment xml:lang="sr">пречица до Кексијевог пројекта на серверу базе</comment>
+- <comment xml:lang="sr@ijekavian">пречица до Кексијевог пројекта на серверу базе</comment>
+- <comment xml:lang="sr@ijekavianlatin">prečica do Kexijevog projekta na serveru baze</comment>
+- <comment xml:lang="sr@latin">prečica do Kexijevog projekta na serveru baze</comment>
+- <comment xml:lang="sv">genväg till Kexi-projekt på databasserver</comment>
+- <comment xml:lang="tr">veritabanı üzerindeki Kexi projesine kısayol</comment>
+- <comment xml:lang="ug">Kexi ساندان مۇلازىمېتىر قۇرۇلۇشىنىڭ تېزلەتمىسى</comment>
+- <comment xml:lang="uk">скорочення для проекту Kexi на сервері бази даних</comment>
+- <comment xml:lang="zh_CN">Kexi 数据库服务器项目的快捷方式</comment>
+- <comment xml:lang="zh_TW">資料庫伺服器 Kexi 專案的捷徑</comment>
- <glob pattern="*.kexis"/>
- </mime-type>
- <mime-type type="application/x-kexiproject-sqlite2"> <!-- FIXED 0.70 -->
- <sub-class-of type="application/x-sqlite2"/>
- <comment>Kexi database file-based project</comment>
+- <comment xml:lang="ar">مشروع قاعدة بيانات Kexi يعتمد على ملفات</comment>
+- <comment xml:lang="ast">Proyeutu basáu en ficheros de base de datos Kexi</comment>
+- <comment xml:lang="bs">Kexijev projekat baze na osnovu datoteke</comment>
+- <comment xml:lang="ca">projecte basat en fitxer de base de dades del Kexi</comment>
+- <comment xml:lang="ca@valencia">projecte basat en fitxer de base de dades del Kexi</comment>
+- <comment xml:lang="cs">Projekt databáze Kexi ze souboru</comment>
+- <comment xml:lang="da">Databasefil-baseret projekt til Kexi</comment>
+- <comment xml:lang="de">Kexi-Datenbank Dateibasiertes Projekt</comment>
+- <comment xml:lang="el">Βάση δεδομένων έργο βασισμένη σε αρχείο Kexi</comment>
+- <comment xml:lang="en_GB">Kexi database file-based project</comment>
+- <comment xml:lang="es">Proyecto basado en archivos de base de datos Kexi</comment>
+- <comment xml:lang="et">Kexi andmebaasi failipõhine projekt</comment>
+- <comment xml:lang="eu">Kexi datubasearen fitxategian oinarritutako proiektua</comment>
+- <comment xml:lang="fi">Kexi-tietokanta tiedostoperustainen projekti</comment>
+- <comment xml:lang="fr">Projet de base de données Kexi</comment>
+- <comment xml:lang="ga">Tionscadal bunachair sonraí Kexi bunaithe ar chomhaid</comment>
+- <comment xml:lang="gl">Proxecto de base de datos de Kexi baseada en ficheiros</comment>
+- <comment xml:lang="hr">Kexi projekt datotečno bazirane baze podataka</comment>
+- <comment xml:lang="hu">Kexi adatbázisfájl-alapú projekt</comment>
+- <comment xml:lang="ia">Kexi :Projecto basate su file de base de datos</comment>
+- <comment xml:lang="is">Skráartengt Kexi gagnagrunnsverkefni</comment>
+- <comment xml:lang="it">progetto basato su file di banche dati di Kexi</comment>
+- <comment xml:lang="ja">Kexi データベース ファイルベースプロジェクト</comment>
+- <comment xml:lang="kk">Kexi деректер қоры файл негіздегі жоба</comment>
+- <comment xml:lang="km">គម្រោង​ដែល​មាន​មូលដ្ឋាន​លើ​ឯកសារ​មូលដ្ឋាន​ទិន្នន័យ​របស់ Kexi</comment>
+- <comment xml:lang="ko">Kexi 데이터베이스 파일 기반 프로젝트</comment>
+- <comment xml:lang="lt">Kexi failinis duomenų bazės projektas</comment>
+- <comment xml:lang="lv">Kexi datubāzes faila bāzēts projekts</comment>
+- <comment xml:lang="ml">ക്ലെക്സി വിവരസഞ്ജയത്തിന്റെ ഫയല്‍ അടിസ്ഥാനമാക്കിയുള്ള പദ്ധതി</comment>
+- <comment xml:lang="mr">केक्सी डेटाबेस फाईल-आधारित परियोजना</comment>
+- <comment xml:lang="nb">Kexi database filbasert prosjekt</comment>
+- <comment xml:lang="nds">Dateibaseert Kexi-Datenbankprojekt</comment>
+- <comment xml:lang="nl">Kexi database met bestandgebaseerd project</comment>
+- <comment xml:lang="nn">Filbasert Kexi-databaseprosjekt</comment>
+- <comment xml:lang="pl">Projekt bazy danych w pliku Kexi</comment>
+- <comment xml:lang="pt">Projecto de bases de dados em ficheiros do Kexi</comment>
+- <comment xml:lang="pt_BR">Projeto de banco de dados em arquivo do Kexi</comment>
+- <comment xml:lang="ro">proiect bază de date Kexi bazat pe fișier</comment>
+- <comment xml:lang="ru">проект файловой базы данных Kexi</comment>
+- <comment xml:lang="se">Kexi-diehtovuođđu fiilavuođđoduvvon prošeakta</comment>
+- <comment xml:lang="sk">Projekt databázy Kexi zo súboru</comment>
+- <comment xml:lang="sl">Projekt Kexi s podatkovno zbirko v datoteki</comment>
+- <comment xml:lang="sr">Кексијев пројекат базе на основу фајла</comment>
+- <comment xml:lang="sr@ijekavian">Кексијев пројекат базе на основу фајла</comment>
+- <comment xml:lang="sr@ijekavianlatin">Kexijev projekat baze na osnovu fajla</comment>
+- <comment xml:lang="sr@latin">Kexijev projekat baze na osnovu fajla</comment>
+- <comment xml:lang="sv">Kexi filbaserat databasprojekt</comment>
+- <comment xml:lang="tr">Dosya temelli Kexi veritabanı projesi</comment>
+- <comment xml:lang="ug">Kexi ساندان ھۆججەت ئاساسىدىكى قۇرۇلۇش</comment>
+- <comment xml:lang="uk">проект файлової бази даних Kexi</comment>
+- <comment xml:lang="zh_CN">Kexi 基于数据库文件项目</comment>
+- <comment xml:lang="zh_TW">Kexi 資料庫檔案專案</comment>
- <glob pattern="*.kexi"/>
- </mime-type>
- <mime-type type="application/x-kexiproject-sqlite3"> <!-- FIXED 0.70 -->
- <sub-class-of type="application/x-sqlite3"/>
- <comment>Kexi database file-based project</comment>
+- <comment xml:lang="ar">مشروع قاعدة بيانات Kexi يعتمد على ملفات</comment>
+- <comment xml:lang="ast">Proyeutu basáu en ficheros de base de datos Kexi</comment>
+- <comment xml:lang="bs">Kexijev projekat baze na osnovu datoteke</comment>
+- <comment xml:lang="ca">projecte basat en fitxer de base de dades del Kexi</comment>
+- <comment xml:lang="ca@valencia">projecte basat en fitxer de base de dades del Kexi</comment>
+- <comment xml:lang="cs">Projekt databáze Kexi ze souboru</comment>
+- <comment xml:lang="da">Databasefil-baseret projekt til Kexi</comment>
+- <comment xml:lang="de">Kexi-Datenbank Dateibasiertes Projekt</comment>
+- <comment xml:lang="el">Βάση δεδομένων έργο βασισμένη σε αρχείο Kexi</comment>
+- <comment xml:lang="en_GB">Kexi database file-based project</comment>
+- <comment xml:lang="es">Proyecto basado en archivos de base de datos Kexi</comment>
+- <comment xml:lang="et">Kexi andmebaasi failipõhine projekt</comment>
+- <comment xml:lang="eu">Kexi datubasearen fitxategian oinarritutako proiektua</comment>
+- <comment xml:lang="fi">Kexi-tietokanta tiedostoperustainen projekti</comment>
+- <comment xml:lang="fr">Projet de base de données Kexi</comment>
+- <comment xml:lang="ga">Tionscadal bunachair sonraí Kexi bunaithe ar chomhaid</comment>
+- <comment xml:lang="gl">Proxecto de base de datos de Kexi baseada en ficheiros</comment>
+- <comment xml:lang="hr">Kexi projekt datotečno bazirane baze podataka</comment>
+- <comment xml:lang="hu">Kexi adatbázisfájl-alapú projekt</comment>
+- <comment xml:lang="ia">Kexi :Projecto basate su file de base de datos</comment>
+- <comment xml:lang="is">Skráartengt Kexi gagnagrunnsverkefni</comment>
+- <comment xml:lang="it">progetto basato su file di banche dati di Kexi</comment>
+- <comment xml:lang="ja">Kexi データベース ファイルベースプロジェクト</comment>
+- <comment xml:lang="kk">Kexi деректер қоры файл негіздегі жоба</comment>
+- <comment xml:lang="km">គម្រោង​ដែល​មាន​មូលដ្ឋាន​លើ​ឯកសារ​មូលដ្ឋាន​ទិន្នន័យ​របស់ Kexi</comment>
+- <comment xml:lang="ko">Kexi 데이터베이스 파일 기반 프로젝트</comment>
+- <comment xml:lang="lt">Kexi failinis duomenų bazės projektas</comment>
+- <comment xml:lang="lv">Kexi datubāzes faila bāzēts projekts</comment>
+- <comment xml:lang="ml">ക്ലെക്സി വിവരസഞ്ജയത്തിന്റെ ഫയല്‍ അടിസ്ഥാനമാക്കിയുള്ള പദ്ധതി</comment>
+- <comment xml:lang="mr">केक्सी डेटाबेस फाईल-आधारित परियोजना</comment>
+- <comment xml:lang="nb">Kexi database filbasert prosjekt</comment>
+- <comment xml:lang="nds">Dateibaseert Kexi-Datenbankprojekt</comment>
+- <comment xml:lang="nl">Kexi database met bestandgebaseerd project</comment>
+- <comment xml:lang="nn">Filbasert Kexi-databaseprosjekt</comment>
+- <comment xml:lang="pl">Projekt bazy danych w pliku Kexi</comment>
+- <comment xml:lang="pt">Projecto de bases de dados em ficheiros do Kexi</comment>
+- <comment xml:lang="pt_BR">Projeto de banco de dados em arquivo do Kexi</comment>
+- <comment xml:lang="ro">proiect bază de date Kexi bazat pe fișier</comment>
+- <comment xml:lang="ru">проект файловой базы данных Kexi</comment>
+- <comment xml:lang="se">Kexi-diehtovuođđu fiilavuođđoduvvon prošeakta</comment>
+- <comment xml:lang="sk">Projekt databázy Kexi zo súboru</comment>
+- <comment xml:lang="sl">Projekt Kexi s podatkovno zbirko v datoteki</comment>
+- <comment xml:lang="sr">Кексијев пројекат базе на основу фајла</comment>
+- <comment xml:lang="sr@ijekavian">Кексијев пројекат базе на основу фајла</comment>
+- <comment xml:lang="sr@ijekavianlatin">Kexijev projekat baze na osnovu fajla</comment>
+- <comment xml:lang="sr@latin">Kexijev projekat baze na osnovu fajla</comment>
+- <comment xml:lang="sv">Kexi filbaserat databasprojekt</comment>
+- <comment xml:lang="tr">Dosya temelli Kexi veritabanı projesi</comment>
+- <comment xml:lang="ug">Kexi ساندان ھۆججەت ئاساسىدىكى قۇرۇلۇش</comment>
+- <comment xml:lang="uk">проект файлової бази даних Kexi</comment>
+- <comment xml:lang="zh_CN">Kexi 基于数据库文件项目</comment>
+- <comment xml:lang="zh_TW">Kexi 資料庫檔案專案</comment>
- <glob pattern="*.kexi"/>
- <alias type="application/x-kexiproject-sqlite"/>
- <alias type="application/x-vnd.kde.kexi"/>
- </mime-type>
- <mime-type type="application/x-kexi-connectiondata"> <!-- FIXED 0.70 -->
- <comment>data for database server connection</comment>
+- <comment xml:lang="ar">بيانات اتصال خادم قاعدة البيانات</comment>
+- <comment xml:lang="ast">datos pa conexón a sirvidor de bases de datos</comment>
+- <comment xml:lang="bs">podaci za vezu sa serverom baze</comment>
+- <comment xml:lang="ca">dades per a la connexió al servidor de bases de dades</comment>
+- <comment xml:lang="ca@valencia">dades per a la connexió al servidor de bases de dades</comment>
+- <comment xml:lang="cs">údaje pro spojení s databázovým serverem</comment>
+- <comment xml:lang="da">data til database-server-forbindelse</comment>
+- <comment xml:lang="de">Daten für Datenbank-Server-Verbindung</comment>
+- <comment xml:lang="el">Δεδομένα για σύνδεση βάσης δεδομένων</comment>
+- <comment xml:lang="en_GB">data for database server connection</comment>
+- <comment xml:lang="es">datos para conexión a servidor de bases de datos</comment>
+- <comment xml:lang="et">andmebaasiserveri ühenduse andmed</comment>
+- <comment xml:lang="eu">datuak datubase zerbitzari konexiorako</comment>
+- <comment xml:lang="fi">dataa tietokantapalvelinyhteydelle</comment>
+- <comment xml:lang="fr">Données de connexion au serveur de base de données.</comment>
+- <comment xml:lang="ga">sonraí le haghaidh ceangail le freastalaí an bhunachair sonraí</comment>
+- <comment xml:lang="gl">datos de conexión a un servidor de bases de datos</comment>
+- <comment xml:lang="hr">podaci za vezu sa poslužiteljem baze podataka</comment>
+- <comment xml:lang="hu">adatbáziskapcsolat-fájl</comment>
+- <comment xml:lang="ia">datos pro connexion de servitor de base de datos</comment>
+- <comment xml:lang="is">upplýsingar um gagnagrunnstengingu</comment>
+- <comment xml:lang="it">dati per la connessione a server di banca dati</comment>
+- <comment xml:lang="ja">データベースサーバ接続のデータ</comment>
+- <comment xml:lang="kk">деректер қорына қосылу дерегі</comment>
+- <comment xml:lang="km">ទិន្នន័យ​សម្រាប់​ការ​តភ្ជាប់​ម៉ាស៊ីនបម្រើ​មូលដ្ឋាន​ទិន្នន័យ</comment>
+- <comment xml:lang="ko">데이터베이스 서버 연결 데이터</comment>
+- <comment xml:lang="lt">duomenų bazės serverio jungites duomenys</comment>
+- <comment xml:lang="lv">dati datubāzes servera savienojumam</comment>
+- <comment xml:lang="ml">വിവരസഞ്ജയ സേവകനിലേയ്ക്കുള്ള ബന്ധത്തിനാവശ്യമായ വിവരം</comment>
+- <comment xml:lang="mr">डेटाबेस सर्व्हर जुळवणी करिता डेटा</comment>
+- <comment xml:lang="nb">data for forbindelse til databasetjener</comment>
+- <comment xml:lang="nds">Daten för Datenbankserververbinnen</comment>
+- <comment xml:lang="nl">gegevens voor verbinding met databaseserver</comment>
+- <comment xml:lang="nn">data for databasetenar-samband</comment>
+- <comment xml:lang="pa">ਡਾਟਾਬੇਸ ਸਰਵਰ ਕੁਨੈਕਨਸ਼ਨ ਲਈ ਡਾਟਾ</comment>
+- <comment xml:lang="pl">dane do połączenia z serwerem bazy danych</comment>
+- <comment xml:lang="pt">dados de ligação a servidores de bases de dados</comment>
+- <comment xml:lang="pt_BR">dados de conexão a servidores de bases de dados</comment>
+- <comment xml:lang="ro">date pentru conexiune la server de bază de date</comment>
+- <comment xml:lang="ru">сведения о соединении с сервером баз данных</comment>
+- <comment xml:lang="se">datat diehtovuođđobálvá lávttašumi várás</comment>
+- <comment xml:lang="sk">údaje pre spojenie s databázovým serverom</comment>
+- <comment xml:lang="sl">podatki za povezavo s strežnikom za podatkovno zbirko</comment>
+- <comment xml:lang="sr">подаци за везу са сервером базе</comment>
+- <comment xml:lang="sr@ijekavian">подаци за везу са сервером базе</comment>
+- <comment xml:lang="sr@ijekavianlatin">podaci za vezu sa serverom baze</comment>
+- <comment xml:lang="sr@latin">podaci za vezu sa serverom baze</comment>
+- <comment xml:lang="sv">data för anslutning till databasserver</comment>
+- <comment xml:lang="tr">veritabanı bağlantısı için veri</comment>
+- <comment xml:lang="ug">ساندان مۇلازىمېتىر باغلىنىشىنىڭ سانلىق-مەلۇماتى</comment>
+- <comment xml:lang="uk">дані для з’єднання з сервером бази даних</comment>
+- <comment xml:lang="zh_CN">数据库服务器连接数据</comment>
+- <comment xml:lang="zh_TW">資料庫伺服器連線資料</comment>
- <glob pattern="*.kexic"/>
- </mime-type>
-
<!-- http://www4.wiwiss.fu-berlin.de/bizer/TriG/ -->
<!-- Used in Nepomuk to encode almost all ontologies -->
<mime-type xmlns="http://www.freedesktop.org/standards/shared-mime-info" type="application/x-trig"> <!-- fdo #18089 -->
-@@ -392,25 +355,4 @@
+@@ -4213,121 +3862,4 @@
</magic>
<glob pattern="*.pic"/>
</mime-type>
- <mime-type type="text/x-qml"> <!-- in fdo smi > 0.90 -->
- <comment>Qt Markup Language file</comment>
+- <comment xml:lang="ar">ملف لغة الوصف Qt</comment>
+- <comment xml:lang="bs">Datoteka Qt jezika za označavanje</comment>
+- <comment xml:lang="ca">fitxer de llenguatge de marques de Qt</comment>
+- <comment xml:lang="ca@valencia">fitxer de llenguatge de marques de Qt</comment>
+- <comment xml:lang="cs">Soubor Qt Markup Language</comment>
+- <comment xml:lang="da">Qt Markup Language-fil</comment>
+- <comment xml:lang="de">Qt-Markup-Language-Datei</comment>
+- <comment xml:lang="el">Αρχείο γλώσσας σήμανσης Qt</comment>
+- <comment xml:lang="en_GB">Qt Markup Language file</comment>
+- <comment xml:lang="es">Archivo de lenguaje de marcas de Qt</comment>
+- <comment xml:lang="et">Qt märkekeele fail</comment>
+- <comment xml:lang="eu">Qt markatzeko lengoaia fitxategia</comment>
+- <comment xml:lang="fi">Qt-merkintäkielitiedosto</comment>
+- <comment xml:lang="fr">Fichier de langage à balises Qt</comment>
+- <comment xml:lang="ga">Comhad Teanga Mharcála Qt</comment>
+- <comment xml:lang="gl">Ficheiro na lingua de etiquetas de Qt</comment>
+- <comment xml:lang="hr">Datoteka Qt-ovog označnog jezika</comment>
+- <comment xml:lang="hu">Qt Markup Language fájl</comment>
+- <comment xml:lang="ia">Le de linguage de marcation de QT</comment>
+- <comment xml:lang="is">Qt Markup tungumálsskrá</comment>
+- <comment xml:lang="it">File di linguaggio a marcatori di Qt</comment>
+- <comment xml:lang="kk">Qt белгілеу тіліндегі файл</comment>
+- <comment xml:lang="km">ឯកសារ​ភាសា​សម្គាល់ ​Qt </comment>
+- <comment xml:lang="ko">Qt 마크업 언어 파일</comment>
+- <comment xml:lang="lt">Qt ženklinimo kalba</comment>
+- <comment xml:lang="lv">Qt Markup Language fails</comment>
+- <comment xml:lang="mr">क्यूटी मार्कअप भाषा फाईल</comment>
+- <comment xml:lang="nb">FIl for Qt oppmerkingsspråk</comment>
+- <comment xml:lang="nds">Qt-Schriftsatzspraakdatei</comment>
+- <comment xml:lang="nl">Qt Markup Language-bestand</comment>
+- <comment xml:lang="pl">Plik języka znaczników dla Qt</comment>
+- <comment xml:lang="pt">Ficheiro na Qt Markup Language</comment>
+- <comment xml:lang="pt_BR">Arquivo da Qt Markup Language</comment>
+- <comment xml:lang="ro">Fișier limbaj de marcare Qt</comment>
+- <comment xml:lang="ru">исходный код QML</comment>
+- <comment xml:lang="se">Qt Markup Language-fiila</comment>
+- <comment xml:lang="sk">Súbor značkovacieho jazyka Qt</comment>
+- <comment xml:lang="sl">Datoteka označevalnega jezika Qt (QML)</comment>
+- <comment xml:lang="sr">фајл КуТ‑овог обележивачког језика</comment>
+- <comment xml:lang="sr@ijekavian">фајл КуТ‑овог обележивачког језика</comment>
+- <comment xml:lang="sr@ijekavianlatin">fajl Qt‑ovog obeleživačkog jezika</comment>
+- <comment xml:lang="sr@latin">fajl Qt‑ovog obeleživačkog jezika</comment>
+- <comment xml:lang="sv">Qt-taggspråkfil</comment>
+- <comment xml:lang="tr">Qt İşaretleme Dili dosyası</comment>
+- <comment xml:lang="ug">Qt بەلگە تىل ھۆججىتى</comment>
+- <comment xml:lang="uk">файл мови розмітки Qt</comment>
+- <comment xml:lang="zh_CN">Qt 标记语言文件</comment>
+- <comment xml:lang="zh_TW">Qt 標示語言檔</comment>
- <magic priority="80">
- <match type="string" value="import Qt " offset="0:256"/>
- </magic>
@@ -78,6 +440,54 @@
- </mime-type>
- <mime-type type="application/x-mobipocket-ebook">
- <comment>Mobipocket e-book</comment>
+- <comment xml:lang="ar">كتاب إلكتروني Mobipocket</comment>
+- <comment xml:lang="bs">Mobipocket e-book</comment>
+- <comment xml:lang="ca">Llibre electrònic Mobipocket</comment>
+- <comment xml:lang="ca@valencia">Llibre electrònic Mobipocket</comment>
+- <comment xml:lang="cs"> E-Book Mobipocket</comment>
+- <comment xml:lang="da">Mobipocket e-bog</comment>
+- <comment xml:lang="de">Mobipocket-e-book</comment>
+- <comment xml:lang="el">Ηλ. βιβλίο Mobipocket</comment>
+- <comment xml:lang="en_GB">Mobipocket e-book</comment>
+- <comment xml:lang="es">Libro electrónico Mobipocket</comment>
+- <comment xml:lang="et">Mobipocketi e-raamat</comment>
+- <comment xml:lang="eu">Mobipocket liburu elektronikoa (e-book)</comment>
+- <comment xml:lang="fi">Mobipocket-e-kirja</comment>
+- <comment xml:lang="fr">Livre électronique « Mobipocket »</comment>
+- <comment xml:lang="ga">Ríomhleabhar Mobipocket</comment>
+- <comment xml:lang="gl">Libro electrónico Mobipocket</comment>
+- <comment xml:lang="hr">E-knjiga u Mobipocketu</comment>
+- <comment xml:lang="hu">Mobipocket e-book</comment>
+- <comment xml:lang="ia">Mobipocket e-book</comment>
+- <comment xml:lang="is">Mobipocket rafbók</comment>
+- <comment xml:lang="it">Libro elettronico Mobipocket</comment>
+- <comment xml:lang="kk">Mobipocket эл.кітабі</comment>
+- <comment xml:lang="km">Mobipocket e-book</comment>
+- <comment xml:lang="ko">Mobipocket 전자책</comment>
+- <comment xml:lang="lt">Mobipocket e-knyga</comment>
+- <comment xml:lang="lv">Mobipocket e-grāmata</comment>
+- <comment xml:lang="mr">मोबीपॉकेट इ-पुस्तक</comment>
+- <comment xml:lang="nb">Mobipocket e-bok</comment>
+- <comment xml:lang="nds">E-Book för Mobipocket</comment>
+- <comment xml:lang="nl">Mobipocket e-book</comment>
+- <comment xml:lang="pl">Mobipocket e-book</comment>
+- <comment xml:lang="pt">E-Book do Mobipocket</comment>
+- <comment xml:lang="pt_BR">E-book do Mobipocket</comment>
+- <comment xml:lang="ro">Carte digitală Mobipocket</comment>
+- <comment xml:lang="ru">электронная книга Mobipocket</comment>
+- <comment xml:lang="se">Mobipocket e-girji</comment>
+- <comment xml:lang="sk">Elektronická kniha Mobipocket</comment>
+- <comment xml:lang="sl">E-knjiga Mobipocket</comment>
+- <comment xml:lang="sr">Мобипокетова е‑књига</comment>
+- <comment xml:lang="sr@ijekavian">Мобипокетова е‑књига</comment>
+- <comment xml:lang="sr@ijekavianlatin">Mobipocketova e‑knjiga</comment>
+- <comment xml:lang="sr@latin">Mobipocketova e‑knjiga</comment>
+- <comment xml:lang="sv">Mobipocket e-bok</comment>
+- <comment xml:lang="tr">Mobipocket e-kitap</comment>
+- <comment xml:lang="ug">Mobipocket ئې-كىتاب</comment>
+- <comment xml:lang="uk">електронна книга Mobipocket</comment>
+- <comment xml:lang="zh_CN">Mobipocket 电子书</comment>
+- <comment xml:lang="zh_TW">Mobipocket e-book</comment>
- <sub-class-of type="application/x-palm-database"/>
- <generic-icon name="x-office-document"/>
- <glob pattern="*.mobi"/>
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 57f50180f4c5..8945a0accefe 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -3501,195 +3501,6 @@ share/kde4/servicetypes/sonnetspeller.desktop
share/locale/all_languages
share/locale/en_US/entry.desktop
share/mime/packages/kde.xml
-@dirrm share/kde4/services/qimageioplugins
-@dirrm share/doc/HTML/en/sonnet
-@dirrm share/doc/HTML/en/kioslave/webdav
-@dirrm share/doc/HTML/en/kioslave/telnet
-@dirrm share/doc/HTML/en/kioslave/rlogin
-@dirrm share/doc/HTML/en/kioslave/mailto
-@dirrm share/doc/HTML/en/kioslave/http
-@dirrm share/doc/HTML/en/kioslave/help
-@dirrm share/doc/HTML/en/kioslave/ftp
-@dirrm share/doc/HTML/en/kioslave/file
-@dirrm share/doc/HTML/en/kioslave/data
-@dirrm share/doc/HTML/en/common
-@dirrm share/config/ui
-@dirrm share/config/colors
-@dirrm share/apps/proxyscout
-@dirrm share/apps/kssl
-@dirrm share/apps/ksgmltools2/customization/zh-TW/entities
-@dirrm share/apps/ksgmltools2/customization/zh-TW
-@dirrm share/apps/ksgmltools2/customization/zh-CN/entities
-@dirrm share/apps/ksgmltools2/customization/zh-CN
-@dirrm share/apps/ksgmltools2/customization/xx/entities
-@dirrm share/apps/ksgmltools2/customization/xx
-@dirrm share/apps/ksgmltools2/customization/xsl
-@dirrm share/apps/ksgmltools2/customization/xh/entities
-@dirrm share/apps/ksgmltools2/customization/xh
-@dirrm share/apps/ksgmltools2/customization/wa/entities
-@dirrm share/apps/ksgmltools2/customization/wa
-@dirrm share/apps/ksgmltools2/customization/uk/entities
-@dirrm share/apps/ksgmltools2/customization/uk
-@dirrm share/apps/ksgmltools2/customization/tr/entities
-@dirrm share/apps/ksgmltools2/customization/tr
-@dirrm share/apps/ksgmltools2/customization/th/entities
-@dirrm share/apps/ksgmltools2/customization/th
-@dirrm share/apps/ksgmltools2/customization/sv/entities
-@dirrm share/apps/ksgmltools2/customization/sv
-@dirrm share/apps/ksgmltools2/customization/sr@latin/entities
-@dirrm share/apps/ksgmltools2/customization/sr@latin
-@dirrm share/apps/ksgmltools2/customization/sr@ijekavianlatin/entities
-@dirrm share/apps/ksgmltools2/customization/sr@ijekavianlatin
-@dirrm share/apps/ksgmltools2/customization/sr@ijekavian/entities
-@dirrm share/apps/ksgmltools2/customization/sr@ijekavian
-@dirrm share/apps/ksgmltools2/customization/sr/entities
-@dirrm share/apps/ksgmltools2/customization/sr
-@dirrm share/apps/ksgmltools2/customization/sl/entities
-@dirrm share/apps/ksgmltools2/customization/sl
-@dirrm share/apps/ksgmltools2/customization/sk/entities
-@dirrm share/apps/ksgmltools2/customization/sk
-@dirrm share/apps/ksgmltools2/customization/ru/entities
-@dirrm share/apps/ksgmltools2/customization/ru
-@dirrm share/apps/ksgmltools2/customization/ro/entities
-@dirrm share/apps/ksgmltools2/customization/ro
-@dirrm share/apps/ksgmltools2/customization/pt/entities
-@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
-@dirrm share/apps/ksgmltools2/customization/pt-BR
-@dirrm share/apps/ksgmltools2/customization/pt
-@dirrm share/apps/ksgmltools2/customization/pl/entities
-@dirrm share/apps/ksgmltools2/customization/pl
-@dirrm share/apps/ksgmltools2/customization/no/entities
-@dirrm share/apps/ksgmltools2/customization/no
-@dirrm share/apps/ksgmltools2/customization/nn/entities
-@dirrm share/apps/ksgmltools2/customization/nn
-@dirrm share/apps/ksgmltools2/customization/nl/entities
-@dirrm share/apps/ksgmltools2/customization/nl
-@dirrm share/apps/ksgmltools2/customization/nds/entities
-@dirrm share/apps/ksgmltools2/customization/nds
-@dirrm share/apps/ksgmltools2/customization/lt/entities
-@dirrm share/apps/ksgmltools2/customization/lt
-@dirrm share/apps/ksgmltools2/customization/ko/entities
-@dirrm share/apps/ksgmltools2/customization/ko
-@dirrm share/apps/ksgmltools2/customization/ja/entities
-@dirrm share/apps/ksgmltools2/customization/ja
-@dirrm share/apps/ksgmltools2/customization/it/entities
-@dirrm share/apps/ksgmltools2/customization/it
-@dirrm share/apps/ksgmltools2/customization/id/entities
-@dirrm share/apps/ksgmltools2/customization/id
-@dirrm share/apps/ksgmltools2/customization/hu/entities
-@dirrm share/apps/ksgmltools2/customization/hu
-@dirrm share/apps/ksgmltools2/customization/he/entities
-@dirrm share/apps/ksgmltools2/customization/he
-@dirrm share/apps/ksgmltools2/customization/gl/entities
-@dirrm share/apps/ksgmltools2/customization/gl
-@dirrm share/apps/ksgmltools2/customization/fr/entities
-@dirrm share/apps/ksgmltools2/customization/fr
-@dirrm share/apps/ksgmltools2/customization/fo/entities
-@dirrm share/apps/ksgmltools2/customization/fo
-@dirrm share/apps/ksgmltools2/customization/fi/entities
-@dirrm share/apps/ksgmltools2/customization/fi
-@dirrm share/apps/ksgmltools2/customization/et/entities
-@dirrm share/apps/ksgmltools2/customization/et
-@dirrm share/apps/ksgmltools2/customization/es/entities
-@dirrm share/apps/ksgmltools2/customization/es
-@dirrm share/apps/ksgmltools2/customization/eo/entities
-@dirrm share/apps/ksgmltools2/customization/eo
-@dirrm share/apps/ksgmltools2/customization/entities
-@dirrm share/apps/ksgmltools2/customization/en/entities
-@dirrm share/apps/ksgmltools2/customization/en-GB/entities
-@dirrm share/apps/ksgmltools2/customization/en-GB
-@dirrm share/apps/ksgmltools2/customization/en
-@dirrm share/apps/ksgmltools2/customization/el/entities
-@dirrm share/apps/ksgmltools2/customization/el
-@dirrm share/apps/ksgmltools2/customization/dtd
-@dirrm share/apps/ksgmltools2/customization/de/entities
-@dirrm share/apps/ksgmltools2/customization/de
-@dirrm share/apps/ksgmltools2/customization/da/entities
-@dirrm share/apps/ksgmltools2/customization/da
-@dirrm share/apps/ksgmltools2/customization/cs/entities
-@dirrm share/apps/ksgmltools2/customization/cs
-@dirrm share/apps/ksgmltools2/customization/ca/entities
-@dirrm share/apps/ksgmltools2/customization/ca
-@dirrm share/apps/ksgmltools2/customization/bg/entities
-@dirrm share/apps/ksgmltools2/customization/bg
-@dirrm share/apps/ksgmltools2/customization/af/entities
-@dirrm share/apps/ksgmltools2/customization/af
-@dirrm share/apps/ksgmltools2/customization
-@dirrm share/apps/ksgmltools2
-@dirrm share/apps/knewstuff/pics
-@dirrm share/apps/knewstuff
-@dirrm share/apps/kjava
-@dirrm share/apps/khtml/css
-@dirrm share/apps/kdewidgets/pics
-@dirrm share/apps/kdewidgets
-@dirrm share/apps/kdeui/pics
-@dirrm share/apps/kdeui/about
-@dirrm share/apps/kdeui
-@dirrm share/apps/kauth
-@dirrm share/apps/LICENSES
-@dirrm lib/kde4/plugins/script
-@dirrm lib/kde4/plugins/kauth/helper
-@dirrm lib/kde4/plugins/kauth/backend
-@dirrm lib/kde4/plugins/kauth
-@dirrm lib/kde4/plugins/imageformats
-@dirrm lib/cmake/KDeclarative
-@dirrm include/threadweaver
-@dirrm include/sonnet
-@dirrmtry include/solid
-@dirrm include/plasma/widgets
-@dirrm include/plasma/scripting
-@dirrm include/plasma/animations
-@dirrmtry include/plasma
-@dirrmtry include/nepomuk
-@dirrm include/kunittest
-@dirrm include/kunitconversion
-@dirrm include/ktexteditor
-@dirrm include/ksettings
-@dirrm include/kross/ui
-@dirrm include/kross/core
-@dirrm include/kross
-@dirrm include/kparts
-@dirrm include/knewstuff3
-@dirrm include/knewstuff2/ui
-@dirrm include/knewstuff2/core
-@dirrm include/knewstuff2
-@dirrm include/kmediaplayer
-@dirrm include/kjs
-@dirrm include/kio
-@dirrm include/khexedit
-@dirrm include/kdesu
-@dirrm include/dom
-@dirrm include/dnssd
-@dirrm include/KDE/khtml
-@dirrm include/KDE/ThreadWeaver
-@dirrm include/KDE/Sonnet
-@dirrm include/KDE/Solid
-@dirrmtry include/KDE/Plasma
-@dirrm include/KDE/Nepomuk/Vocabulary
-@dirrm include/KDE/Nepomuk/Utils
-@dirrm include/KDE/Nepomuk/Types
-@dirrm include/KDE/Nepomuk/Query
-@dirrm include/KDE/Nepomuk
-@dirrm include/KDE/Kross
-@dirrm include/KDE/KWallet
-@dirrm include/KDE/KUnitTest
-@dirrm include/KDE/KUnitConversion
-@dirrm include/KDE/KTextEditor
-@dirrm include/KDE/KSettings
-@dirrm include/KDE/KParts
-@dirrm include/KDE/KNetwork
-@dirrm include/KDE/KNS3
-@dirrm include/KDE/KNS
-@dirrm include/KDE/KMediaPlayer
-@dirrm include/KDE/KIO
-@dirrm include/KDE/KHE
-@dirrm include/KDE/KAuth
-@dirrm include/KDE/KAccelGen
-@dirrm include/KDE/DOM
-@dirrm include/KDE/DNSSD
-@dirrm include/KDE/ConversionCheck
-@dirrmtry etc/xdg/menus
-@dirrmtry etc/xdg
@comment workaround for non-standard mime files and directories
@rmtry share/mime/all/all.xml
@rmtry share/mime/all/allfiles.xml
@@ -3699,5 +3510,5 @@ share/mime/packages/kde.xml
@rmtry share/mime/uri/pnm.xml
@rmtry share/mime/uri/rtspt.xml
@rmtry share/mime/uri/rtspu.xml
-@dirrmtry share/mime/uri
-@dirrmtry share/mime/all
+@dir share/mime/uri
+@dir share/mime/all
diff --git a/x11/kgamma/Makefile b/x11/kgamma/Makefile
index 5323ff6ae50e..9e92bf2e495e 100644
--- a/x11/kgamma/Makefile
+++ b/x11/kgamma/Makefile
@@ -2,7 +2,6 @@
PORTNAME= kgamma
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -10,7 +9,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE 4 monitor calibration tool
-USE_KDE4= kdehier kdelibs kdeprefix automoc4
+USE_KDE4= kdelibs kdeprefix automoc4
USES= cmake:outsource tar:xz
USE_QT4= moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xxf86vm
diff --git a/x11/kgamma/distinfo b/x11/kgamma/distinfo
index 25cb8fc6d0c1..8745f24e597a 100644
--- a/x11/kgamma/distinfo
+++ b/x11/kgamma/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/kgamma-4.12.5.tar.xz) = f8ed0f20bb30ed49598e7bf9a1c4c6ed16993753e3d79a4264288d83cdd55775
-SIZE (KDE/4.12.5/kgamma-4.12.5.tar.xz) = 22880
+SHA256 (KDE/4.14.2/kgamma-4.14.2.tar.xz) = 0a8ae535d7bf07b2c11aa462866936e2e77858f769a3045608d714152247fabb
+SIZE (KDE/4.14.2/kgamma-4.14.2.tar.xz) = 22932
diff --git a/x11/kgamma/pkg-plist b/x11/kgamma/pkg-plist
index 6176a1c65717..b45aa25b8a31 100644
--- a/x11/kgamma/pkg-plist
+++ b/x11/kgamma/pkg-plist
@@ -11,6 +11,3 @@ share/doc/HTML/en/kcontrol/kgamma/common
share/doc/HTML/en/kcontrol/kgamma/index.cache.bz2
share/doc/HTML/en/kcontrol/kgamma/index.docbook
share/kde4/services/kgamma.desktop
-@dirrm share/doc/HTML/en/kcontrol/kgamma
-@dirrm share/apps/kgamma/pics
-@dirrm share/apps/kgamma
diff --git a/x11/konsole/Makefile b/x11/konsole/Makefile
index ee389dff1e15..4eeae233dfec 100644
--- a/x11/konsole/Makefile
+++ b/x11/konsole/Makefile
@@ -2,7 +2,6 @@
PORTNAME= konsole
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
@@ -10,7 +9,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE terminal emulator
-USE_KDE4= kdelibs kdeprefix kdehier automoc4 libkonq
+USE_KDE4= kdelibs kdeprefix automoc4 libkonq
USES= cmake:outsource tar:xz
USE_QT4= xml moc_build qmake_build rcc_build uic_build
USE_XORG= x11 xrender
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index 615c162c28d3..b2b859e020a9 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.5/konsole-4.12.5.tar.xz) = be64921b51348343283077da7378e03d6b45dc8e05892ca1cfa64750833398b2
-SIZE (KDE/4.12.5/konsole-4.12.5.tar.xz) = 451116
+SHA256 (KDE/4.14.2/konsole-4.14.2.tar.xz) = e6afac385e4746438205e1b02e0001141c36aa0c032d1ef9647588ab51d386e2
+SIZE (KDE/4.14.2/konsole-4.14.2.tar.xz) = 455108
diff --git a/x11/konsole/pkg-plist b/x11/konsole/pkg-plist
index 076f8c0abcf4..c352bafba5c2 100644
--- a/x11/konsole/pkg-plist
+++ b/x11/konsole/pkg-plist
@@ -34,7 +34,6 @@ share/doc/HTML/en/konsole/draganddrop-contextmenu.png
share/doc/HTML/en/konsole/index.cache.bz2
share/doc/HTML/en/konsole/index.docbook
share/kde4/services/ServiceMenus/konsolehere.desktop
+share/kde4/services/ServiceMenus/konsolerun.desktop
share/kde4/services/konsolepart.desktop
share/kde4/servicetypes/terminalemulator.desktop
-@dirrm share/doc/HTML/en/konsole
-@dirrm share/apps/konsole
diff --git a/x11/libkonq/Makefile b/x11/libkonq/Makefile
index d48aa2cb777c..d8e042d5ac52 100644
--- a/x11/libkonq/Makefile
+++ b/x11/libkonq/Makefile
@@ -2,7 +2,6 @@
PORTNAME= libkonq
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DISTNAME= kde-baseapps-${PORTVERSION}
@@ -12,7 +11,7 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Core library for Konqueror
USES= cmake tar:xz
-USE_KDE4= kdelibs kdeprefix kdehier automoc4
+USE_KDE4= kdelibs kdeprefix automoc4
USE_QT4= corelib dbus gui \
moc_build qmake_build rcc_build uic_build
USE_LDCONFIG= yes
diff --git a/x11/libkonq/pkg-descr b/x11/libkonq/pkg-descr
index 720f7a8b3a65..d270ce31c750 100644
--- a/x11/libkonq/pkg-descr
+++ b/x11/libkonq/pkg-descr
@@ -1,3 +1,3 @@
Core library for Konqueror.
-WWW: http://www.kde.org/
+WWW: http://www.kde.org/
diff --git a/x11/libkonq/pkg-plist b/x11/libkonq/pkg-plist
index 0e533714ea6a..578f78ed8725 100644
--- a/x11/libkonq/pkg-plist
+++ b/x11/libkonq/pkg-plist
@@ -55,5 +55,3 @@ share/templates/linkPath.desktop
share/templates/linkProgram.desktop
share/templates/linkURL.desktop
share/templates/linkZIP.desktop
-@dirrmtry share/apps/konqueror/pics
-@dirrm share/apps/kbookmark
diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile
index 4dd90248e734..379df2c07da3 100644
--- a/x11/plasma-scriptengine-python/Makefile
+++ b/x11/plasma-scriptengine-python/Makefile
@@ -2,7 +2,6 @@
PORTNAME= plasma-scriptengine-python
PORTVERSION= ${KDE4_WORKSPACE_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
DISTNAME= kde-workspace-${PORTVERSION}
@@ -11,7 +10,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma scriptengine for Python
-USE_KDE4= kdehier kdelibs kdeprefix pykde4 automoc4
+USE_KDE4= kdelibs kdeprefix pykde4 automoc4
USE_QT4= qmake_build moc_build uic_build rcc_build
DISTINFO_FILE= ${PORTSDIR}/x11/kde4-workspace/distinfo
USES= cmake:outsource python:2 tar:xz
diff --git a/x11/plasma-scriptengine-python/pkg-descr b/x11/plasma-scriptengine-python/pkg-descr
index 088bb553eb0b..9b8530aa6991 100644
--- a/x11/plasma-scriptengine-python/pkg-descr
+++ b/x11/plasma-scriptengine-python/pkg-descr
@@ -1,3 +1,3 @@
Plasma scriptengine for Python.
-WWW: http://www.kde.org/
+WWW: http://www.kde.org/
diff --git a/x11/plasma-scriptengine-python/pkg-plist b/x11/plasma-scriptengine-python/pkg-plist
index e3dc6fb49349..9230a14adcb5 100644
--- a/x11/plasma-scriptengine-python/pkg-plist
+++ b/x11/plasma-scriptengine-python/pkg-plist
@@ -20,7 +20,3 @@ share/kde4/services/plasma-scriptengine-applet-python.desktop
share/kde4/services/plasma-scriptengine-dataengine-python.desktop
share/kde4/services/plasma-scriptengine-runner-python.desktop
share/kde4/services/plasma-scriptengine-wallpaper-python.desktop
-@dirrm share/apps/plasma_scriptengine_python
-@dirrmtry %%PYTHON_SITELIBDIR%%/PyKDE4
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile
index f8208634ef79..4bf9ae1efbe3 100644
--- a/x11/plasma-scriptengine-ruby/Makefile
+++ b/x11/plasma-scriptengine-ruby/Makefile
@@ -2,7 +2,6 @@
PORTNAME= plasma-scriptengine-ruby
PORTVERSION= ${KDE4_WORKSPACE_VERSION}
-PORTREVISION= 2
CATEGORIES= x11 kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
DISTNAME= kde-workspace-${PORTVERSION}
@@ -11,7 +10,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Plasma scriptengine for Ruby
-USE_KDE4= kdehier kdelibs kdeprefix korundum automoc4
+USE_KDE4= kdelibs kdeprefix korundum automoc4
USE_QT4= qmake_build moc_build uic_build rcc_build
USE_RUBY= yes
DISTINFO_FILE= ${PORTSDIR}/x11/kde4-workspace/distinfo
diff --git a/x11/plasma-scriptengine-ruby/pkg-descr b/x11/plasma-scriptengine-ruby/pkg-descr
index 0ccc3eaacbf7..cfb31ce5ec31 100644
--- a/x11/plasma-scriptengine-ruby/pkg-descr
+++ b/x11/plasma-scriptengine-ruby/pkg-descr
@@ -1,3 +1,3 @@
Plasma scriptengine for Ruby.
-WWW: http://www.kde.org/
+WWW: http://www.kde.org/
diff --git a/x11/plasma-scriptengine-ruby/pkg-plist b/x11/plasma-scriptengine-ruby/pkg-plist
index bc3a5947d286..c9f5f320feea 100644
--- a/x11/plasma-scriptengine-ruby/pkg-plist
+++ b/x11/plasma-scriptengine-ruby/pkg-plist
@@ -2,4 +2,3 @@ share/apps/plasma_scriptengine_ruby/applet.rb
share/apps/plasma_scriptengine_ruby/data_engine.rb
share/kde4/services/plasma-scriptengine-ruby-applet.desktop
share/kde4/services/plasma-scriptengine-ruby-dataengine.desktop
-@dirrm share/apps/plasma_scriptengine_ruby