KDE/FreeBSD team presents KDE SC 4.12.2 and KDE Workspace 4.11.6!

Among changes:
- Switch KDE4_PREFIX to ${LOCALBASE}
- Remove now needless misc/kde4-shared-mime-info port
- Add stage support
- Remove ancient CONFLICTS (KDE 4.9 and less) and LATEST_LINK
- Squeeze MASTER_SITES/MASTER_SITE_SUBDIR
- Convert LIB_DEPENDS to new style
- Use options helpers
- Drop support for FreeBSD 7.x
- Remove Qt/KDE 3 related workarounds
- Remove local patches and use upstream version scheme for libraries
- sysutils/kdeadmin4, net/kdenetwork4, devel/kdesdk4,
  and x11-clocks/kdetoys4 ports have been split.
- devel/kcachegrind is now a part of KDE SC [1]
- more logs in area51 repo...

New ports:
  devel/kde-dev-scripts:	KDE development scripts
  devel/kde-dev-utils:		KDE development utilities
  games/klickety:		Tetris themed solitaire
  games/picmi:			Single player logic-based puzzle game
  textproc/libkomparediff2:	Library to compare files and strings

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

PR:		ports/186491
Exp-run:	by bdrewery
Approved by:	beat (former maintainer) [1]

6 files changed, 127 insertions, 258 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index ba32c7068884..457be6084ba9 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,28 +3,27 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
-CATEGORIES=	x11 kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES=	x11 kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Base set of libraries needed by KDE programs
 
-LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
-		jasper:${PORTSDIR}/graphics/jasper \
-		pcre:${PORTSDIR}/devel/pcre \
-		avahi-core:${PORTSDIR}/net/avahi-app \
-		enchant:${PORTSDIR}/textproc/enchant \
-		gif:${PORTSDIR}/graphics/giflib \
-		png15:${PORTSDIR}/graphics/png \
-		jpeg:${PORTSDIR}/graphics/jpeg \
-		hal:${PORTSDIR}/sysutils/hal \
-		qca:${PORTSDIR}/devel/qca \
-		HUpnp:${PORTSDIR}/net/hupnp \
-		polkit-qt-core-1:${PORTSDIR}/sysutils/polkit-qt \
-		dbusmenu-qt:${PORTSDIR}/devel/libdbusmenu-qt
+LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
+		libjasper.so:${PORTSDIR}/graphics/jasper \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libavahi-core.so:${PORTSDIR}/net/avahi-app \
+		libenchant.so:${PORTSDIR}/textproc/enchant \
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libhal.so:${PORTSDIR}/sysutils/hal \
+		libqca.so:${PORTSDIR}/devel/qca \
+		libHUpnp.so:${PORTSDIR}/net/hupnp \
+		libpolkit-qt-core-1.so:${PORTSDIR}/sysutils/polkit-qt \
+		libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt \
+		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee
 
 BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
@@ -34,22 +33,18 @@ RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicol
 		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-CONFLICTS=	kdebase-runtime-4.5.[0-5]
-
-LATEST_LINK=	${PORTNAME}4
-
 USE_XZ=		yes
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdehier kdeprefix oxygen \
-		attica automoc4 ontologies sharedmime soprano strigi
-USES=		cmake:outsource fam gettext perl5
+		attica automoc4 ontologies soprano strigi
+USES=		cmake:outsource fam gettext perl5 shared-mime-info shebangfix
 USE_OPENSSL=	yes
 USE_QT4=	corelib dbus declarative designer_build gui \
 		network opengl phonon qt3support \
 		qtestlib script sql svg webkit xml \
 		moc_build qmake_build rcc_build uic_build \
 		imageformats_run qdbusviewer_run
-USE_XORG=	sm x11 xcursor xext xfixes xrender xtst
+USE_XORG=	sm x11 xcursor xext xfixes xft xpm xrender xtst
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 
@@ -57,44 +52,30 @@ CMAKE_ARGS+=	-DWITH_ACL:BOOL=Off \
 		-DWITH_FAM:BOOL=On \
 		-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"
 
-MAN1=	checkXML.1 \
-	kconfig_compiler.1 \
-	kde4-config.1 \
-	kdecmake.1 \
-	kjs.1 \
-	kjscmd.1 \
-	kross.1 \
-	makekdewidgets.1 \
-	preparetips.1
-MAN7=	kdeoptions.7 \
-	qtoptions.7
-MAN8=	kbuildsycoca4.8 \
-	kcookiejar4.8 \
-	kded4.8 \
-	kdeinit4.8 \
-	meinproc4.8
+SHEBANG_FILES=	kdecore/kconfig_compiler/checkkcfg.pl \
+		kdeui/preparetips \
+		khtml/bindings/scripts/generate-bindings.pl \
+		kio/misc/fileshareset \
+		kioslave/http/kcookiejar/kcookiescfg.pl
 
