KDE/FreeBSD team presents KDE SC 4.10.3 ports!

- Remove patches and checks for unsupported FreeBSD versions.

The area51 repository features commits by avilla, rakuco and myself.

15 files changed, 56 insertions, 52 deletions

diff --git a/x11/kactivities/distinfo b/x11/kactivities/distinfo
index 02dc3321a25b..da08ae0ff244 100644
--- a/x11/kactivities/distinfo
+++ b/x11/kactivities/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.1/kactivities-4.10.1.tar.xz) = 2f288f67f492893f3f7be01eda5cc3c0938510381dedfac3f1affe2f09f1c967
-SIZE (KDE/4.10.1/kactivities-4.10.1.tar.xz) = 108336
+SHA256 (KDE/4.10.3/kactivities-4.10.3.tar.xz) = 68e1654792aabad292b9689bdc5e34870e41b9829a37ffbac1685e9e05b7cd01
+SIZE (KDE/4.10.3/kactivities-4.10.3.tar.xz) = 108600
diff --git a/x11/kactivitymanagerd/Makefile b/x11/kactivitymanagerd/Makefile
index 31514f89d229..dba25572f68e 100644
--- a/x11/kactivitymanagerd/Makefile
+++ b/x11/kactivitymanagerd/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kactivitymanagerd
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -25,7 +24,7 @@ MAKE_JOBS_SAFE=	yes
 DISTINFO_FILE=	${.CURDIR}/../kactivities/distinfo
 
 # https://bugs.kde.org/show_bug.cgi?id=305529#c10
-CMAKE_ARGS+=    -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=-rdynamic
+CMAKE_ARGS+=	-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=-rdynamic
 
 # 'USES= moderncompiler' would help, for now force dependence on gcc
 USE_GCC=	4.6+
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 5489da9f56b7..6aa2b2ecf5ad 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.1/kde-baseapps-4.10.1.tar.xz) = d0533b6ca3b7c9af9d4f13a3c576d30398a7d16e9b98e184ba1fe8cdc39f03bf
-SIZE (KDE/4.10.1/kde-baseapps-4.10.1.tar.xz) = 2609192
+SHA256 (KDE/4.10.3/kde-baseapps-4.10.3.tar.xz) = fd2f9a24888dc37b04ec5ec073571c91944a0d0b655c842e7d1744bfe17358dc
+SIZE (KDE/4.10.3/kde-baseapps-4.10.3.tar.xz) = 2613696
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index f3ea53f5efd2..104158c45638 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.1/kde-runtime-4.10.1.tar.xz) = 21358573acfcc13227dde57590974f473a4fda5e9655cf77a5ef85d380ccb152
-SIZE (KDE/4.10.1/kde-runtime-4.10.1.tar.xz) = 7213296
+SHA256 (KDE/4.10.3/kde-runtime-4.10.3.tar.xz) = 361d3aa8fc05c70a02c9010b1496901a88bd5d359e370875040ab8ea37f4f205
+SIZE (KDE/4.10.3/kde-runtime-4.10.3.tar.xz) = 7229684
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 424a7032afc9..b731f23109df 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kde-workspace
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -72,14 +71,15 @@ USE_RC_SUBR=	kdm4
 USERS=		kdm
 GROUPS=		kdm
 
-OPTIONS_DEFINE=	GPS UPOWER WALLPAPERS
+OPTIONS_DEFINE=	GPS KACTIVITY UPOWER WALLPAPERS
 OPTIONS_GROUP=	PHONON PLASMA
 OPTIONS_GROUP_PHONON=	GSTREAMER VLC
 OPTIONS_GROUP_PLASMA=	PYTHON RUBY
-OPTIONS_DEFAULT=GPS GSTREAMER UPOWER WALLPAPERS
+OPTIONS_DEFAULT=GPS GSTREAMER KACTIVITY UPOWER WALLPAPERS
 
 GPS_DESC=	GPS geolocation via gpsd
 GSTREAMER_DESC=	Multimedia via Phonon-GStreamer
+KACTIVITY_DESC=	Activity Manager daemon
 PYTHON_DESC=	Python plasmoids support
 RUBY_DESC=	Ruby plasmoids support
 UPOWER_DESC=	Power management via UPower
@@ -102,6 +102,10 @@ USE_GSTREAMER+=	core
 USE_QT4+=	phonon-gst_run
 .endif
 
