12 files changed, 92 insertions, 125 deletions

diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index d0b0f3aef9dd..d175166b7bf3 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -2,9 +2,8 @@
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	6
 CATEGORIES=	x11 kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -134,5 +133,6 @@ post-install-GSTREAMER-on:
 post-install-GSTREAMER-off:
 	@${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE}
 	@${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index aa1f5169108e..66f3c185ff58 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.11.14/kde-workspace-4.11.14.tar.xz) = cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01
-SIZE (KDE/4.11.14/kde-workspace-4.11.14.tar.xz) = 13529808
+TIMESTAMP = 1466144753
+SHA256 (KDE/4.11.21/kde-workspace-4.11.21.tar.xz) = 7196c68802af335b15a3b8e14c55a15ed7c2c0e9145a047dc6d4a281fe7f7c8f
+SIZE (KDE/4.11.21/kde-workspace-4.11.21.tar.xz) = 13550508
diff --git a/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt b/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt
deleted file mode 100644
index be76904999e2..000000000000
--- a/x11/kde4-workspace/files/patch-kwin_opengltest_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- kwin/opengltest/CMakeLists.txt.orig	2014-11-06 22:36:58 UTC
-+++ kwin/opengltest/CMakeLists.txt
-@@ -2,9 +2,11 @@
- 
- set(kwin_opengl_test_SRCS opengltest.cpp )
- 
-+find_package(Threads)
-+
- kde4_add_executable(kwin_opengl_test ${kwin_opengl_test_SRCS})
- 
--target_link_libraries(kwin_opengl_test ${X11_LIBRARIES} ${OPENGL_gl_LIBRARY})
-+target_link_libraries(kwin_opengl_test ${X11_LIBRARIES} ${OPENGL_gl_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
- 
- install(TARGETS kwin_opengl_test DESTINATION ${LIBEXEC_INSTALL_DIR} )
- 
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index bef5a8d6e06c..e7bd61c2d521 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -336,7 +336,7 @@ lib/kde4/powerdevilrunscriptaction_config.so
 lib/kde4/powerdevilsuspendsessionaction_config.so
 lib/libkdecorations.so
 lib/libkdecorations.so.4
-lib/libkdecorations.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkdecorations.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkdeinit4_kaccess.so
 lib/libkdeinit4_kcminit.so
 lib/libkdeinit4_kcminit_startup.so
@@ -353,25 +353,25 @@ lib/libkdeinit4_plasma-netbook.so
 lib/libkdeinit4_plasma-windowed.so
 lib/libkephal.so
 lib/libkephal.so.4
-lib/libkephal.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkephal.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkfontinst.so
 lib/libkfontinst.so.4
-lib/libkfontinst.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkfontinst.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkfontinstui.so
 lib/libkfontinstui.so.4
-lib/libkfontinstui.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkfontinstui.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkhotkeysprivate.so.4
-lib/libkhotkeysprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkhotkeysprivate.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkickoff.so
 lib/libkscreensaver.so
 lib/libkscreensaver.so.5
 lib/libkscreensaver.so.5.0.0
 lib/libksgrd.so
 lib/libksgrd.so.4
-lib/libksgrd.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libksgrd.so.%%KDE4_KDELIBS_VERSION%%
 lib/libksignalplotter.so
 lib/libksignalplotter.so.4
-lib/libksignalplotter.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libksignalplotter.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkwineffects.so
 lib/libkwineffects.so.1
 lib/libkwineffects.so.1.0.0
@@ -383,48 +383,48 @@ lib/libkwinglutils.so.1
 lib/libkwinglutils.so.1.0.0
 lib/libkworkspace.so
 lib/libkworkspace.so.4
-lib/libkworkspace.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkworkspace.so.%%KDE4_KDELIBS_VERSION%%
 lib/liblsofui.so
 lib/liblsofui.so.4
-lib/liblsofui.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/liblsofui.so.%%KDE4_KDELIBS_VERSION%%
 lib/liboxygenstyle.so
 lib/liboxygenstyle.so.4
-lib/liboxygenstyle.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/liboxygenstyle.so.%%KDE4_KDELIBS_VERSION%%
 lib/liboxygenstyleconfig.so
 lib/liboxygenstyleconfig.so.4
-lib/liboxygenstyleconfig.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/liboxygenstyleconfig.so.%%KDE4_KDELIBS_VERSION%%
 lib/libplasma-geolocation-interface.so
 lib/libplasma-geolocation-interface.so.4
-lib/libplasma-geolocation-interface.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libplasma-geolocation-interface.so.%%KDE4_KDELIBS_VERSION%%
 lib/libplasma_applet-system-monitor.so
 lib/libplasma_applet-system-monitor.so.4
-lib/libplasma_applet-system-monitor.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libplasma_applet-system-monitor.so.%%KDE4_KDELIBS_VERSION%%
 lib/libplasmaclock.so
 lib/libplasmaclock.so.4
-lib/libplasmaclock.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libplasmaclock.so.%%KDE4_KDELIBS_VERSION%%
 lib/libplasmagenericshell.so
 lib/libplasmagenericshell.so.4
-lib/libplasmagenericshell.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libplasmagenericshell.so.%%KDE4_KDELIBS_VERSION%%
 lib/libpowerdevilconfigcommonprivate.so
 lib/libpowerdevilconfigcommonprivate.so.4
-lib/libpowerdevilconfigcommonprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libpowerdevilconfigcommonprivate.so.%%KDE4_KDELIBS_VERSION%%
 lib/libpowerdevilcore.so
 lib/libpowerdevilcore.so.0
 lib/libpowerdevilcore.so.0.1.0
 lib/libpowerdevilui.so
 lib/libpowerdevilui.so.4
-lib/libpowerdevilui.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libpowerdevilui.so.%%KDE4_KDELIBS_VERSION%%
 lib/libprocesscore.so
 lib/libprocesscore.so.4
-lib/libprocesscore.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libprocesscore.so.%%KDE4_KDELIBS_VERSION%%
 lib/libprocessui.so
 lib/libprocessui.so.4
-lib/libprocessui.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libprocessui.so.%%KDE4_KDELIBS_VERSION%%
 lib/libsystemsettingsview.so
 lib/libsystemsettingsview.so.2
 lib/libtaskmanager.so
 lib/libtaskmanager.so.4
-lib/libtaskmanager.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libtaskmanager.so.%%KDE4_KDELIBS_VERSION%%
 lib/libweather_ion.so
 lib/libweather_ion.so.6
 lib/libweather_ion.so.6.0.0
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index c43f3b10dac0..96f2c3b3be3d 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	kdelibs
-PORTVERSION=	${KDE4_VERSION}
+PORTVERSION=	${KDE4_KDELIBS_VERSION}
 PORTREVISION=	6
 CATEGORIES=	x11 kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=   KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
@@ -14,13 +14,11 @@ COMMENT=	Base set of libraries needed by KDE programs
 LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR \
 		libjasper.so:graphics/jasper \
 		libpcre.so:devel/pcre \
-		libavahi-core.so:net/avahi-app \
 		libenchant.so:textproc/enchant \
 		libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libhal.so:sysutils/hal \
 		libqca.so:devel/qca \
-		libHUpnp.so:net/hupnp \
 		libpolkit-qt-core-1.so:sysutils/polkit-qt \
 		libdbusmenu-qt.so:devel/libdbusmenu-qt \
 		libgrantlee_gui.so:devel/grantlee
@@ -36,7 +34,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-them
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	oxygen \
 		attica automoc4 ontologies soprano strigi
-USES=		cmake:outsource fam gettext jpeg perl5 shared-mime-info shebangfix tar:xz
+USES=		cmake:outsource fam gettext jpeg perl5 shared-mime-info \
+		shebangfix tar:xz
 USE_OPENSSL=	yes
 USE_QT4=	corelib dbus declarative designer_build gui \
 		network opengl phonon qt3support \
@@ -52,7 +51,6 @@ CMAKE_ARGS+=	-DWITH_ACL:BOOL=Off \
 		-DWITH_ASPELL:BOOL=Off \
 		-DWITH_HSPELL:BOOL=Off \
 		-DWITH_UDev:BOOL=Off \
-		-DHUPNP_ENABLED:BOOL=On \
 		-DKDE_DISTRIBUTION_TEXT:STRING="${OPSYS}" \
 		-DKDE_DEFAULT_HOME:STRING=".kde4"
 
@@ -76,6 +74,15 @@ SHEBANG_FILES=	kdecore/kconfig_compiler/checkkcfg.pl \
 		kio/proxytype.pl \
 		kioslave/http/kcookiejar/kcookiescfg.pl
 
+OPTIONS_DEFINE=	AVAHI UPNP
+OPTIONS_DEFAULT=AVAHI
+
+AVAHI_LIB_DEPENDS=	libavahi-core.so:${PORTSDIR}/net/avahi-app
+
+UPNP_DESC=	UPnP backend for Solid (WARNING: Unstable)
+UPNP_LIB_DEPENDS=	libHUpnp.so:${PORTSDIR}/net/hupnp
+UPNP_CMAKE_ON=	-DHUPNP_ENABLED:BOOL=On
+
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 		${PATCH_WRKSRC}/kde3support/kdeui/k3sconfig.cpp \
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 52fb0948d632..f3c999d21980 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/kdelibs-4.14.3.tar.xz) = f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e
-SIZE (KDE/4.14.3/kdelibs-4.14.3.tar.xz) = 11600500
+TIMESTAMP = 1465934303
+SHA256 (KDE/4.14.10/kdelibs-4.14.10.tar.xz) = 00f5a7bdb0b2bcb786ea630844c639ebe89c45eb1e88443dde421baa0895ca94
+SIZE (KDE/4.14.10/kdelibs-4.14.10.tar.xz) = 11644204
diff --git a/x11/kdelibs4/files/patch-mimetypes_kde.xml b/x11/kdelibs4/files/patch-mimetypes_kde.xml
index b4c249924c3c..2fe6d4d112db 100644
--- a/x11/kdelibs4/files/patch-mimetypes_kde.xml
+++ b/x11/kdelibs4/files/patch-mimetypes_kde.xml
@@ -1,5 +1,5 @@
---- mimetypes/kde.xml.orig	2014-08-21 16:18:35.265799343 +0200
-+++ mimetypes/kde.xml	2014-08-21 16:24:17.444776007 +0200
+--- mimetypes/kde.xml.orig	2016-06-14 20:05:36.032272000 +0000
++++ mimetypes/kde.xml	2016-06-14 20:10:12.125459000 +0000
 @@ -13,64 +13,6 @@
    the mime type there.
  -->
@@ -9,7 +9,7 @@
 -    <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="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>
@@ -132,7 +132,7 @@
    <mime-type type="application/x-plasma">
      <sub-class-of type="application/zip"/>
      <comment>plasmoid</comment>
-@@ -1544,9 +1426,6 @@
+@@ -1546,9 +1428,6 @@
      <glob pattern="*.pnx"/>
      <glob pattern="*.rdc"/>
    </mime-type>
@@ -142,7 +142,7 @@
    <mime-type type="text/x-hex">
      <sub-class-of type="text/plain"/>
      <comment>Intel® hexadecimal object file</comment>
-@@ -3804,236 +3683,6 @@
+@@ -3462,236 +3341,6 @@
      <glob pattern="*.wmp"/>
    </mime-type>
  
@@ -379,7 +379,7 @@
    <!-- 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 -->
-@@ -4213,121 +3862,4 @@
+@@ -3872,123 +3521,4 @@
      </magic>
      <glob pattern="*.pic"/>
    </mime-type>
@@ -415,6 +415,7 @@
 -    <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="nn">Fil for Qt-oppmerkingsspråk</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>
@@ -470,6 +471,7 @@
 -    <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="nn">Mobipocket e-bøk</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>
diff --git a/x11/kdelibs4/files/patch-solid__solid__managerbase.cpp b/x11/kdelibs4/files/patch-solid__solid__managerbase.cpp
deleted file mode 100644
index 35094d8f082b..000000000000
--- a/x11/kdelibs4/files/patch-solid__solid__managerbase.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./solid/solid/managerbase.cpp.orig	2012-04-17 23:58:05.745260976 +0200
-+++ ./solid/solid/managerbase.cpp	2012-04-18 00:00:48.605183174 +0200
-@@ -90,7 +90,11 @@
- #        endif
- 
- #        if defined (HUPNP_FOUND)
--            m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
-+            bool solidUPnPEnabled
-+                = QString::fromLocal8Bit(qgetenv("SOLID_UPNP")).toInt()==1;
-+            if (solidUPnPEnabled) {
-+                m_backends << new Solid::Backends::UPnP::UPnPDeviceManager(0);
-+            }
- #        endif
-     }
- }
diff --git a/x11/kdelibs4/pkg-message b/x11/kdelibs4/pkg-message
deleted file mode 100644
index 81747701bee7..000000000000
--- a/x11/kdelibs4/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-======================================================================
-
-Due to severe instability, the Solid UPnP backend was disabled. Thus,
-you will not get notifications about networked shares in the device
-notifier. The UPnP functionality can be re-enabled by setting the
-SOLID_UPNP environment variable:
-
-$ cat > ~/.kde4/env/upnp.sh << EOF
-SOLID_UPNP=1
-export SOLID_UPNP
-EOF
-$ chmod +x ~/.kde4/env/upnp.sh
-
-======================================================================
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index ba9bc8979c00..e9440ae4f15d 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -2002,23 +2002,23 @@ lib/kde4/plugins/kauth/backend/kauth_backend_plugin.so
 lib/kde4/plugins/kauth/helper/kauth_helper_plugin.so
 lib/kde4/plugins/script/libkrossqtsplugin.so
 lib/kde4/plugins/script/libkrossqtsplugin.so.4