-OPTIONS_DEFINE=	AVAHI
-AVAHI_DESC=	Use Avahi's mDNSResponder (otherwise Apple's)
+OPTIONS_DEFAULT=	MDNSRESPONDER
+OPTIONS_SINGLE=		ZEROCONF
+OPTIONS_SINGLE_ZEROCONF=	AVAHI MDNSRESPONDER
+AVAHI_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/avahi-libdns
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:${PORTSDIR}/net/mDNSResponder
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 900004
-LIB_DEPENDS+=	utempter:${PORTSDIR}/sysutils/libutempter
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 900004
+LIB_DEPENDS+=	libutempter.so:${PORTSDIR}/sysutils/libutempter
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-ConfigureChecks.cmake
 .endif
 
-.if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/avahi-libdns
-.else
-LIB_DEPENDS+=	dns_sd:${PORTSDIR}/net/mDNSResponder
-.endif
-
 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 dd776799089d..1d8694e64be6 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdelibs-4.10.5.tar.xz) = b6d404950bbe21657bf6362b2dd624d2e3cd22f23c1e6e20fa1ce71c41faf2d1
-SIZE (KDE/4.10.5/kdelibs-4.10.5.tar.xz) = 12023036
+SHA256 (KDE/4.12.2/kdelibs-4.12.2.tar.xz) = d03e20fa94387a19a17eca7c11abf5e14d2be324accca945d37e7757e583787a
+SIZE (KDE/4.12.2/kdelibs-4.12.2.tar.xz) = 11554568
diff --git a/x11/kdelibs4/files/patch-KDE4Defaults.cmake b/x11/kdelibs4/files/patch-KDE4Defaults.cmake
deleted file mode 100644
index 76d0dcee074a..000000000000
--- a/x11/kdelibs4/files/patch-KDE4Defaults.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./cmake/modules/KDE4Defaults.cmake.orig	2012-11-01 23:08:00.000000000 +0000
-+++ ./cmake/modules/KDE4Defaults.cmake	2012-11-02 15:05:55.862878877 +0000
-@@ -21,12 +21,12 @@
- # 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.5")
--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.5")
--set(KDE_NON_GENERIC_LIB_SOVERSION "5")
-+set(KDE_NON_GENERIC_LIB_VERSION "7.0.1")
-+set(KDE_NON_GENERIC_LIB_SOVERSION "7")
- 
- # windows does not support LD_LIBRARY_PATH or similar
- # all searchable directories has to be defined by the PATH environment var
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
index 6f73a6014299..43e145dacf48 100644
--- a/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindKDE4Internal.cmake
@@ -11,54 +11,4 @@
     _set_fancy(DBUS_INTERFACES_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/dbus-1/interfaces" "The dbus interfaces install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/interfaces)")
     _set_fancy(DBUS_SERVICES_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/dbus-1/services"     "The dbus services install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/services)")
     _set_fancy(DBUS_SYSTEM_SERVICES_INSTALL_DIR      "${SHARE_INSTALL_PREFIX}/dbus-1/system-services"     "The dbus system services install dir (default  ${SHARE_INSTALL_PREFIX}/dbus-1/system-services)")