+.if ${PORT_OPTIONS:MKACTIVITY}
+RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kactivitymanagerd:${PORTSDIR}/x11/kactivitymanagerd
+.endif
+
 .if ${PORT_OPTIONS:MPYTHON}
 RUN_DEPENDS+=	${KDE4_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:${PORTSDIR}/x11/plasma-scriptengine-python
 .endif
@@ -125,6 +129,10 @@ RUN_DEPENDS+=	${KDE4_PREFIX}/share/wallpapers/Horos/metadata.desktop:${PORTSDIR}
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 800069
+LIB_DEPENDS+=	usb-0.1:${PORTSDIR}/devel/libusb
+.endif
+
 .if ${OSVERSION} < 900004
 LIB_DEPENDS+=	utempter:${PORTSDIR}/sysutils/libutempter
 .endif
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 7cb662ef30a8..1e0594c671b3 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.1/kde-workspace-4.10.1.tar.xz) = 19ca159dc6cec2b8cb6a09d7a87ec5f541e35ed0f03c185c7ea5cfe959b212b7
-SIZE (KDE/4.10.1/kde-workspace-4.10.1.tar.xz) = 13560944
+SHA256 (KDE/4.10.3/kde-workspace-4.10.3.tar.xz) = d870db2f39dcec6d4c11ccaef53d24978c1249a9426814414a90456d9cfce49d
+SIZE (KDE/4.10.3/kde-workspace-4.10.3.tar.xz) = 13569364
diff --git a/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt b/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt
new file mode 100644
index 000000000000..b05fd4c8d947
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-plasma__desktop__applets__kickoff__CMakeLists.txt
@@ -0,0 +1,25 @@
+--- ./plasma/desktop/applets/kickoff/CMakeLists.txt.orig	2013-03-01 06:32:24.588852000 +0000
++++ ./plasma/desktop/applets/kickoff/CMakeLists.txt	2013-04-05 14:57:51.006558311 +0000
+@@ -1,10 +1,6 @@
+ #######################################################################################
+ # Kickoff Library
+ 
+-if(STRIGI_STRIGIQTDBUSCLIENT_LIBRARY)
+-    set(HAVE_STRIGIDBUS 1)
+-endif(STRIGI_STRIGIQTDBUSCLIENT_LIBRARY)
+-
+ configure_file(core/config-kickoff-applets.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kickoff-applets.h)
+ 
+ set(libkickoff_SRCS
+@@ -34,11 +30,6 @@
+ QT4_ADD_DBUS_INTERFACE(libkickoff_SRCS ${ksmserver_xml} ksmserver_interface)
+ 
+ set(Kickoff_LIBS ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_SOLID_LIBS} kworkspace)
+-if(HAVE_STRIGIDBUS)
+-     set ( Kickoff_LIBS ${Kickoff_LIBS} ${STRIGI_STRIGIQTDBUSCLIENT_LIBRARY} )
+-endif(HAVE_STRIGIDBUS)
+-
+-include_directories( ${STRIGI_INCLUDE_DIR} )
+ 
+ kde4_add_library(kickoff SHARED ${libkickoff_SRCS})
+ target_link_libraries(kickoff ${KDE4_PLASMA_LIBS} ${Kickoff_LIBS})
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 4707ef39956f..58e9bc2e37c6 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -902,6 +902,7 @@ share/apps/kwrited/kwrited.notifyrc
 share/apps/plasma-desktop/init/00-defaultLayout.js
 share/apps/plasma-desktop/plasma-desktop.notifyrc
 share/apps/plasma-desktop/updates/addShowActivitiesManagerPlasmoid.js
+share/apps/plasma-desktop/updates/set-hidden-single-vd-pager.js
 share/apps/plasma-desktop/updates/systray-to-notifications-widget.js
 share/apps/plasma-netbook/init/00-defaultLayout.js
 share/apps/plasma/dashboard/AppleClasses/AppleAnimator.js
@@ -927,7 +928,6 @@ share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents/
 share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/metadata.desktop
 share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents/layout.js
 share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/metadata.desktop
-share/apps/plasma/packages/org.kde.desktop.activitymanager/Messages.sh
 share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/.directory
 share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/ActivityDelegate.qml
 share/apps/plasma/packages/org.kde.desktop.activitymanager/contents/ui/main.qml
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 1233521b1d3d..614206ffae08 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 5fa3b23fd6d5..0d4e85e8a6ec 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.1/kdelibs-4.10.1.tar.xz) = d5bc7ffe83b65dcb20c277253e2645f3d59dad7820cbc6f3a1bb9b5be7db05d6
-SIZE (KDE/4.10.1/kdelibs-4.10.1.tar.xz) = 11955948
+SHA256 (KDE/4.10.3/kdelibs-4.10.3.tar.xz) = 5fbde0b372e6c2054ee3c620f3e465b452d2bf90a0c6ab3cc98d153e3a572cef
+SIZE (KDE/4.10.3/kdelibs-4.10.3.tar.xz) = 11981656
diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
index e2c534e9148b..e0c7ded7e855 100644
--- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake
+++ b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
@@ -4,13 +4,13 @@
  # define the generic version of the libraries here
  # this makes it easy to advance it when the next KDE release comes
  # Use this version number for libraries which are at version n in KDE version n