-lib/kde4/plugins/script/libkrossqtsplugin.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/kde4/plugins/script/libkrossqtsplugin.so.%%KDE4_KDELIBS_VERSION%%
 lib/kde4/spellcheckplugin.so
 lib/libkcmutils.so
 lib/libkcmutils.so.4
-lib/libkcmutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkcmutils.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkde3support.so
 lib/libkde3support.so.4
-lib/libkde3support.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkde3support.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkdeclarative.so
 lib/libkdeclarative.so.5
-lib/libkdeclarative.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
+lib/libkdeclarative.so.%%KDE4_NG_KDELIBS_VERSION%%
 lib/libkdecore.so
 lib/libkdecore.so.5
-lib/libkdecore.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
+lib/libkdecore.so.%%KDE4_NG_KDELIBS_VERSION%%
 lib/libkdefakes.so
 lib/libkdefakes.so.5
-lib/libkdefakes.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
+lib/libkdefakes.so.%%KDE4_NG_KDELIBS_VERSION%%
 lib/libkdeinit4_kbuildsycoca4.so
 lib/libkdeinit4_kconf_update.so
 lib/libkdeinit4_kded4.so
@@ -2026,103 +2026,103 @@ lib/libkdeinit4_kio_http_cache_cleaner.so
 lib/libkdeinit4_klauncher.so
 lib/libkdesu.so
 lib/libkdesu.so.5