-@@ -1304,6 +1304,50 @@
- endif (CMAKE_COMPILER_IS_GNUCXX)
- 
- 
-+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+   set (KDE4_ENABLE_EXCEPTIONS "-fexceptions -UQT_NO_EXCEPTIONS")
-+   # Select flags.
-+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
-+   set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG -DQT_NO_DEBUG")
-+   set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-inline")
-+   set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
-+   set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-+   set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
-+   set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG -DQT_NO_DEBUG")
-+   set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-inline")
-+   set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
-+   set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
-+
-+   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
-+   # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
-+   # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-exceptions -DQT_NO_EXCEPTIONS -fno-common -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden")
-+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -Woverloaded-virtual -fno-common -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden -Wno-return-type-c-linkage")
-+   set(KDE4_C_FLAGS "-fvisibility=hidden")
-+
-+   set(KDE4_CXX_FPIE_FLAGS "-fPIE")
-+   set(KDE4_PIE_LDFLAGS "-pie")
-+
-+   if (CMAKE_SYSTEM_NAME STREQUAL GNU)
-+      set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
-+      set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
-+   endif (CMAKE_SYSTEM_NAME STREQUAL GNU)
-+
-+   set(__KDE_HAVE_GCC_VISIBILITY TRUE)
-+
-+   # check that Qt defines Q_DECL_EXPORT as __attribute__ ((visibility("default")))
-+   # if it doesn't and KDE compiles with hidden default visibiltiy plugins will break
-+   set(_source "#include <QtCore/QtGlobal>\n int main()\n {\n #ifndef QT_VISIBILITY_AVAILABLE \n #error QT_VISIBILITY_AVAILABLE is not available\n #endif \n }\n")
-+   set(_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/check_qt_visibility.cpp)
-+   file(WRITE "${_source_file}" "${_source}")
-+   set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
-+   try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
-+   if(NOT _compile_result)
-+       message("${_compile_output_var}")
-+       message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation (try passing --reduce-exports to configure).")
-+   endif(NOT _compile_result)
-+endif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-+
-+
- if (CMAKE_C_COMPILER MATCHES "icc")
- 
-    set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
+
diff --git a/x11/kdelibs4/files/patch-kio__CMakeLists.txt b/x11/kdelibs4/files/patch-kio__CMakeLists.txt
deleted file mode 100644
index 67a570c2f1fa..000000000000
--- a/x11/kdelibs4/files/patch-kio__CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
---- ./kio/CMakeLists.txt.orig	2011-10-28 00:41:28.000000000 -0700
-+++ ./kio/CMakeLists.txt	2011-11-03 01:06:07.267271376 -0700
-@@ -17,22 +17,6 @@
-    set(KIO_NO_SOPRANO TRUE)
- endif(NOT SOPRANO_FOUND)
- 
--if(OPENSSL_FOUND)
--   set(KSSL_HAVE_SSL 1)
--   include_directories(${OPENSSL_INCLUDE_DIR})
--endif(OPENSSL_FOUND)
--
--if(NOT KIO_NO_NEPOMUK)
--    include_directories(
--       ${SOPRANO_INCLUDE_DIR}
--       ${CMAKE_SOURCE_DIR}/nepomuk/
--       ${CMAKE_SOURCE_DIR}/nepomuk/core/
--       ${CMAKE_SOURCE_DIR}/nepomuk/types/    
--       ${CMAKE_SOURCE_DIR}/nepomuk/ui/
--       ${CMAKE_SOURCE_DIR}/nepomuk/query/
--    )
--endif(NOT KIO_NO_NEPOMUK)
--
- # This applies to all subdirs; let's put kio's dependencies (and own dirs) here, once and for all
- include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks
-@@ -48,6 +32,23 @@
-    ${ZLIB_INCLUDE_DIR}
- 
-    )
-+
-+if(OPENSSL_FOUND)
-+   set(KSSL_HAVE_SSL 1)
-+   include_directories(${OPENSSL_INCLUDE_DIR})
-+endif(OPENSSL_FOUND)
-+
-+if(NOT KIO_NO_NEPOMUK)
-+    include_directories(
-+       ${SOPRANO_INCLUDE_DIR}
-+       ${CMAKE_SOURCE_DIR}/nepomuk/
-+       ${CMAKE_SOURCE_DIR}/nepomuk/core/
-+       ${CMAKE_SOURCE_DIR}/nepomuk/types/
-+       ${CMAKE_SOURCE_DIR}/nepomuk/ui/
-+       ${CMAKE_SOURCE_DIR}/nepomuk/query/
-+    )
-+endif(NOT KIO_NO_NEPOMUK)
-+
- if (NOT KIO_NO_STRIGI)
-    include_directories(${STRIGI_INCLUDE_DIR})
-    set(KIO_EXTRA_LIBS ${KIO_EXTRA_LIBS} ${STRIGI_STREAMANALYZER_LIBRARY} ${STRIGI_STREAMS_LIBRARY})
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 8c81505a41ed..dbdff1909756 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -1638,6 +1638,7 @@ include/ktexteditor/highlightinterface.h
 include/ktexteditor/ktexteditor_export.h
 include/ktexteditor/loadsavefiltercheckplugin.h
 include/ktexteditor/markinterface.h
+include/ktexteditor/messageinterface.h
 include/ktexteditor/modeinterface.h
 include/ktexteditor/modificationinterface.h
 include/ktexteditor/movingcursor.h