--set(GENERIC_LIB_VERSION "4.10.1")
+-set(GENERIC_LIB_VERSION "4.10.3")
 -set(GENERIC_LIB_SOVERSION "4")
 +set(GENERIC_LIB_VERSION "5.0.1")
 +set(GENERIC_LIB_SOVERSION "5")
  
  # Use this version number for libraries which are already at version n+1 in KDE version n
--set(KDE_NON_GENERIC_LIB_VERSION "5.10.1")
+-set(KDE_NON_GENERIC_LIB_VERSION "5.10.3")
 -set(KDE_NON_GENERIC_LIB_SOVERSION "5")
 +set(KDE_NON_GENERIC_LIB_VERSION "7.0.1")
 +set(KDE_NON_GENERIC_LIB_SOVERSION "7")
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
index 88e0a69daf6b..3180d70d340c 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
@@ -1,14 +1,5 @@
---- ./cmake/modules/FindKDE4Internal.cmake.orig	2013-03-01 07:26:13.335789000 +0100
-+++ ./cmake/modules/FindKDE4Internal.cmake	2013-03-29 21:51:00.038340976 +0100
-@@ -716,7 +716,7 @@
- #####################  provide some options   ##########################################
- 
- option(KDE4_ENABLE_FINAL "Enable final all-in-one compilation")
--option(KDE4_BUILD_TESTS  "Build the tests" ON)
-+option(KDE4_BUILD_TESTS  "Build the tests")
- option(KDE4_ENABLE_HTMLHANDBOOK  "Create targets htmlhandbook for creating the html versions of the docbook docs")
- set(KDE4_SERIALIZE_TOOL "" CACHE STRING "Tool to serialize resource-intensive commands in parallel builds")
- 
+--- ./cmake/modules/FindKDE4Internal.cmake.orig	2012-11-30 07:17:39.000000000 +0000
++++ ./cmake/modules/FindKDE4Internal.cmake	2013-02-15 15:45:41.732493091 +0000
 @@ -893,8 +893,8 @@
     _set_fancy(XDG_MIME_INSTALL_DIR     "${SHARE_INSTALL_PREFIX}/mime/packages"  "The install dir for the xdg mimetypes")
  
diff --git a/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp b/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp
deleted file mode 100644
index 004f25901f97..000000000000
--- a/x11/kdelibs4/files/patch-kio_kfile_kpropertiesdialog.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./kio/kfile/kpropertiesdialog.cpp.orig	2009-05-06 14:14:38.000000000 +0400
-+++ ./kio/kfile/kpropertiesdialog.cpp	2009-05-30 00:46:08.000000000 +0400
-@@ -1804,7 +1804,15 @@
- #else
-     QVarLengthArray<gid_t> groups;
- #endif
-+#ifdef Q_OS_FREEBSD
-+#include <osreldate.h>
-+#endif
-+#if defined(Q_OS_FREEBSD) && (__FreeBSD_version <= 800000) // Fixed in kern/114655
-+    gid_t tmp_group;
-+    if (getgrouplist(strUser, user->pw_gid, &tmp_group, &groupCount) < 0) {
-+#else
-     if (getgrouplist(strUser, user->pw_gid, NULL, &groupCount) < 0) {
-+#endif
-         groups.resize(groupCount);
-         if (groups.data())
-             getgrouplist(strUser, user->pw_gid, groups.data(), &groupCount);
diff --git a/x11/kgamma/distinfo b/x11/kgamma/distinfo
index c6d848218635..d5d410fc21eb 100644
--- a/x11/kgamma/distinfo
+++ b/x11/kgamma/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.1/kgamma-4.10.1.tar.xz) = d6f5d66bde2649c9dea483b6941a8616d43edbfa765ff7d04244a3e2cd26ba8c
-SIZE (KDE/4.10.1/kgamma-4.10.1.tar.xz) = 27100
+SHA256 (KDE/4.10.3/kgamma-4.10.3.tar.xz) = 3f3e8f377bba08c7ad1d94c103c84613c6a52393100797c66f96492add928bb1
+SIZE (KDE/4.10.3/kgamma-4.10.3.tar.xz) = 27092
diff --git a/x11/konsole/distinfo b/x11/konsole/distinfo
index 1dabcde6a8a2..9874c850687a 100644
--- a/x11/konsole/distinfo
+++ b/x11/konsole/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.1/konsole-4.10.1.tar.xz) = eaf9cd092dd01a79ad42843d1ba948a4fcdd39c22433e454e1a6a588743dbfbc
-SIZE (KDE/4.10.1/konsole-4.10.1.tar.xz) = 447096
+SHA256 (KDE/4.10.3/konsole-4.10.3.tar.xz) = 66e88d86e4986e50036c3e610a1d3a5412f710b6feae31e383552d6c2b158fcd
+SIZE (KDE/4.10.3/konsole-4.10.3.tar.xz) = 445852