-lib/libkdesu.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
+lib/libkdesu.so.%%KDE4_NG_KDELIBS_VERSION%%
 lib/libkdeui.so
 lib/libkdeui.so.5
-lib/libkdeui.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
+lib/libkdeui.so.%%KDE4_NG_KDELIBS_VERSION%%
 lib/libkdewebkit.so
 lib/libkdewebkit.so.5
-lib/libkdewebkit.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
+lib/libkdewebkit.so.%%KDE4_NG_KDELIBS_VERSION%%
 lib/libkdnssd.so
 lib/libkdnssd.so.4
-lib/libkdnssd.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkdnssd.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkemoticons.so
 lib/libkemoticons.so.4
-lib/libkemoticons.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkemoticons.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkfile.so
 lib/libkfile.so.4
-lib/libkfile.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkfile.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkhtml.so
 lib/libkhtml.so.5
-lib/libkhtml.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
+lib/libkhtml.so.%%KDE4_NG_KDELIBS_VERSION%%
 lib/libkidletime.so
 lib/libkidletime.so.4
-lib/libkidletime.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkidletime.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkimproxy.so
 lib/libkimproxy.so.4
-lib/libkimproxy.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkimproxy.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkio.so
 lib/libkio.so.5
-lib/libkio.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
+lib/libkio.so.%%KDE4_NG_KDELIBS_VERSION%%
 lib/libkjs.so
 lib/libkjs.so.4