@@ -2000,128 +2001,143 @@ lib/kde4/plugins/imageformats/kimg_xview.so
 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.5
-lib/kde4/plugins/script/libkrossqtsplugin.so.5.0.1
+lib/kde4/plugins/script/libkrossqtsplugin.so.4
+lib/kde4/plugins/script/libkrossqtsplugin.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/kde4/spellcheckplugin.so
 lib/libkcmutils.so
-lib/libkcmutils.so.5
-lib/libkcmutils.so.5.0.1
+lib/libkcmutils.so.4
+lib/libkcmutils.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkde3support.so
-lib/libkde3support.so.5
-lib/libkde3support.so.5.0.1
+lib/libkde3support.so.4
+lib/libkde3support.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkdeclarative.so
-lib/libkdeclarative.so.7
-lib/libkdeclarative.so.7.0.1
+lib/libkdeclarative.so.5
+lib/libkdeclarative.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
 lib/libkdecore.so
-lib/libkdecore.so.7
-lib/libkdecore.so.7.0.1
+lib/libkdecore.so.5
+lib/libkdecore.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
 lib/libkdefakes.so
-lib/libkdefakes.so.7
-lib/libkdefakes.so.7.0.1
+lib/libkdefakes.so.5
+lib/libkdefakes.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
 lib/libkdeinit4_kbuildsycoca4.so
 lib/libkdeinit4_kconf_update.so
 lib/libkdeinit4_kded4.so
 lib/libkdeinit4_kio_http_cache_cleaner.so
 lib/libkdeinit4_klauncher.so
 lib/libkdesu.so
-lib/libkdesu.so.7
-lib/libkdesu.so.7.0.1
+lib/libkdesu.so.5
+lib/libkdesu.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
 lib/libkdeui.so
-lib/libkdeui.so.7
-lib/libkdeui.so.7.0.1
+lib/libkdeui.so.5
+lib/libkdeui.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
 lib/libkdewebkit.so
-lib/libkdewebkit.so.7
-lib/libkdewebkit.so.7.0.1
+lib/libkdewebkit.so.5
+lib/libkdewebkit.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
 lib/libkdnssd.so
-lib/libkdnssd.so.5
-lib/libkdnssd.so.5.0.1
+lib/libkdnssd.so.4
+lib/libkdnssd.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkemoticons.so
-lib/libkemoticons.so.5
-lib/libkemoticons.so.5.0.1
+lib/libkemoticons.so.4
+lib/libkemoticons.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkfile.so
-lib/libkfile.so.5
-lib/libkfile.so.5.0.1
+lib/libkfile.so.4
+lib/libkfile.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkhtml.so
-lib/libkhtml.so.7
-lib/libkhtml.so.7.0.1
+lib/libkhtml.so.5
+lib/libkhtml.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
 lib/libkidletime.so
-lib/libkidletime.so.5
-lib/libkidletime.so.5.0.1
+lib/libkidletime.so.4
+lib/libkidletime.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkimproxy.so
-lib/libkimproxy.so.5
-lib/libkimproxy.so.5.0.1
+lib/libkimproxy.so.4
+lib/libkimproxy.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkio.so
-lib/libkio.so.7
-lib/libkio.so.7.0.1
+lib/libkio.so.5
+lib/libkio.so.%%KDE4_NON_GENERIC_LIB_VERSION%%
 lib/libkjs.so
-lib/libkjs.so.5
-lib/libkjs.so.5.0.1
+lib/libkjs.so.4
+lib/libkjs.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkjsapi.so
-lib/libkjsapi.so.5
-lib/libkjsapi.so.5.0.1
+lib/libkjsapi.so.4
+lib/libkjsapi.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkjsembed.so
-lib/libkjsembed.so.5
-lib/libkjsembed.so.5.0.1
+lib/libkjsembed.so.4
+lib/libkjsembed.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkmediaplayer.so
-lib/libkmediaplayer.so.5
-lib/libkmediaplayer.so.5.0.1
+lib/libkmediaplayer.so.4
+lib/libkmediaplayer.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libknewstuff2.so
-lib/libknewstuff2.so.5
-lib/libknewstuff2.so.5.0.1
+lib/libknewstuff2.so.4
+lib/libknewstuff2.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libknewstuff3.so
-lib/libknewstuff3.so.5
-lib/libknewstuff3.so.5.0.1
+lib/libknewstuff3.so.4
+lib/libknewstuff3.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libknotifyconfig.so
-lib/libknotifyconfig.so.5
-lib/libknotifyconfig.so.5.0.1
+lib/libknotifyconfig.so.4
+lib/libknotifyconfig.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkntlm.so
-lib/libkntlm.so.5
-lib/libkntlm.so.5.0.1
+lib/libkntlm.so.4
+lib/libkntlm.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkparts.so
-lib/libkparts.so.5
-lib/libkparts.so.5.0.1
+lib/libkparts.so.4
+lib/libkparts.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkprintutils.so
-lib/libkprintutils.so.5
-lib/libkprintutils.so.5.0.1
+lib/libkprintutils.so.4
+lib/libkprintutils.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkpty.so
-lib/libkpty.so.5
-lib/libkpty.so.5.0.1
+lib/libkpty.so.4
+lib/libkpty.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkrosscore.so
-lib/libkrosscore.so.5
-lib/libkrosscore.so.5.0.1
+lib/libkrosscore.so.4
+lib/libkrosscore.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkrossui.so
-lib/libkrossui.so.5
-lib/libkrossui.so.5.0.1
+lib/libkrossui.so.4
+lib/libkrossui.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libktexteditor.so
-lib/libktexteditor.so.5
-lib/libktexteditor.so.5.0.1
+lib/libktexteditor.so.4
+lib/libktexteditor.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkunitconversion.so
-lib/libkunitconversion.so.5
-lib/libkunitconversion.so.5.0.1
+lib/libkunitconversion.so.4
+lib/libkunitconversion.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkunittest.so
-lib/libkunittest.so.5
-lib/libkunittest.so.5.0.1
+lib/libkunittest.so.4
+lib/libkunittest.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkutils.so
-lib/libkutils.so.5
-lib/libkutils.so.5.0.1
+lib/libkutils.so.4
+lib/libkutils.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libnepomuk.so
-lib/libnepomuk.so.5
-lib/libnepomuk.so.5.0.1
+lib/libnepomuk.so.4
+lib/libnepomuk.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libnepomukquery.so
-lib/libnepomukquery.so.5
-lib/libnepomukquery.so.5.0.1
+lib/libnepomukquery.so.4
+lib/libnepomukquery.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libnepomukutils.so
-lib/libnepomukutils.so.5
-lib/libnepomukutils.so.5.0.1
+lib/libnepomukutils.so.4
+lib/libnepomukutils.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libplasma.so
 lib/libplasma.so.3
 lib/libplasma.so.3.0.0
 lib/libsolid.so
-lib/libsolid.so.5
-lib/libsolid.so.5.0.1
+lib/libsolid.so.4
+lib/libsolid.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libthreadweaver.so
-lib/libthreadweaver.so.5
-lib/libthreadweaver.so.5.0.1
+lib/libthreadweaver.so.4
+lib/libthreadweaver.so.%%KDE4_GENERIC_LIB_VERSION%%
+man/man1/checkXML.1.gz
+man/man1/kconfig_compiler.1.gz
+man/man1/kde4-config.1.gz
+man/man1/kjs.1.gz
+man/man1/kjscmd.1.gz
+man/man1/kross.1.gz
+man/man1/makekdewidgets.1.gz
+man/man1/preparetips.1.gz
+man/man7/kdeoptions.7.gz
+man/man7/qtoptions.7.gz
+man/man8/kbuildsycoca4.8.gz
+man/man8/kcookiejar4.8.gz
+man/man8/kded4.8.gz
+man/man8/kdeinit4.8.gz
+man/man8/meinproc4.8.gz
 share/applications/kde4/kmailservice.desktop
 share/applications/kde4/ktelnetservice.desktop
 share/apps/LICENSES/ARTISTIC
@@ -3484,17 +3500,7 @@ share/kde4/servicetypes/renamedialogplugin.desktop
 share/kde4/servicetypes/sonnetspeller.desktop
 share/locale/all_languages
 share/locale/en_US/entry.desktop
-share/mime/all/all.xml
-share/mime/all/allfiles.xml
 share/mime/packages/kde.xml
-share/mime/uri/mms.xml
-share/mime/uri/mmst.xml
-share/mime/uri/mmsu.xml
-share/mime/uri/pnm.xml
-share/mime/uri/rtspt.xml
-share/mime/uri/rtspu.xml
-@dirrmtry share/mime/uri
-@dirrmtry share/mime/all
 @dirrm share/kde4/services/qimageioplugins
 @dirrm share/doc/HTML/en/sonnet
 @dirrm share/doc/HTML/en/kioslave/webdav