-lib/libkjs.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkjs.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkjsapi.so
 lib/libkjsapi.so.4
-lib/libkjsapi.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkjsapi.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkjsembed.so
 lib/libkjsembed.so.4
-lib/libkjsembed.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkjsembed.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkmediaplayer.so
 lib/libkmediaplayer.so.4
-lib/libkmediaplayer.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkmediaplayer.so.%%KDE4_KDELIBS_VERSION%%
 lib/libknewstuff2.so
 lib/libknewstuff2.so.4
-lib/libknewstuff2.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libknewstuff2.so.%%KDE4_KDELIBS_VERSION%%
 lib/libknewstuff3.so
 lib/libknewstuff3.so.4
-lib/libknewstuff3.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libknewstuff3.so.%%KDE4_KDELIBS_VERSION%%
 lib/libknotifyconfig.so
 lib/libknotifyconfig.so.4
-lib/libknotifyconfig.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libknotifyconfig.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkntlm.so
 lib/libkntlm.so.4
-lib/libkntlm.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkntlm.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkparts.so
 lib/libkparts.so.4
-lib/libkparts.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkparts.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkprintutils.so
 lib/libkprintutils.so.4
-lib/libkprintutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkprintutils.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkpty.so
 lib/libkpty.so.4
-lib/libkpty.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkpty.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkrosscore.so
 lib/libkrosscore.so.4
-lib/libkrosscore.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkrosscore.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkrossui.so
 lib/libkrossui.so.4
-lib/libkrossui.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkrossui.so.%%KDE4_KDELIBS_VERSION%%
 lib/libktexteditor.so
 lib/libktexteditor.so.4
-lib/libktexteditor.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libktexteditor.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkunitconversion.so
 lib/libkunitconversion.so.4
-lib/libkunitconversion.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkunitconversion.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkunittest.so
 lib/libkunittest.so.4
-lib/libkunittest.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkunittest.so.%%KDE4_KDELIBS_VERSION%%
 lib/libkutils.so
 lib/libkutils.so.4
-lib/libkutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkutils.so.%%KDE4_KDELIBS_VERSION%%
 lib/libnepomuk.so
 lib/libnepomuk.so.4
-lib/libnepomuk.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libnepomuk.so.%%KDE4_KDELIBS_VERSION%%
 lib/libnepomukquery.so
 lib/libnepomukquery.so.4
-lib/libnepomukquery.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libnepomukquery.so.%%KDE4_KDELIBS_VERSION%%
 lib/libnepomukutils.so
 lib/libnepomukutils.so.4
-lib/libnepomukutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libnepomukutils.so.%%KDE4_KDELIBS_VERSION%%
 lib/libplasma.so
 lib/libplasma.so.3
 lib/libplasma.so.3.0.0
 lib/libsolid.so
 lib/libsolid.so.4
-lib/libsolid.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libsolid.so.%%KDE4_KDELIBS_VERSION%%
 lib/libthreadweaver.so
 lib/libthreadweaver.so.4
-lib/libthreadweaver.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libthreadweaver.so.%%KDE4_KDELIBS_VERSION%%
 man/man1/checkXML.1.gz
 man/man1/kconfig_compiler.1.gz
 man/man1/kde4-config.1.gz
@@ -3340,6 +3340,7 @@ share/doc/HTML/en/common/lgpl-license
 share/doc/HTML/en/common/lgpl-license.html
 share/doc/HTML/en/common/mainfooter.html
 share/doc/HTML/en/common/mainheader.html
+share/doc/HTML/en/common/part_of_the_kde_family_horizontal_190.png
 share/doc/HTML/en/common/qpl-license.html
 share/doc/HTML/en/common/tabs.css
 share/doc/HTML/en/common/top-kde.jpg
diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile
index d519b9352f87..9205bbce4884 100644
--- a/x11/plasma-scriptengine-python/Makefile
+++ b/x11/plasma-scriptengine-python/Makefile
@@ -2,9 +2,8 @@
 
 PORTNAME=	plasma-scriptengine-python
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DISTNAME=	kde-workspace-${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
@@ -13,7 +12,7 @@ COMMENT=	Plasma scriptengine for Python
 
 USE_KDE4=	kdelibs pykde4 automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
-DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
 USES=		cmake:outsource python:2 tar:xz
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/plasma/generic/scriptengines/python
diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile
index e8248943d22b..17f55737379b 100644
--- a/x11/plasma-scriptengine-ruby/Makefile
+++ b/x11/plasma-scriptengine-ruby/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	plasma-scriptengine-ruby
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
 CATEGORIES=	x11 kde
-MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
+MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DISTNAME=	kde-workspace-${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
@@ -13,7 +13,7 @@ COMMENT=	Plasma scriptengine for Ruby
 USE_KDE4=	kdelibs korundum automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 USE_RUBY=	yes
-DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
+DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
 USES=		cmake:outsource tar:xz
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/plasma/generic/scriptengines/ruby