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]
svn path=/head/; revision=344893
2025-05-19 10:33:12 -04:00 · 2014-02-18 14:23:03 +00:00 · 2014-02-18 14:23:03 +00:00 · e9c34f4c34 · 2021-03-31 03:12:20 +00:00
commit e9c34f4c34
parent 4dc7ccc95d
737 changed files with 7682 additions and 8020 deletions
--- a/1
+++ b/1
@ -5451,3 +5451,4 @@ x11-fonts/cosmic-sans-neue-mono|x11-fonts/fantasque-sans-mono|2014-02-13|Renamed
 mail/zmailer||2014-02-13|Broken since at least last August
 lang/gcc34|lang/gcc|2014-02-13|Superseded by GCC 4.6 or later
 x11-toolkits/sakura|x11/sakura|2014-02-16|Moved to a better category
+misc/kde4-shared-mime-info||2014-02-18|Removed, the port not needed anymore
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@ -55,7 +55,6 @@ Kde_Pre_Include=	bsd.kde4.mk
 # pykdeuic4		- PyKDE user interface compiler
 # qtruby		- Qt 4 Ruby bindings
 # runtime		- Components required by many KDE Applications
-# sharedmime		- MIME types database for KDE ports
 # smokegen		- SMOKE base libraries
 # smokekde		- KDE SMOKE libraries
 # smokeqt		- Qt 4 SMOKE libraries
@ -74,7 +73,8 @@ Kde_Pre_Include=	bsd.kde4.mk
 #			  ${LOCALBASE}/kde4, but this could change in the future.
 #

-KDE4_VERSION?=		4.10.5
+KDE4_VERSION?=		4.12.2
+KDE4_WORKSPACE_VERSION=	4.11.6
 KDE4_BRANCH?=		stable
 KTP_VERSION?=		0.6.1
 KTP_BRANCH?=		stable
@ -83,11 +83,7 @@ CALLIGRA_BRANCH?=	stable
 KDEVELOP_VERSION?=	4.6.0
 KDEVELOP_BRANCH?=	stable

-#
-# KDE4 is installed into its own prefix to avoid conflicting with KDE3.
-#
-
-KDE4_PREFIX?=	${LOCALBASE}/kde4
+KDE4_PREFIX?=	${LOCALBASE}

 # Help cmake to find files when testing ports with non-default PREFIX
 CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH="${LOCALBASE};${KDE4_PREFIX}" \
@ -104,7 +100,9 @@ NO_MTREE=	yes
 .endif

 PLIST_SUB+=	KDE4_PREFIX="${KDE4_PREFIX}" \
-		KDE4_VERSION="${KDE4_VERSION}"
+		KDE4_VERSION="${KDE4_VERSION}" \
+		KDE4_GENERIC_LIB_VERSION=${KDE4_VERSION} \
+		KDE4_NON_GENERIC_LIB_VERSION=${KDE4_VERSION:S,^4,5,}

 # Keep in sync with cmake/modules/PythonMacros.cmake
 _PYTHON_SHORT_VER=	${PYTHON_VERSION:S/^python//:S/.//}
@ -135,7 +133,7 @@ _USE_KDE4_ALL=		baseapps kactivities kate kdehier kdelibs kdeprefix \
 			libkexiv2 libkdegames libkipi libkonq libksane marble \
 			nepomuk-core nepomuk-widgets \
 			okular oxygen perlkde perlqt pimlibs pykde4 pykdeuic4 \
-			qtruby runtime sharedmime smokegen smokekde smokeqt \
+			qtruby runtime smokegen smokekde smokeqt \
 			workspace
 # These components are not part of the Software Compilation.
 _USE_KDE4_ALL+=		akonadi attica automoc4 ontologies qimageblitz soprano \
@ -146,60 +144,60 @@ baseapps_PATH=		${KDE4_PREFIX}/bin/kfmclient
 baseapps_TYPE=		run

 kactivities_PORT=	x11/kactivities
-kactivities_PATH=	${KDE4_PREFIX}/lib/libkactivities.so.6
+kactivities_PATH=	${KDE4_PREFIX}/lib/libkactivities.so

 kate_PORT=		editors/kate
-kate_PATH=		${KDE4_PREFIX}/lib/libkateinterfaces.so.5
+kate_PATH=		${KDE4_PREFIX}/lib/libkateinterfaces.so

 kdehier_PORT=		misc/kdehier4
 kdehier_PATH=		kdehier4>=0
 kdehier_TYPE=		run

 kdelibs_PORT=		x11/kdelibs4
-kdelibs_PATH=		${KDE4_PREFIX}/lib/libkdecore.so.7
+kdelibs_PATH=		${KDE4_PREFIX}/lib/libkdecore.so

 korundum_PORT=		devel/ruby-korundum
 korundum_PATH=		${KDE4_PREFIX}/lib/kde4/krubypluginfactory.so
 korundum_TYPE=		run

 libkcddb_PORT=		audio/libkcddb
-libkcddb_PATH=		${KDE4_PREFIX}/lib/libkcddb.so.5
+libkcddb_PATH=		${KDE4_PREFIX}/lib/libkcddb.so

 libkcompactdisc_PORT=	audio/libkcompactdisc
-libkcompactdisc_PATH=	${KDE4_PREFIX}/lib/libkcompactdisc.so.5
+libkcompactdisc_PATH=	${KDE4_PREFIX}/lib/libkcompactdisc.so

 libkdcraw_PORT=		graphics/libkdcraw-kde4
-libkdcraw_PATH=		${KDE4_PREFIX}/lib/libkdcraw.so.22
+libkdcraw_PATH=		${KDE4_PREFIX}/lib/libkdcraw.so

 libkdeedu_PORT=		misc/libkdeedu
-libkdeedu_PATH=		${KDE4_PREFIX}/lib/libkeduvocdocument.so.5
+libkdeedu_PATH=		${KDE4_PREFIX}/lib/libkeduvocdocument.so

 libkdegames_PORT=	games/libkdegames
-libkdegames_PATH=	${KDE4_PREFIX}/lib/libkdegames.so.6
+libkdegames_PATH=	${KDE4_PREFIX}/lib/libkdegames.so

 libkexiv2_PORT=		graphics/libkexiv2-kde4
-libkexiv2_PATH=		${KDE4_PREFIX}/lib/libkexiv2.so.11
+libkexiv2_PATH=		${KDE4_PREFIX}/lib/libkexiv2.so

 libkipi_PORT=		graphics/libkipi-kde4
-libkipi_PATH=		${KDE4_PREFIX}/lib/libkipi.so.10
+libkipi_PATH=		${KDE4_PREFIX}/lib/libkipi.so

 libkonq_PORT=		x11/libkonq
-libkonq_PATH=		${KDE4_PREFIX}/lib/libkonq.so.7
+libkonq_PATH=		${KDE4_PREFIX}/lib/libkonq.so

 libksane_PORT=		graphics/libksane
-libksane_PATH=		${KDE4_PREFIX}/lib/libksane.so.0
+libksane_PATH=		${KDE4_PREFIX}/lib/libksane.so

 marble_PORT=		astro/marble
-marble_PATH=		${KDE4_PREFIX}/lib/libmarblewidget.so.15
+marble_PATH=		${KDE4_PREFIX}/lib/libmarblewidget.so

 nepomuk-core_PORT=	sysutils/nepomuk-core
-nepomuk-core_PATH=	${KDE4_PREFIX}/lib/libnepomukcore.so.5
+nepomuk-core_PATH=	${KDE4_PREFIX}/lib/libnepomukcore.so

 nepomuk-widgets_PORT=	sysutils/nepomuk-widgets
-nepomuk-widgets_PATH=	${KDE4_PREFIX}/lib/libnepomukwidgets.so.5
+nepomuk-widgets_PATH=	${KDE4_PREFIX}/lib/libnepomukwidgets.so

 okular_PORT=		graphics/okular
-okular_PATH=		${KDE4_PREFIX}/lib/libokularcore.so.2
+okular_PATH=		${KDE4_PREFIX}/lib/libokularcore.so

 oxygen_PORT=		x11-themes/kde4-icons-oxygen
 oxygen_PATH=		${KDE4_PREFIX}/share/icons/oxygen/index.theme
@ -213,7 +211,7 @@ perlqt_PORT=		devel/p5-perlqt
 perlqt_PATH=		${KDE4_PREFIX}/bin/puic4

 pimlibs_PORT=		deskutils/kdepimlibs4
-pimlibs_PATH=		${KDE4_PREFIX}/lib/libkpimutils.so.5
+pimlibs_PATH=		${KDE4_PREFIX}/lib/libkpimutils.so

 pykde4_PORT=		devel/py-pykde4
 pykde4_PATH=		${KDE4_PREFIX}/lib/kde4/kpythonpluginfactory.so
@ -224,32 +222,29 @@ pykdeuic4_PATH=		${LOCALBASE}/bin/pykdeuic4
 pykdeuic4_TYPE=		run

 qtruby_PORT=		devel/ruby-qtruby
-qtruby_PATH=		${KDE4_PREFIX}/lib/libqtruby4shared.so.2
+qtruby_PATH=		${KDE4_PREFIX}/lib/libqtruby4shared.so

 runtime_PORT=		x11/kde4-runtime
 runtime_PATH=		${KDE4_PREFIX}/bin/knotify4
 runtime_TYPE=		run

-sharedmime_PORT=	misc/kde4-shared-mime-info
-sharedmime_PATH=	kde4-shared-mime-info>=0
-
 smokegen_PORT=		devel/smokegen
-smokegen_PATH=		${KDE4_PREFIX}/lib/libsmokebase.so.3
+smokegen_PATH=		${KDE4_PREFIX}/lib/libsmokebase.so

 smokekde_PORT=		devel/smokekde
-smokekde_PATH=		${KDE4_PREFIX}/lib/libsmokekdecore.so.3
+smokekde_PATH=		${KDE4_PREFIX}/lib/libsmokekdecore.so

 smokeqt_PORT=		devel/smokeqt
-smokeqt_PATH=		${KDE4_PREFIX}/lib/libsmokeqtcore.so.3
+smokeqt_PATH=		${KDE4_PREFIX}/lib/libsmokeqtcore.so

 workspace_PORT=		x11/kde4-workspace
-workspace_PATH=		${KDE4_PREFIX}/lib/libkworkspace.so.5
+workspace_PATH=		${KDE4_PREFIX}/lib/libkworkspace.so

 akonadi_PORT=		databases/akonadi
-akonadi_PATH=		${KDE4_PREFIX}/lib/libakonadiprotocolinternals.so.1
+akonadi_PATH=		${KDE4_PREFIX}/lib/libakonadiprotocolinternals.so

 attica_PORT=		x11-toolkits/attica
-attica_PATH=		${LOCALBASE}/lib/libattica.so.0
+attica_PATH=		${LOCALBASE}/lib/libattica.so

 automoc4_PORT=		devel/automoc4
 automoc4_PATH=		${LOCALBASE}/bin/automoc4
@ -259,10 +254,10 @@ ontologies_PORT=	x11-toolkits/shared-desktop-ontologies
 ontologies_PATH=	${LOCALBASE}/share/ontology/core/rdf.ontology

 qimageblitz_PORT=	x11/qimageblitz
-qimageblitz_PATH=	${LOCALBASE}/lib/libqimageblitz.so.4
+qimageblitz_PATH=	${LOCALBASE}/lib/libqimageblitz.so

 soprano_PORT=		textproc/soprano
-soprano_PATH=		${LOCALBASE}/lib/libsoprano.so.4
+soprano_PATH=		${LOCALBASE}/lib/libsoprano.so

 strigi_PORT=		deskutils/libstreamanalyzer
 strigi_PATH=		${LOCALBASE}/lib/libstreamanalyzer.so.0
@ -301,16 +296,4 @@ IGNORE=				can't be installed: unknown USE_KDE4 component '${component}'
 . endif # ${_USE_KDE4_ALL:M${component}} != ""
 .endfor

-.if defined(USE_KDE4) && ${USE_KDE4:Msharedmime} != ""
-post-install:	post-install-sharedmime
-. if !target(post-install-sharedmime)
-post-install-sharedmime:
-.  if defined(NO_STAGE)
-	@-${LOCALBASE}/bin/update-mime-database ${KDE4_PREFIX}/share/mime
-.  endif
-	@${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true" >> ${TMPPLIST}
-. endif
-.endif
-
 .endif # defined(_POSTMKINCLUDED) && !defined(Kde_Post_Include)
--- a/23
+++ b/23
@ -5,6 +5,29 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20140218:
+  AFFECTS: users of KDE SC 4
+  AUTHOR: kde@FreeBSD.org
+
+  KDE SC ports have been updated to 4.12.2. kdeadmin, kdenetwork, kdesdk,
+  and kdetoys ports have been split due to upstream changes.
+
+  KDE Workspace port has been updated to 4.11.6. It requires modern
+  Mesa libraries, provided by WITH_NEW_XORG knob. To update Xorg ports
+  to newer version follow instructions at https://wiki.freebsd.org/Graphics
+
+20140218:
+  AFFECTS: users of misc/kdehier4
+  AUTHOR: kde@FreeBSD.org
+
+  KDE4_PREFIX has been changed from /usr/local/kde4 to /usr/local.
+  All ports that depends on kdehier4 must be reinstalled.
+  PORTREVISION for affected ports has been increased, upgrading tools
+  (portmaster, pkg) should handle this update without manual intervention.
+  Please check /usr/local/kde4 for leftovers after upgrade. If you don't
+  have locally modified files, e.g. under /usr/local/kde4/etc, you may
+  safely remove /usr/local/kde4.
+
 20140214:
  AFFECTS: users of lang/perl5.12
  AUTHOR: mat@FreeBSD.org
--- a/accessibility/jovie/Makefile
+++ b/accessibility/jovie/Makefile
@ -2,10 +2,8 @@

 PORTNAME=	jovie
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -13,16 +11,10 @@ COMMENT=	KDE text-to-speech system

 LIB_DEPENDS=	libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher

-CONFLICTS=	ktts-4.[4-6].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USES=		cmake:outsource
 USE_KDE4=	kdehier kdeprefix kdelibs automoc4
 USE_QT4=	xml qmake_build moc_build uic_build rcc_build
 USE_LDCONFIG=	yes

-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.mk>
--- a/accessibility/jovie/distinfo
+++ b/accessibility/jovie/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/jovie-4.10.5.tar.xz) = 664f1de0e226a7d2d01f498093b603a1bf9750145328141fdeedc1643f368c15
-SIZE (KDE/4.10.5/jovie-4.10.5.tar.xz) = 370180
+SHA256 (KDE/4.12.2/jovie-4.12.2.tar.xz) = bc3249139211c45f70c06d0585fc7549f245f9b398e08ebc5b435844afbcfad4
+SIZE (KDE/4.12.2/jovie-4.12.2.tar.xz) = 379356
--- a/accessibility/jovie/pkg-plist
+++ b/accessibility/jovie/pkg-plist
@ -4,8 +4,8 @@ lib/kde4/jovie_talkerchooserplugin.so
 lib/kde4/jovie_xmltransformerplugin.so
 lib/kde4/kcm_kttsd.so
 lib/libkttsd.so
-lib/libkttsd.so.5
-lib/libkttsd.so.5.0.1
+lib/libkttsd.so.4
+lib/libkttsd.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/applications/kde4/jovieapp.desktop
 share/apps/jovie/kcmkttsd_testmessage.desktop
 share/apps/jovie/stringreplacer/abbreviations.xml
@ -20,7 +20,7 @@ share/apps/jovie/stringreplacer/qt2plaintext.xml
 share/apps/jovie/talkerchooser/female_notifications_rc
 share/apps/jovie/xmltransformer/xhtml2ssml.xsl
 share/apps/jovie/xmltransformer/xhtml2ssml_simple.xsl
-share/apps/kttsd/xslt/SSMLtoPlainText.xsl
+share/apps/jovie/xslt/SSMLtoPlainText.xsl
 share/doc/HTML/en/jovie/addtalker.png
 share/doc/HTML/en/jovie/common
 share/doc/HTML/en/jovie/filters.png
@ -50,8 +50,7 @@ share/kde4/services/kcmkttsd.desktop
 share/kde4/services/kttsd.desktop
 share/kde4/servicetypes/jovie_filterplugin.desktop
@dirrm share/doc/HTML/en/jovie
-@dirrm share/apps/kttsd/xslt
-@dirrm share/apps/kttsd
+@dirrm share/apps/jovie/xslt
@dirrm share/apps/jovie/xmltransformer
@dirrm share/apps/jovie/talkerchooser
@dirrm share/apps/jovie/stringreplacer
--- a/accessibility/kaccessible/Makefile
+++ b/accessibility/kaccessible/Makefile
@ -2,10 +2,8 @@

 PORTNAME=	kaccessible
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -13,9 +11,6 @@ COMMENT=	Accessibility services for KDE

 LIB_DEPENDS=	libspeechd.so:${PORTSDIR}/accessibility/speech-dispatcher

-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USES=		cmake:outsource
--- a/accessibility/kaccessible/distinfo
+++ b/accessibility/kaccessible/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kaccessible-4.10.5.tar.xz) = b665e8fbb671b675add3858cf6cd1bdaaf94e3355b5f9b8a1b51e0aaf0ef4d67
-SIZE (KDE/4.10.5/kaccessible-4.10.5.tar.xz) = 20844
+SHA256 (KDE/4.12.2/kaccessible-4.12.2.tar.xz) = 89061981c67eac6f7414f1d53b71c28c7545e2255d92483624f42411125a140a
+SIZE (KDE/4.12.2/kaccessible-4.12.2.tar.xz) = 20412
--- a/accessibility/kdeaccessibility4/Makefile
+++ b/accessibility/kdeaccessibility4/Makefile
@ -4,7 +4,6 @@
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility kde
-MASTER_SITES=	# empty
 DISTFILES=	# empty

 MAINTAINER=	kde@FreeBSD.org
@ -12,42 +11,25 @@ COMMENT=	Accessibility applications for KDE 4

 USE_KDE4=	kdeprefix
 NO_BUILD=	yes
-NO_STAGE=	yes
-
-LATEST_LINK=	${PORTNAME}4
+NO_INSTALL=	yes
+NO_MTREE=	yes

 OPTIONS_DEFINE=	JOVIE KACCESSIBLE KMAG KMOUSETOOL KMOUTH
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}

 JOVIE_DESC=		Install Jovie text-to-speech system
+JOVIE_RUN_DEPENDS=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
+
 KACCESSIBLE_DESC=	Install Accessibility services for KDE
+KACCESSIBLE_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:${PORTSDIR}/accessibility/kaccessible
+
 KMAG_DESC=		Install Screen magnifier
+KMAG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmag:${PORTSDIR}/accessibility/kmag
+
 KMOUSETOOL_DESC=	Install Automatic mouse click tool
+KMOUSETOOL_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmousetool:${PORTSDIR}/accessibility/kmousetool
+
 KMOUTH_DESC=		Install Speech synthesizer frontend
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MJOVIE}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/jovie:${PORTSDIR}/accessibility/jovie
-.endif
-
-.if ${PORT_OPTIONS:MKACCESSIBLE}
-RUN_DEPENDS+=	${KDE4_PREFIX}/lib/kde4/libexec/kaccessibleapp:${PORTSDIR}/accessibility/kaccessible
-.endif
-
-.if ${PORT_OPTIONS:MKMAG}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmag:${PORTSDIR}/accessibility/kmag
-.endif
-
-.if ${PORT_OPTIONS:MKMOUSETOOL}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmousetool:${PORTSDIR}/accessibility/kmousetool
-.endif
-
-.if ${PORT_OPTIONS:MKMOUTH}
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/kmouth:${PORTSDIR}/accessibility/kmouth
-.endif
-
-do-install:
-	${DO_NADA}
+KMOUTH_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kmouth:${PORTSDIR}/accessibility/kmouth

 .include <bsd.port.mk>
--- a/accessibility/kmag/Makefile
+++ b/accessibility/kmag/Makefile
@ -3,23 +3,17 @@
 PORTNAME=	kmag
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Screen magnifier

-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build

-MAN1=	kmag.1
-
 # Somebody has to create port for libkdeaccessibilityclient first
 CMAKE_ARGS+=	-DWITH_QAccessibilityClient=off

--- a/accessibility/kmag/distinfo
+++ b/accessibility/kmag/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kmag-4.10.5.tar.xz) = 44b81a8ac41e3fa2d3cc3a6c79e90b832366e0ebd363d8d6c4a4f97b918f55c5
-SIZE (KDE/4.10.5/kmag-4.10.5.tar.xz) = 93636
+SHA256 (KDE/4.12.2/kmag-4.12.2.tar.xz) = 710467f8301b116ca1a92b2cf4ce284419771a0a39abee062eade6086a0a1478
+SIZE (KDE/4.12.2/kmag-4.12.2.tar.xz) = 86080
--- a/accessibility/kmag/pkg-plist
+++ b/accessibility/kmag/pkg-plist
@ -1,4 +1,5 @@
 bin/kmag
+man/man1/kmag.1.gz
 share/applications/kde4/kmag.desktop
 share/apps/kmag/kmagui.rc
 share/doc/HTML/en/kmag/common
--- a/accessibility/kmousetool/Makefile
+++ b/accessibility/kmousetool/Makefile
@ -3,22 +3,16 @@
 PORTNAME=	kmousetool
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Automatic mouse click tool for KDE

-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_XORG=	xtst

-MAN1=	kmousetool.1
-
 .include <bsd.port.mk>
--- a/accessibility/kmousetool/distinfo
+++ b/accessibility/kmousetool/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kmousetool-4.10.5.tar.xz) = 012deb606b104778fff80dd3e9d7e9205bef046f2a00af08a282457b1f418f0a
-SIZE (KDE/4.10.5/kmousetool-4.10.5.tar.xz) = 43828
+SHA256 (KDE/4.12.2/kmousetool-4.12.2.tar.xz) = 2302d91ceb6c31f8f11a5a3d4ec2d3f3bd45903e0f5c18f82c9ad91df0d231d8
+SIZE (KDE/4.12.2/kmousetool-4.12.2.tar.xz) = 35932
--- a/accessibility/kmousetool/pkg-plist
+++ b/accessibility/kmousetool/pkg-plist
@ -1,4 +1,5 @@
 bin/kmousetool
+man/man1/kmousetool.1.gz
 share/applications/kde4/kmousetool.desktop
 share/apps/kmousetool/sounds/mousetool_tap.wav
 share/doc/HTML/en/kmousetool/common
--- a/accessibility/kmouth/Makefile
+++ b/accessibility/kmouth/Makefile
@ -3,21 +3,15 @@
 PORTNAME=	kmouth
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	accessibility kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Speech synthesizer frontend for KDE

-CONFLICTS_INSTALL=	kdeaccessibility-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build

-MAN1=	kmouth.1
-
 .include <bsd.port.mk>
--- a/accessibility/kmouth/distinfo
+++ b/accessibility/kmouth/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kmouth-4.10.5.tar.xz) = 55b182c3414059e5e164ca4079db7ded2a770a04d2e14018cbd95c9255174f26
-SIZE (KDE/4.10.5/kmouth-4.10.5.tar.xz) = 322248
+SHA256 (KDE/4.12.2/kmouth-4.12.2.tar.xz) = 613391b7ac5bbd82fa7ab15b8fcaf991a3fe5d61fc5164ded347683e3705351e
+SIZE (KDE/4.12.2/kmouth-4.12.2.tar.xz) = 307940
--- a/accessibility/kmouth/pkg-plist
+++ b/accessibility/kmouth/pkg-plist
@ -1,4 +1,5 @@
 bin/kmouth
+man/man1/kmouth.1.gz
 share/applications/kde4/kmouth.desktop
 share/apps/kmouth/books/de/de-courteousness.phrasebook
 share/apps/kmouth/books/de/de-greetings.phrasebook
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@ -9,6 +9,5 @@ COMMENT=	Arabic messages and documentation for KDE SC 4

 KDE4_L10N=	ar

-NO_STAGE=	yes
 .include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
--- a/arabic/kde4-l10n/distinfo
+++ b/arabic/kde4-l10n/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kde-l10n/kde-l10n-ar-4.10.5.tar.xz) = 0817e7532d2b6d36bee2fa8f2236af0e53776173c624efb2e0c605a74fbabb57
-SIZE (KDE/4.10.5/kde-l10n/kde-l10n-ar-4.10.5.tar.xz) = 3348844
+SHA256 (KDE/4.12.2/kde-l10n/kde-l10n-ar-4.12.2.tar.xz) = f38e96956991b2dad0c155f70ee251e4f7bf11eb9a9e66ddae8936e1d604e4f8
+SIZE (KDE/4.12.2/kde-l10n/kde-l10n-ar-4.12.2.tar.xz) = 3308836
--- a/arabic/kde4-l10n/pkg-plist
+++ b/arabic/kde4-l10n/pkg-plist
@ -105,7 +105,6 @@ share/locale/ar/LC_MESSAGES/katetextfilter.mo
 share/locale/ar/LC_MESSAGES/katexmlcheck.mo
 share/locale/ar/LC_MESSAGES/katexmltools.mo
 share/locale/ar/LC_MESSAGES/katomic.mo
-share/locale/ar/LC_MESSAGES/kbattleship.mo
 share/locale/ar/LC_MESSAGES/kblackbox.mo
 share/locale/ar/LC_MESSAGES/kblankscrn.mo
 share/locale/ar/LC_MESSAGES/kblocks.mo
@ -134,7 +133,6 @@ share/locale/ar/LC_MESSAGES/kcm_nepomuk.mo
 share/locale/ar/LC_MESSAGES/kcm_pci.mo
 share/locale/ar/LC_MESSAGES/kcm_phonon.mo
 share/locale/ar/LC_MESSAGES/kcm_platform.mo
-share/locale/ar/LC_MESSAGES/kcm_solid.mo
 share/locale/ar/LC_MESSAGES/kcm_solid_actions.mo
 share/locale/ar/LC_MESSAGES/kcm_standard_actions.mo
 share/locale/ar/LC_MESSAGES/kcmaccess.mo
@ -295,6 +293,7 @@ share/locale/ar/LC_MESSAGES/kmix.mo
 share/locale/ar/LC_MESSAGES/kmousetool.mo
 share/locale/ar/LC_MESSAGES/kmouth.mo
 share/locale/ar/LC_MESSAGES/kmplot.mo
+share/locale/ar/LC_MESSAGES/knavalbattle.mo
 share/locale/ar/LC_MESSAGES/knetattach.mo
 share/locale/ar/LC_MESSAGES/knetwalk.mo
 share/locale/ar/LC_MESSAGES/knode.mo
@ -399,6 +398,7 @@ share/locale/ar/LC_MESSAGES/libkldap.mo
 share/locale/ar/LC_MESSAGES/libkleopatra.mo
 share/locale/ar/LC_MESSAGES/libkmahjongg.mo
 share/locale/ar/LC_MESSAGES/libkmime.mo
+share/locale/ar/LC_MESSAGES/libkomparediff2.mo
 share/locale/ar/LC_MESSAGES/libkonq.mo
 share/locale/ar/LC_MESSAGES/libkpgp.mo
 share/locale/ar/LC_MESSAGES/libkpimidentities.mo
@ -434,9 +434,7 @@ share/locale/ar/LC_MESSAGES/minitoolsplugin.mo
 share/locale/ar/LC_MESSAGES/mplayerthumbs.mo
 share/locale/ar/LC_MESSAGES/mplayerthumbsconfig.mo
 share/locale/ar/LC_MESSAGES/nepomukbackup.mo
-share/locale/ar/LC_MESSAGES/nepomukcontroller.mo
 share/locale/ar/LC_MESSAGES/nepomukfileindexer.mo
-share/locale/ar/LC_MESSAGES/nepomukqueryservice.mo
 share/locale/ar/LC_MESSAGES/nepomukserver.mo
 share/locale/ar/LC_MESSAGES/nepomukservicestub.mo
 share/locale/ar/LC_MESSAGES/nepomukstorage.mo
@ -535,7 +533,6 @@ share/locale/ar/LC_MESSAGES/plasma_containmentactions_contextmenu.mo
 share/locale/ar/LC_MESSAGES/plasma_containmentactions_switchactivity.mo
 share/locale/ar/LC_MESSAGES/plasma_containmentactions_switchdesktop.mo
 share/locale/ar/LC_MESSAGES/plasma_containmentactions_switchwindow.mo
-share/locale/ar/LC_MESSAGES/plasma_engine_calendar.mo
 share/locale/ar/LC_MESSAGES/plasma_engine_keystate.mo
 share/locale/ar/LC_MESSAGES/plasma_engine_kuiserver.mo
 share/locale/ar/LC_MESSAGES/plasma_engine_metadata.mo
@ -595,9 +592,7 @@ share/locale/ar/LC_MESSAGES/randrmonitor.mo
 share/locale/ar/LC_MESSAGES/rellinks.mo
 share/locale/ar/LC_MESSAGES/searchbarplugin.mo
 share/locale/ar/LC_MESSAGES/solid-hardware.mo
-share/locale/ar/LC_MESSAGES/solid-network.mo
 share/locale/ar/LC_MESSAGES/solid_qt.mo
-share/locale/ar/LC_MESSAGES/solidcontrol.mo
 share/locale/ar/LC_MESSAGES/soliduiserver.mo
 share/locale/ar/LC_MESSAGES/strigila_diff.mo
 share/locale/ar/LC_MESSAGES/superkaramba.mo
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@ -4,8 +4,7 @@
 PORTNAME=	ark
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	archivers kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -13,55 +12,23 @@ COMMENT=	Archiving tool for KDE

 LIB_DEPENDS=	libqjson.so:${PORTSDIR}/devel/qjson

-CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
-
-NO_STAGE=	yes
 USE_XZ=		yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs libkonq
 USES=		cmake:outsource
 USE_QT4=	qtestlib qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes

-MAN1=		ark.1
-
 OPTIONS_DEFINE=	7ZIP RAR ZIP

 7ZIP_DESC=	Support for 7-Zip archives
+7ZIP_RUN_DEPENDS=	7z:${PORTSDIR}/archivers/p7zip
+
 RAR_DESC=	Support for RAR archives
+RAR_RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
+			rar:${PORTSDIR}/archivers/rar
+
 ZIP_DESC=	Support for ZIP archives
+ZIP_RUN_DEPENDS=	unzip>0:${PORTSDIR}/archivers/unzip \
+			zip:${PORTSDIR}/archivers/zip

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:M7ZIP}
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
-.endif
-
-.if ${PORT_OPTIONS:MZIP}
-RUN_DEPENDS+=	unzip>0:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	libarchive.so:${PORTSDIR}/archivers/libarchive
-.endif
-
-.if ${PORT_OPTIONS:MRAR}
-RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
-.if ${ARCH} != "amd64" && ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64"
-INSTALL_RAR=	YES
-.elif ${ARCH} == "amd64"
-.ifndef(HAVE_COMPAT_IA32_KERN)
-HAVE_COMPAT_IA32_KERN!=	if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then ${ECHO_CMD} YES; fi
-.endif
-.if ${HAVE_COMPAT_IA32_KERN} == "YES"
-INSTALL_RAR=	YES
-.endif
-.endif
-.ifdef(INSTALL_RAR)
-RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/ark-4.10.5.tar.xz) = 3bac56d6548ed8afcbe646e1f2ccb7740339abb48497b558772734c7e0356bbb
-SIZE (KDE/4.10.5/ark-4.10.5.tar.xz) = 238508
+SHA256 (KDE/4.12.2/ark-4.12.2.tar.xz) = 1687384e83d515499e2fab5041c626ead2336b4a6284ce43db8996c9ebba0624
+SIZE (KDE/4.12.2/ark-4.12.2.tar.xz) = 229568
--- a/archivers/ark/pkg-plist
+++ b/archivers/ark/pkg-plist
@ -10,8 +10,9 @@ lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libxz.so
 lib/kde4/libextracthere.so
 lib/libkerfuffle.so
-lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.1
+lib/libkerfuffle.so.4
+lib/libkerfuffle.so.%%KDE4_GENERIC_LIB_VERSION%%
+man/man1/ark.1.gz
 share/applications/kde4/ark.desktop
 share/apps/ark/ark_part.rc
 share/apps/ark/arkui.rc
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@ -2,10 +2,8 @@

 PORTNAME=	kstars
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	astro kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -13,17 +11,12 @@ COMMENT=	KDE 4 desktop planetarium

 LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio \
 		libwcs.so:${PORTSDIR}/astro/wcslib
-
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \
 		xplanet:${PORTSDIR}/astro/xplanet
-
 RUN_DEPENDS=	xplanet:${PORTSDIR}/astro/xplanet

-CONFLICTS=	kdeedu-4.[0-6].*
-
-NO_STAGE=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
-USES=		cmake:outsource
+USES=		cmake:outsource compiler:c++11-lib
 USE_QT4=	opengl qmake_build moc_build rcc_build uic_build
 USE_XZ=		yes

--- a/astro/kstars/distinfo
+++ b/astro/kstars/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kstars-4.10.5.tar.xz) = 3aee28f2ee66c3daca654a55b255e395af6e04f4cc49d10220e8d6665cb2c359
-SIZE (KDE/4.10.5/kstars-4.10.5.tar.xz) = 12462904
+SHA256 (KDE/4.12.2/kstars-4.12.2.tar.xz) = ddfbc9da61ed868dcfc47f3378ff78978d9c33e8638965ba28444961034ecd17
+SIZE (KDE/4.12.2/kstars-4.12.2.tar.xz) = 12345364
--- a/astro/kstars/pkg-plist
+++ b/astro/kstars/pkg-plist
@ -2,6 +2,8 @@ bin/kstars
 lib/libhtmesh.a
 share/applications/kde4/kstars.desktop
 share/apps/kstars/Cities.dat
+share/apps/kstars/Interesting.dat
+share/apps/kstars/PlanetFacts.dat
 share/apps/kstars/TZrules.dat
 share/apps/kstars/advinterface.dat
 share/apps/kstars/asteroids.dat
@ -271,6 +273,13 @@ share/apps/kstars/textures/star.png
 share/apps/kstars/textures/sun.png
 share/apps/kstars/textures/uranus.png
 share/apps/kstars/textures/venus.png
+share/apps/kstars/tools/whatsinteresting/qml/ScrollBar.qml
+share/apps/kstars/tools/whatsinteresting/qml/leftArrow.png
+share/apps/kstars/tools/whatsinteresting/qml/next.png
+share/apps/kstars/tools/whatsinteresting/qml/previous.png
+share/apps/kstars/tools/whatsinteresting/qml/reloadIcon.png
+share/apps/kstars/tools/whatsinteresting/qml/settingsIcon.png
+share/apps/kstars/tools/whatsinteresting/qml/wiview.qml
 share/apps/kstars/tips
 share/apps/kstars/unnamedstars.dat
 share/apps/kstars/uranus.B0.vsop
@ -448,6 +457,9 @@ share/icons/hicolor/48x48/apps/kstars.png
 share/icons/hicolor/64x64/apps/kstars.png
 share/icons/hicolor/scalable/apps/kstars.svgz
@dirrm share/doc/HTML/en/kstars
+@dirrm share/apps/kstars/tools/whatsinteresting/qml
+@dirrm share/apps/kstars/tools/whatsinteresting
+@dirrm share/apps/kstars/tools
@dirrm share/apps/kstars/textures
@dirrm share/apps/kstars/scripts
@dirrm share/apps/kstars/icons/hicolor/scalable/actions
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@ -3,16 +3,12 @@
 PORTNAME=	marble
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	astro kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE

-CONFLICTS=	kdeedu-4.4.[0-4]
-
-NO_STAGE=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource gmake shared-mime-info
 USE_QT4=	corelib dbus declarative designer_build gui network phonon \
@ -23,22 +19,21 @@ USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 CMAKE_ARGS=	-DMOBILE:BOOL=FALSE

+LIB_DEPENDS=	libquazip.so:${PORTSDIR}/archivers/quazip
+
 OPTIONS_DEFINE=	GPS
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_DEFAULT=	GPS
+OPTIONS_SUB=	yes
+
 GPS_DESC=	Support for GPS position provider
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGPS}
-LIB_DEPENDS+=	gps.20:${PORTSDIR}/astro/gpsd
-PLIST_SUB+=	GPS=""
-.else
-CMAKE_ARGS+=	-DWITH_libgps:BOOL=FALSE
-PLIST_SUB+=	GPS="@comment "
-.endif
+GPS_LIB_DEPENDS=	libgps.so:${PORTSDIR}/astro/gpsd
+GPS_CMAKE_OFF=	-DWITH_libgps:BOOL=FALSE

 pre-configure:
 	${REINPLACE_CMD} -e '/libgps/ s/FIND_PACKAGE/macro_optional_find_package/' \
 		${WRKSRC}/src/plugins/positionprovider/CMakeLists.txt
+# Prevent updating MIME during build.
+	${REINPLACE_CMD} -e '/update_xdg_mimetypes/ d' \
+		${PATCH_WRKSRC}/data/CMakeLists.txt

 .include <bsd.port.mk>
--- a/astro/marble/distinfo
+++ b/astro/marble/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/marble-4.10.5.tar.xz) = c4ef4e1dd6aea9589e907e3ed7a81272af227f8c1b7be9dc8b152aab25009e11
-SIZE (KDE/4.10.5/marble-4.10.5.tar.xz) = 19436748
+SHA256 (KDE/4.12.2/marble-4.12.2.tar.xz) = 74ea3b63e874a6d59b3a2db724b11c56592a9fe67c51290f01fc9d6526c3eabb
+SIZE (KDE/4.12.2/marble-4.12.2.tar.xz) = 18683696
--- a/astro/marble/files/patch-src__CMakeLists.txt
+++ b/astro/marble/files/patch-src__CMakeLists.txt
@ -1,23 +0,0 @@
--- ./src/CMakeLists.txt.orig	2012-02-29 22:57:03.966438000 +0000
-+++ ./src/CMakeLists.txt	2012-05-22 15:24:05.892577235 +0000
-@@ -8,7 +8,7 @@
- add_definitions(-DMARBLE_DBUS)
- endif(BUILD_WITH_DBUS)
- 
-if( QT_QTDECLARATIVE_FOUND )
-+if( MOBILE AND QT_QTDECLARATIVE_FOUND )
-   OPTION(IGNORE_CMAKE_INSTALL_PREFIX_FOR_DECLARATIVE_PLUGINS "Install Marble Qt Declarative plugins to QT_IMPORTS_DIR even if that is out of the CMAKE_INSTALL_PREFIX")
-   IF(DEFINED QT_IMPORTS_DIR)
-     SET(MARBLE_QT_IMPORTS_DIR ${QT_IMPORTS_DIR})
-@@ -44,9 +44,9 @@
- add_subdirectory( plugins )
- add_subdirectory( bindings )
- 
-if( QT_QTDECLARATIVE_FOUND )
-+if( MOBILE AND QT_QTDECLARATIVE_FOUND )
-     add_subdirectory( qt-components )
-endif( QT_QTDECLARATIVE_FOUND )
-+endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
- 
- if( NOT QTONLY AND KDE4_PLASMA_LIBS )   # don't try to build this against kdelibs < 4.2
-    add_subdirectory( plasmoid )
--- a/astro/marble/files/patch-srcpluginsCMakeLists.txt
+++ b/astro/marble/files/patch-srcpluginsCMakeLists.txt
@ -1,11 +0,0 @@
--- ./src/plugins/CMakeLists.txt.orig	2011-12-20 19:19:11.000000000 +0000
-+++ ./src/plugins/CMakeLists.txt	2012-05-22 15:24:05.930574748 +0000
-@@ -6,6 +6,6 @@
- add_subdirectory( templates )
- add_subdirectory( positionprovider )
- 
-if( QT_QTDECLARATIVE_FOUND )
-+if( MOBILE AND QT_QTDECLARATIVE_FOUND )
-     add_subdirectory( qt-components )
-endif( QT_QTDECLARATIVE_FOUND )
-+endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
--- a/astro/marble/files/patch-srcpluginsdeclarative__CMakeLists.txt
+++ b/astro/marble/files/patch-srcpluginsdeclarative__CMakeLists.txt
@ -1,14 +0,0 @@
--- ./src/plugins/declarative/CMakeLists.txt.orig	2011-12-20 19:19:11.000000000 +0000
-+++ ./src/plugins/declarative/CMakeLists.txt	2012-05-22 15:24:05.905573771 +0000
-@@ -1,4 +1,4 @@
-if( QT_QTDECLARATIVE_FOUND )
-+if( MOBILE AND QT_QTDECLARATIVE_FOUND )
- 
- PROJECT( MarbleDeclarativePlugin )
- 
-@@ -41,4 +41,4 @@
- ENDIF()
- INSTALL( FILES qmldir MarbleSettings.qml DESTINATION ${MARBLE_QT_IMPORTS_DIR}/org/kde/edu/marble )
- 
-endif( QT_QTDECLARATIVE_FOUND )
-+endif( MOBILE AND QT_QTDECLARATIVE_FOUND )
--- a/astro/marble/pkg-plist
+++ b/astro/marble/pkg-plist
@ -1,6 +1,7 @@
 bin/marble
-bin/routing-instructions
-bin/tilecreator
+bin/marble-mobile
+bin/marble-qt
+bin/marble-touch
 include/marble/AbstractDataPlugin.h
 include/marble/AbstractDataPluginItem.h
 include/marble/AbstractDataPluginModel.h
@ -14,16 +15,15 @@ include/marble/BillboardGraphicsItem.h
 include/marble/BookmarkManager.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
-include/marble/CylindricalProjection.h
 include/marble/DialogConfigurationInterface.h
 include/marble/DownloadRegion.h
 include/marble/DownloadRegionDialog.h
 include/marble/ElevationModel.h
-include/marble/EquirectProjection.h
 include/marble/FileViewWidget.h
 include/marble/FrameGraphicsItem.h
 include/marble/GeoDataAbstractView.h
 include/marble/GeoDataAccuracy.h
+include/marble/GeoDataBalloonStyle.h
 include/marble/GeoDataColorStyle.h
 include/marble/GeoDataContainer.h
 include/marble/GeoDataCoordinates.h
@ -34,12 +34,14 @@ include/marble/GeoDataGeometry.h
 include/marble/GeoDataGroundOverlay.h
 include/marble/GeoDataHotSpot.h
 include/marble/GeoDataIconStyle.h
+include/marble/GeoDataItemIcon.h
 include/marble/GeoDataLabelStyle.h
 include/marble/GeoDataLatLonAltBox.h
 include/marble/GeoDataLatLonBox.h
 include/marble/GeoDataLineString.h
 include/marble/GeoDataLineStyle.h
 include/marble/GeoDataLinearRing.h
+include/marble/GeoDataListStyle.h
 include/marble/GeoDataLod.h
 include/marble/GeoDataLookAt.h
 include/marble/GeoDataMultiGeometry.h
@ -53,6 +55,9 @@ include/marble/GeoDataRegion.h
 include/marble/GeoDataStyle.h
 include/marble/GeoDataStyleMap.h
 include/marble/GeoDataStyleSelector.h
+include/marble/GeoDataTimePrimitive.h
+include/marble/GeoDataTimeSpan.h
+include/marble/GeoDataTimeStamp.h
 include/marble/GeoDataTrack.h
 include/marble/GeoDataTreeModel.h
 include/marble/GeoDocument.h
@ -66,12 +71,14 @@ include/marble/LatLonEdit.h
 include/marble/LayerInterface.h
 include/marble/LegendWidget.h
 include/marble/Maneuver.h
+include/marble/MapThemeDownloadDialog.h
 include/marble/MapThemeManager.h
 include/marble/MapViewWidget.h
 include/marble/MapWizard.h
 include/marble/MarbleAboutDialog.h
-include/marble/MarbleAbstractRunner.h
+include/marble/MarbleColors.h
 include/marble/MarbleControlBox.h
+include/marble/MarbleDebug.h
 include/marble/MarbleDirs.h
 include/marble/MarbleGlobal.h
 include/marble/MarbleGraphicsGridLayout.h
@ -79,21 +86,27 @@ include/marble/MarbleGraphicsItem.h
 include/marble/MarbleMap.h
 include/marble/MarbleModel.h
 include/marble/MarbleNavigator.h
-include/marble/MarbleRunnerManager.h
+include/marble/MarbleWebView.h
 include/marble/MarbleWidget.h
 include/marble/MarbleWidgetInputHandler.h
-include/marble/MercatorProjection.h
+include/marble/MarbleWidgetPopupMenu.h
 include/marble/NavigationWidget.h
 include/marble/ParseRunnerPlugin.h
+include/marble/ParsingRunner.h
+include/marble/ParsingRunnerManager.h
 include/marble/Planet.h
 include/marble/PluginAboutDialog.h
 include/marble/PluginInterface.h
+include/marble/PluginManager.h
+include/marble/PositionProviderPlugin.h
 include/marble/PositionProviderPluginInterface.h
 include/marble/PositionTracking.h
 include/marble/QtMarbleConfigDialog.h
 include/marble/Quaternion.h
 include/marble/RenderPlugin.h
 include/marble/RenderPluginInterface.h
+include/marble/ReverseGeocodingRunner.h
+include/marble/ReverseGeocodingRunnerManager.h
 include/marble/ReverseGeocodingRunnerPlugin.h
 include/marble/Route.h
 include/marble/RouteRequest.h
@ -101,12 +114,15 @@ include/marble/RouteSegment.h
 include/marble/RoutingManager.h
 include/marble/RoutingModel.h
 include/marble/RoutingProfile.h
+include/marble/RoutingRunner.h
+include/marble/RoutingRunnerManager.h
 include/marble/RoutingRunnerPlugin.h
 include/marble/RoutingWidget.h
 include/marble/ScreenGraphicsItem.h
+include/marble/SearchRunner.h
+include/marble/SearchRunnerManager.h
 include/marble/SearchRunnerPlugin.h
 include/marble/Serializable.h
-include/marble/SphericalProjection.h
 include/marble/SunLocator.h
 include/marble/TileCoordsPyramid.h
 include/marble/TileCreator.h
@ -122,6 +138,10 @@ include/marble/marble_export.h
 lib/kde4/libmarble_part.so
 lib/kde4/plasma_applet_worldclock.so
 lib/kde4/plasma_runner_marble.so
+lib/kde4/plugins/designer/LatLonEditPlugin.so
+lib/kde4/plugins/designer/MarbleNavigatorPlugin.so
+lib/kde4/plugins/designer/MarbleWidgetPlugin.so
+lib/kde4/plugins/marble/AnnotatePlugin.so
 lib/kde4/plugins/marble/AprsPlugin.so
 lib/kde4/plugins/marble/AtmospherePlugin.so
 lib/kde4/plugins/marble/CachePlugin.so
@ -142,6 +162,7 @@ lib/kde4/plugins/marble/HostipPlugin.so
 lib/kde4/plugins/marble/JsonPlugin.so
 lib/kde4/plugins/marble/KmlPlugin.so
 lib/kde4/plugins/marble/LatLonPlugin.so
+lib/kde4/plugins/marble/License.so
 lib/kde4/plugins/marble/LocalDatabasePlugin.so
 lib/kde4/plugins/marble/LocalOsmSearchPlugin.so
 lib/kde4/plugins/marble/LogPlugin.so
@ -153,17 +174,18 @@ lib/kde4/plugins/marble/NavigationFloatItem.so
 lib/kde4/plugins/marble/NominatimReverseGeocodingPlugin.so
 lib/kde4/plugins/marble/NominatimSearchPlugin.so
 lib/kde4/plugins/marble/OSRMPlugin.so
+lib/kde4/plugins/marble/OpenCachingComPlugin.so
 lib/kde4/plugins/marble/OpenDesktopPlugin.so
 lib/kde4/plugins/marble/OpenRouteServicePlugin.so
 lib/kde4/plugins/marble/OsmPlugin.so
 lib/kde4/plugins/marble/OverviewMap.so
 lib/kde4/plugins/marble/Photo.so
 lib/kde4/plugins/marble/PlacemarkPositionProviderPlugin.so
+lib/kde4/plugins/marble/Pn2Plugin.so
 lib/kde4/plugins/marble/PntPlugin.so
 lib/kde4/plugins/marble/PositionMarker.so
 lib/kde4/plugins/marble/PostalCode.so
 lib/kde4/plugins/marble/ProgressFloatItem.so
-lib/kde4/plugins/marble/QNamNetworkPlugin.so
 lib/kde4/plugins/marble/RouteSimulationPositionProviderPlugin.so
 lib/kde4/plugins/marble/RoutingPlugin.so
 lib/kde4/plugins/marble/RoutinoPlugin.so
@ -174,12 +196,19 @@ lib/kde4/plugins/marble/SunPlugin.so
 lib/kde4/plugins/marble/Weather.so
 lib/kde4/plugins/marble/Wikipedia.so
 lib/kde4/plugins/marble/YoursPlugin.so
+%%QT_IMPORTDIR%%/org/kde/edu/marble/MarbleSettings.qml
+%%QT_IMPORTDIR%%/org/kde/edu/marble/libMarbleDeclarativePlugin.so
+%%QT_IMPORTDIR%%/org/kde/edu/marble/qmldir
 lib/libmarblewidget.so
-lib/libmarblewidget.so.0.15.0
-lib/libmarblewidget.so.15
+lib/libmarblewidget.so.0.17.0
+lib/libmarblewidget.so.17
 share/applications/kde4/marble.desktop
+share/applications/kde4/marble-mobile.desktop
+share/applications/kde4/marble-qt.desktop
+share/applications/kde4/marble-touch.desktop
 share/applications/kde4/marble_gpx.desktop
 share/applications/kde4/marble_kml.desktop
+share/applications/kde4/marble_kmz.desktop
 share/applications/kde4/marble_osm.desktop
 share/apps/cmake/modules/FindMarble.cmake
 share/apps/marble/data/LICENSE.txt
@ -220,7 +249,6 @@ share/apps/marble/data/bitmaps/default_location.png
 share/apps/marble/data/bitmaps/earth_apollo.jpg
 share/apps/marble/data/bitmaps/flag.png
 share/apps/marble/data/bitmaps/folder.png
-share/apps/marble/data/bitmaps/hand.png
 share/apps/marble/data/bitmaps/highway_footway.png
 share/apps/marble/data/bitmaps/highway_motorway.png
 share/apps/marble/data/bitmaps/highway_path.png
@ -301,7 +329,22 @@ share/apps/marble/data/bitmaps/routing_pick.png
 share/apps/marble/data/bitmaps/routing_remove.png
 share/apps/marble/data/bitmaps/routing_step.png
 share/apps/marble/data/bitmaps/satellite.png
+share/apps/marble/data/bitmaps/shadowframe.png
 share/apps/marble/data/bitmaps/shipwreck.png
+share/apps/marble/data/bitmaps/stars/star_0_blue.png
+share/apps/marble/data/bitmaps/stars/star_0_bluewhite.png
+share/apps/marble/data/bitmaps/stars/star_0_garnetred.png
+share/apps/marble/data/bitmaps/stars/star_0_orange.png
+share/apps/marble/data/bitmaps/stars/star_0_red.png
+share/apps/marble/data/bitmaps/stars/star_0_white.png
+share/apps/marble/data/bitmaps/stars/star_0_yellow.png
+share/apps/marble/data/bitmaps/stars/star_3_blue.png
+share/apps/marble/data/bitmaps/stars/star_3_bluewhite.png
+share/apps/marble/data/bitmaps/stars/star_3_garnetred.png
+share/apps/marble/data/bitmaps/stars/star_3_orange.png
+share/apps/marble/data/bitmaps/stars/star_3_red.png
+share/apps/marble/data/bitmaps/stars/star_3_white.png
+share/apps/marble/data/bitmaps/stars/star_3_yellow.png
 share/apps/marble/data/bitmaps/turn-around.png
 share/apps/marble/data/bitmaps/turn-continue.png
 share/apps/marble/data/bitmaps/turn-exit-left.png
@ -600,6 +643,50 @@ share/apps/marble/data/maps/earth/openstreetmap/legend/bridleway.png
 share/apps/marble/data/maps/earth/openstreetmap/legend/byway.png
 share/apps/marble/data/maps/earth/openstreetmap/legend/cycleway.png
 share/apps/marble/data/maps/earth/openstreetmap/legend/footway.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/accommodation_hotel2.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/accommodation_motel.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_court.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_firestation.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_library.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_playground.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_post_office.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_public_building.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_toilets.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/education_college.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/education_nursery.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/education_school.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/education_university.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_bar.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_biergarten.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_cafe.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_drinkingtap.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_fastfood.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_ice_cream.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_pub.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_restaurant.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_dentist.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_doctors.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_hospital.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_pharmacy.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_veterinary.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/money_atm.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/money_bank.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/money_currency_exchange.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/place_of_worship_christian.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/place_of_worship_unknown.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/poi_embassy.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/power_station_gas.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_alcohol.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_bakery.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_book.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_car.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_clothes.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_convenience.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_gift.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/tourist_cinema.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/tourist_monument.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/tourist_ruin.p.12.png
+share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/tourist_theatre.p.12.png
 share/apps/marble/data/maps/earth/openstreetmap/legend/motorway.png
 share/apps/marble/data/maps/earth/openstreetmap/legend/primaryroad.png
 share/apps/marble/data/maps/earth/openstreetmap/legend/railway.png
@ -828,6 +915,12 @@ share/apps/marble/data/mwdbii/PLAKE.PNT
 share/apps/marble/data/mwdbii/PLAKEISLAND.PNT
 share/apps/marble/data/mwdbii/PUSA48.DIFF.PNT
 share/apps/marble/data/mwdbii/RIVER.PNT
+share/apps/marble/data/naturalearth/50m-urban-area.pn2
+share/apps/marble/data/naturalearth/50m_glaciated_areas.pn2
+share/apps/marble/data/naturalearth/50m_lakes.pn2
+share/apps/marble/data/naturalearth/50m_land.pn2
+share/apps/marble/data/naturalearth/ne_10m_admin_0_boundary_lines_land.pn2
+share/apps/marble/data/naturalearth/ne_10m_rivers_lake_centerlines.pn2
 share/apps/marble/data/placemarks/baseplacemarks.cache
 share/apps/marble/data/placemarks/boundaryplacemarks.cache
 share/apps/marble/data/placemarks/cityplacemarks.cache
@ -837,6 +930,9 @@ share/apps/marble/data/placemarks/moonterrain.cache
 share/apps/marble/data/placemarks/otherplacemarks.cache
 share/apps/marble/data/precipcolors.leg
 share/apps/marble/data/seacolors.leg
+share/apps/marble/data/stars/constellations.dat
+share/apps/marble/data/stars/deepsky.png
+share/apps/marble/data/stars/dso.dat
 share/apps/marble/data/stars/stars.dat
 share/apps/marble/data/svg/application-x-marble-gray.png
 share/apps/marble/data/svg/application-x-marble.png
@ -849,6 +945,7 @@ share/apps/marble/data/svg/marble-logo-inverted-32dpi.png
 share/apps/marble/data/svg/marble-logo-inverted-72dpi.png
 share/apps/marble/data/svg/marble-logo.png
 share/apps/marble/data/svg/marble-logo.svg
+share/apps/marble/data/svg/marsmap.svg
 share/apps/marble/data/svg/sun.png
 share/apps/marble/data/svg/sunshine.png
 share/apps/marble/data/svg/track_turtle.svg
@ -888,9 +985,11 @@ share/apps/marble/marbleui.rc
 share/config.kcfg/marble.kcfg
 share/doc/HTML/en/marble/common
 share/doc/HTML/en/marble/configure-cacheproxy.png
+share/doc/HTML/en/marble/configure-dateandtime.png
 share/doc/HTML/en/marble/configure-navigation.png
 share/doc/HTML/en/marble/configure-plugins.png
 share/doc/HTML/en/marble/configure-routing.png
+share/doc/HTML/en/marble/configure-synchronization.png
 share/doc/HTML/en/marble/configure-view.png
 share/doc/HTML/en/marble/download-region-1.png
 share/doc/HTML/en/marble/download-region-2.png
@ -918,19 +1017,17 @@ share/icons/hicolor/64x64/apps/marble.png
 share/kde4/services/marble_part.desktop
 share/kde4/services/marble_part_gpx.desktop
 share/kde4/services/marble_part_kml.desktop
+share/kde4/services/marble_part_kmz.desktop
 share/kde4/services/marble_part_osm.desktop
 share/kde4/services/plasma-applet-kworldclock.desktop
 share/kde4/services/plasma-runner-marble.desktop
-share/mime/application/x-esri-shape-index.xml
-share/mime/application/x-esri-shape.xml
-share/mime/application/x-gpx+xml.xml
-share/mime/application/x-osm+xml.xml
 share/mime/packages/geo.xml
@dirrm share/doc/HTML/en/marble
@dirrm share/apps/marble/data/weather
@dirrm share/apps/marble/data/svg
@dirrm share/apps/marble/data/stars
@dirrm share/apps/marble/data/placemarks
+@dirrm share/apps/marble/data/naturalearth
@dirrm share/apps/marble/data/mwdbii
@dirrm share/apps/marble/data/maps/moon/clementine
@dirrm share/apps/marble/data/maps/moon
@ -964,6 +1061,7 @@ share/mime/packages/geo.xml
@dirrm share/apps/marble/data/maps/earth/precip-july
@dirrm share/apps/marble/data/maps/earth/precip-dec
@dirrm share/apps/marble/data/maps/earth/plain
+@dirrm share/apps/marble/data/maps/earth/openstreetmap/legend/mapicons
@dirrm share/apps/marble/data/maps/earth/openstreetmap/legend
@dirrm share/apps/marble/data/maps/earth/openstreetmap/0/0
@dirrm share/apps/marble/data/maps/earth/openstreetmap/0
@ -982,10 +1080,15 @@ share/mime/packages/geo.xml
@dirrm share/apps/marble/data/maps
@dirrm share/apps/marble/data/licenses
@dirrm share/apps/marble/data/flags
+@dirrm share/apps/marble/data/bitmaps/stars
@dirrm share/apps/marble/data/bitmaps/poi
@dirrm share/apps/marble/data/bitmaps
@dirrm share/apps/marble/data/audio
@dirrm share/apps/marble/data
@dirrm share/apps/marble
+@dirrm %%QT_IMPORTDIR%%/org/kde/edu/marble
+@dirrmtry %%QT_IMPORTDIR%%/org/kde/edu
+@dirrmtry %%QT_IMPORTDIR%%/org/kde
+@dirrmtry %%QT_IMPORTDIR%%/org
@dirrm lib/kde4/plugins/marble
@dirrm include/marble
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@ -4,8 +4,7 @@
 PORTNAME=	juk
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -15,10 +14,7 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib

-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
-
 USES=		cmake:outsource
-NO_STAGE=	yes
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
--- a/audio/juk/distinfo
+++ b/audio/juk/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/juk-4.10.5.tar.xz) = 898f1679b3742937c7edab278c44d6a31cc4c99267bccbddda49e91fde604902
-SIZE (KDE/4.10.5/juk-4.10.5.tar.xz) = 448256
+SHA256 (KDE/4.12.2/juk-4.12.2.tar.xz) = a15c5df36a1d0c64dfad486b474f7a39bb520530c85841e08e5db6fbf765671a
+SIZE (KDE/4.12.2/juk-4.12.2.tar.xz) = 429128
--- a/audio/juk/pkg-plist
+++ b/audio/juk/pkg-plist
@ -16,6 +16,7 @@ share/doc/HTML/en/juk/index.docbook
 share/doc/HTML/en/juk/juk-adv-search.png
 share/doc/HTML/en/juk/juk-file-renamer.png
 share/doc/HTML/en/juk/juk-main.png
+share/doc/HTML/en/juk/juk-manage-folders.png
 share/doc/HTML/en/juk/juk-tag-guesser.png
 share/doc/HTML/en/juk/normal-playlist.png
 share/doc/HTML/en/juk/search-playlist.png
--- a/audio/kio-audiocd/Makefile
+++ b/audio/kio-audiocd/Makefile
@ -3,8 +3,7 @@
 PORTNAME=	kio-audiocd
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DISTNAME=	audiocd-kio-${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTVERSION}

@ -18,10 +17,7 @@ LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
 		libogg.so:${PORTSDIR}/audio/libogg \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis

-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
-
 USES=		cmake:outsource
-NO_STAGE=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix libkcddb libkcompactdisc \
 		automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
@ -30,14 +26,6 @@ USE_LDCONFIG=	yes

 OPTIONS_DEFINE=	LAME
 LAME_DESC=	Install LAME MP3 audio encoder
-.if !defined(PACKAGE_BUILDING)
-OPTIONS_DEFAULT+=	LAME
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLAME}
-RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
-.endif
+LAME_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame

 .include <bsd.port.mk>
--- a/audio/kio-audiocd/distinfo
+++ b/audio/kio-audiocd/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/audiocd-kio-4.10.5.tar.xz) = 1b2781e36ed0138c59eb6473e269ef50ea364c88062088526bcff0c3f615aa86
-SIZE (KDE/4.10.5/audiocd-kio-4.10.5.tar.xz) = 56880
+SHA256 (KDE/4.12.2/audiocd-kio-4.12.2.tar.xz) = d289cad67d63bca6b43fae06fd065925cd7e1a9c3ee2f7b946ea08f3064ba97b
+SIZE (KDE/4.12.2/audiocd-kio-4.12.2.tar.xz) = 51192
--- a/audio/kio-audiocd/pkg-plist
+++ b/audio/kio-audiocd/pkg-plist
@ -3,15 +3,13 @@ lib/kde4/kcm_audiocd.so
 lib/kde4/kio_audiocd.so
 lib/kde4/libaudiocd_encoder_flac.so
 lib/kde4/libaudiocd_encoder_lame.so
-lib/kde4/libaudiocd_encoder_vorbis.so
 lib/kde4/libaudiocd_encoder_wav.so
 lib/libaudiocdplugins.so
-lib/libaudiocdplugins.so.5
-lib/libaudiocdplugins.so.5.0.1
+lib/libaudiocdplugins.so.4
+lib/libaudiocdplugins.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
 share/apps/solid/actions/solid_audiocd.desktop
 share/config.kcfg/audiocd_lame_encoder.kcfg
-share/config.kcfg/audiocd_vorbis_encoder.kcfg
 share/doc/HTML/en/kioslave/audiocd/common
 share/doc/HTML/en/kioslave/audiocd/index.cache.bz2
 share/doc/HTML/en/kioslave/audiocd/index.docbook
--- a/audio/kmix/Makefile
+++ b/audio/kmix/Makefile
@ -4,8 +4,7 @@
 PORTNAME=	kmix
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -13,10 +12,7 @@ COMMENT=	Sound mixer for KDE

 LICENSE=	GPLv2

-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
-
 USES=		cmake:outsource
-NO_STAGE=	yes
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	gui phonon xml \
 		moc_build qmake_build rcc_build uic_build
@ -24,23 +20,15 @@ USE_XZ=		yes

 OPTIONS_DEFINE=	ALSA PULSEAUDIO

-.include <bsd.port.options.mk>
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_EXTRA_PATCHES=	${FILESDIR}/extrapatch-no_alsa

-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-no_alsa
-.endif
-
-.if ${PORT_OPTIONS:MPULSEAUDIO}
-CMAKE_ARGS+=	-DWITH_Canberra:BOOL=ON \
-		-DWITH_PulseAudio:BOOL=ON
-LIB_DEPENDS+=	libcanberra.so:${PORTSDIR}/audio/libcanberra \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio
-USE_GNOME=	glib20
-.else
-CMAKE_ARGS+=	-DWITH_Canberra:BOOL=OFF \
-		-DWITH_PulseAudio:BOOL=OFF
-.endif
+PULSEAUDIO_LIB_DEPENDS=	libcanberra.so:${PORTSDIR}/audio/libcanberra \
+			libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_USE=		GNOME=glib20
+PULSEAUDIO_CMAKE_ON=	-DWITH_Canberra:BOOL=ON \
+			-DWITH_PulseAudio:BOOL=ON
+PULSEAUDIO_CMAKE_OFF=	-DWITH_Canberra:BOOL=OFF \
+			-DWITH_PulseAudio:BOOL=OFF

 .include <bsd.port.mk>
--- a/audio/kmix/distinfo
+++ b/audio/kmix/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kmix-4.10.5.tar.xz) = 5b7243d821774bfc376706ddf7145aa5f2edc4905d786d46ff7ae76681309a22
-SIZE (KDE/4.10.5/kmix-4.10.5.tar.xz) = 386912
+SHA256 (KDE/4.12.2/kmix-4.12.2.tar.xz) = 50f97bc8f99a81cfdd94cb77b97daa3fb3cd130c3faca596e7d6439bae25fb8c
+SIZE (KDE/4.12.2/kmix-4.12.2.tar.xz) = 380384
--- a/audio/kmix/files/patch-libcxx
+++ b/audio/kmix/files/patch-libcxx
@ -1,245 +0,0 @@
-commit f184967a01381ca43a02d44edf3158e6cc0be376
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Tue Sep 3 12:55:39 2013 +0300
-
-    Properly detect the location of STL's shared_ptr.
-
-    std::shared_ptr is a C++11 feature, whose location (and existence) in STL
-    implementations of previous C++ standards varied -- one widespread example
-    is GCC's libstdc++, which has a shared_ptr implementation in <tr1/memory>
-    that was shipped long before C++11.
-
-    However, including it unconditionally breaks the build if any other STL
-    implementation (such as libc++) is used instead.
-
-    We now check if std::shared_ptr is present in the <memory> header and then
-    try std::tr1::shared_ptr as a fallback.
-
-    REVIEW:             112434
-
-commit 111de2e86a3a79d43744e7d76a5a0be1d6e8fe0d
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date:   Tue Sep 3 12:54:48 2013 +0300
-
-    Use operator bool() instead of != and == for shared_ptr.
-
-    (This is part 1 of 2 of the shared_ptr changes)
-
-    In preparation for supporting C++11's version of shared_ptr, convert
-    some
-    comparisons to operator bool(), that is
-
-      if (foo != 0) becomes if (foo)
-      if (foo == 0) becomes if (!foo)
-
-    as otherwise the build (with clang and libc++) would fail because there is
-    no overload for operator==(shared_ptr, int) and operator!=(shared_ptr, int).
-
-    REVIEW:             112433
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a442972..1f75530 100644
--- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -26,6 +26,17 @@ if(MSVC)
- endif(MSVC)
- 
- 
-+include(CheckCXXSourceCompiles)
-+check_cxx_source_compiles("
-+    #include <memory>
-+    int main() { std::shared_ptr<int> p; return 0; }
-+" HAVE_STD_SHARED_PTR)
-+check_cxx_source_compiles("
-+    #include <tr1/memory>
-+    int main() { std::tr1::shared_ptr<int> p; return 0; }
-+" HAVE_STD_TR1_SHARED_PTR)
-+
-+
- configure_file (config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
- 
- 
-diff --git a/apps/kmixd.cpp b/apps/kmixd.cpp
-index 442abaf..9385a6a 100644
--- apps/kmixd.cpp
-+++ apps/kmixd.cpp
-@@ -156,7 +156,7 @@ void KMixD::saveBaseConfig()
-       config.writeEntry( "MasterMixer", mixerMasterCard->id() );
-    }
-    shared_ptr<MixDevice> mdMaster = Mixer::getGlobalMasterMD();
-   if ( mdMaster != 0 ) {
-+   if ( mdMaster ) {
-       config.writeEntry( "MasterMixerDevice", mdMaster->id() );
-    }
-    QString mixerIgnoreExpression = MixerToolBox::instance()->mixerIgnoreExpression();
-diff --git a/backends/mixer_backend.cpp b/backends/mixer_backend.cpp
-index 2e2e901..2105d2a 100644
--- backends/mixer_backend.cpp
-+++ backends/mixer_backend.cpp
-@@ -241,7 +241,7 @@ void Mixer_Backend::readSetFromHW()
-  */
- shared_ptr<MixDevice> Mixer_Backend::recommendedMaster()
- {
-	if ( m_recommendedMaster != 0 )
-+	if ( m_recommendedMaster )
- 	{
- 		// Backend has set a recommended master. Thats fine. Using it.
- 		return m_recommendedMaster;
-diff --git a/backends/mixer_mpris2.cpp b/backends/mixer_mpris2.cpp
-index 6ebcd8f..75ef129 100644
--- backends/mixer_mpris2.cpp
-+++ backends/mixer_mpris2.cpp
-@@ -535,7 +535,7 @@ void Mixer_MPRIS2::newMediaPlayer(QString name, QString oldOwner, QString newOwn
- 			}
- 
- 			shared_ptr<MixDevice> md = m_mixDevices.get(id);
-			if (md != 0)
-+			if (md)
- 			{
- 				// We know about the player that is unregistering => remove internally
- 				md->close();
-diff --git a/config.h.cmake b/config.h.cmake
-index 032f8c1..acd9a9c 100644
--- config.h.cmake
-+++ config.h.cmake
-@@ -15,3 +15,9 @@
- 
- /* Define to 1 if you have the <unistd.h> header file. */
- #cmakedefine HAVE_UNISTD_H 1
-+
-+/* Define to 1 if <tr1/memory> exists and defines std::tr1::shared_ptr. */
-+#cmakedefine HAVE_STD_TR1_SHARED_PTR 1
-+
-+/* Define to 1 if <memory> exists and defines std::shared_ptr. */
-+#cmakedefine HAVE_STD_SHARED_PTR 1
-diff --git a/core/ControlPool.h b/core/ControlPool.h
-index 4cb2222..b045ce0 100644
--- core/ControlPool.h
-+++ core/ControlPool.h
-@@ -22,12 +22,15 @@
- #ifndef CONTROL_POOL_H
- #define CONTROL_POOL_H
- 
-+#include "config.h"
- 
-// std::shared_ptr
-+#if defined(HAVE_STD_SHARED_PTR)
- #include <memory>
-+using std::shared_ptr;
-+#elif defined(HAVE_STD_TR1_SHARED_PTR)
- #include <tr1/memory>
-
-using namespace ::std::tr1;
-+using std::tr1::shared_ptr;
-+#endif
- 
- #include "core/mixdevice.h"
- 
-diff --git a/core/MasterControl.h b/core/MasterControl.h
-index dff9e95..16472ff 100644
--- core/MasterControl.h
-+++ core/MasterControl.h
-@@ -8,12 +8,17 @@
- #ifndef MASTERCONTROL_H_
- #define MASTERCONTROL_H_
- 
-#include <QString>
-+#include "config.h"
- 
-// std::shared_ptr
-+#if defined(HAVE_STD_SHARED_PTR)
- #include <memory>
-+using std::shared_ptr;
-+#elif defined(HAVE_STD_TR1_SHARED_PTR)
- #include <tr1/memory>
-using namespace ::std::tr1;
-+using std::tr1::shared_ptr;
-+#endif
-+
-+#include <QString>
- 
- class MasterControl
- {
-diff --git a/core/mixdevice.h b/core/mixdevice.h
-index f5ca782..fb554a2 100644
--- core/mixdevice.h
-+++ core/mixdevice.h
-@@ -21,10 +21,15 @@
- #ifndef MixDevice_h
- #define MixDevice_h
- 
-// std::shared_ptr
-+#include "config.h"
-+
-+#if defined(HAVE_STD_SHARED_PTR)
- #include <memory>
-+using std::shared_ptr;
-+#elif defined(HAVE_STD_TR1_SHARED_PTR)
- #include <tr1/memory>
-using namespace ::std::tr1;
-+using std::tr1::shared_ptr;
-+#endif
- 
- //KMix
- class Mixer;
-diff --git a/core/mixertoolbox.cpp b/core/mixertoolbox.cpp
-index 60c9fc8..41386d4 100644
--- core/mixertoolbox.cpp
-+++ core/mixertoolbox.cpp
-@@ -248,13 +248,13 @@ void MixerToolBox::initMixerInternal(MultiDriverMode multiDriverMode, QList<QStr
- 
-    
-     // Add a master device (if we haven't defined one yet)
-   if ( Mixer::getGlobalMasterMD(false) == 0 ) {
-+   if ( !Mixer::getGlobalMasterMD(false) ) {
-       // We have no master card yet. This actually only happens when there was
-       // not one defined in the kmixrc.
-       // So lets just set the first card as master card.
-       if ( Mixer::mixers().count() > 0 ) {
-     	  shared_ptr<MixDevice> master = Mixer::mixers().first()->getLocalMasterMD();
-         if ( master != 0 ) {
-+         if ( master ) {
-              QString controlId = master->id();
-              Mixer::setGlobalMaster( Mixer::mixers().first()->id(), controlId, true);
-          }
-diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp
-index 47e8073..e84338e 100644
--- gui/kmixdockwidget.cpp
-+++ gui/kmixdockwidget.cpp
-@@ -215,7 +215,7 @@ void KMixDockWidget::updatePixmap()
- 	shared_ptr<MixDevice> md = Mixer::getGlobalMasterMD();
- 
-     char newPixmapType;
-    if ( md == 0 )
-+    if ( !md )
-     {
-         newPixmapType = 'e';
-     }
-@@ -405,7 +405,7 @@ void KMixDockWidget::contextMenuAboutToShow()
- void KMixDockWidget::updateDockMuteAction ( KToggleAction* dockMuteAction )
- {  
-     shared_ptr<MixDevice> md = Mixer::getGlobalMasterMD();
-    if ( md != 0 && dockMuteAction != 0 )
-+    if ( md && dockMuteAction != 0 )
-     {
-     	Volume& vol = md->playbackVolume().hasVolume() ? md->playbackVolume() : md->captureVolume();
-     	bool isInactive =  vol.isCapture() ? !md->isRecSource() : md->isMuted();
-diff --git a/gui/viewdockareapopup.cpp b/gui/viewdockareapopup.cpp
-index 48411bd..45edc32 100644
--- gui/viewdockareapopup.cpp
-+++ gui/viewdockareapopup.cpp
-@@ -248,12 +248,12 @@ Application: KMix (kmix), signal: Segmentation fault
- 	{
- //		kDebug() << "ADD? mixerId=" << mixer->id();
- 		shared_ptr<MixDevice>dockMD = mixer->getLocalMasterMD();
-		if ( dockMD == 0 && mixer->size() > 0 )
-+		if ( !dockMD && mixer->size() > 0 )
- 		{
- 			// If we have no dock device yet, we will take the first available mixer device.
- 			dockMD = (*mixer)[0];
- 		}
-		if ( dockMD != 0 )
-+		if ( dockMD )
- 		{
- //			kDebug() << "ADD? mixerId=" << mixer->id() << ", md=" << dockMD->id();
- 			if ( !dockMD->isApplicationStream() && dockMD->playbackVolume().hasVolume())
--- a/audio/kscd/Makefile
+++ b/audio/kscd/Makefile
@ -4,8 +4,7 @@
 PORTNAME=	kscd
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -15,10 +14,7 @@ LICENSE=	GPLv2

 LIB_DEPENDS=	libmusicbrainz3.so:${PORTSDIR}/audio/libmusicbrainz3

-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
-
 USES=		cmake:outsource
-NO_STAGE=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix libkcddb libkcompactdisc \
 		automoc4
 USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
@ -26,13 +22,8 @@ USE_XZ=		yes

 OPTIONS_DEFINE=	ALSA

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-no_alsa
-.endif
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_EXTRA_PATCHES=	${FILESDIR}/extrapatch-no_alsa

 .include <bsd.port.mk>

--- a/audio/kscd/distinfo
+++ b/audio/kscd/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kscd-4.10.5.tar.xz) = 786d175106086713bf8aedfeaf45a6cf2741ad7b0588a1ef267da422e1161573
-SIZE (KDE/4.10.5/kscd-4.10.5.tar.xz) = 94464
+SHA256 (KDE/4.12.2/kscd-4.12.2.tar.xz) = 074f5bdd3aa617e9b4ee847fd3a4fe3152d5d133469509548b743d6047a0de60
+SIZE (KDE/4.12.2/kscd-4.12.2.tar.xz) = 92288
--- a/audio/libkcddb/Makefile
+++ b/audio/libkcddb/Makefile
@ -4,8 +4,7 @@
 PORTNAME=	libkcddb
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -13,10 +12,7 @@ COMMENT=	KDE CDDB library

 LIB_DEPENDS=	libmusicbrainz5.so:${PORTSDIR}/audio/libmusicbrainz5

-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
-
 USES=		cmake:outsource
-NO_STAGE=	yes
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	qtestlib moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
--- a/audio/libkcddb/distinfo
+++ b/audio/libkcddb/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/libkcddb-4.10.5.tar.xz) = 19a7d3b6ba180d929e63db8f92244bf915b75556d24b8cd0a907d9e8d0ae7b0c
-SIZE (KDE/4.10.5/libkcddb-4.10.5.tar.xz) = 165728
+SHA256 (KDE/4.12.2/libkcddb-4.12.2.tar.xz) = 8fb5b941afea77cad167503359cbdb3d1a3a61c72faded9e311994c71e7bb30e
+SIZE (KDE/4.12.2/libkcddb-4.12.2.tar.xz) = 157756
--- a/audio/libkcddb/pkg-plist
+++ b/audio/libkcddb/pkg-plist
@ -11,8 +11,8 @@ lib/cmake/libkcddb/LibkcddbTargets.cmake
 lib/cmake/libkcddb/LibkcddbTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/kde4/kcm_cddb.so
 lib/libkcddb.so
-lib/libkcddb.so.5
-lib/libkcddb.so.5.0.1
+lib/libkcddb.so.4
+lib/libkcddb.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/config.kcfg/libkcddb.kcfg
 share/doc/HTML/en/kcontrol/cddbretrieval/common
 share/doc/HTML/en/kcontrol/cddbretrieval/index.cache.bz2
--- a/audio/libkcompactdisc/Makefile
+++ b/audio/libkcompactdisc/Makefile
@ -4,17 +4,13 @@
 PORTNAME=	libkcompactdisc
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE library for interfacing with audio CDs

-CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
-
 USES=		cmake:outsource
-NO_STAGE=	yes
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	phonon moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
@ -22,12 +18,7 @@ USE_LDCONFIG=	yes

 OPTIONS_DEFINE=	ALSA

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MALSA}
-LIB_DEPENDS+=	libasound.so:${PORTSDIR}/audio/alsa-lib
-.else
-EXTRA_PATCHES+=	${FILESDIR}/extrapatch-no_alsa
-.endif
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_EXTRA_PATCHES=	${FILESDIR}/extrapatch-no_alsa

 .include <bsd.port.mk>
--- a/audio/libkcompactdisc/distinfo
+++ b/audio/libkcompactdisc/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/libkcompactdisc-4.10.5.tar.xz) = 788645c4b20d1523e8b2d13a131c896f7cf524e3f5896b1f5af23fc3ed02bc80
-SIZE (KDE/4.10.5/libkcompactdisc-4.10.5.tar.xz) = 77464
+SHA256 (KDE/4.12.2/libkcompactdisc-4.12.2.tar.xz) = 9f48d07764b29c61e2b8e04d3f29141d0c50c63865c0de6389df2a4fa355accd
+SIZE (KDE/4.12.2/libkcompactdisc-4.12.2.tar.xz) = 75568
--- a/audio/libkcompactdisc/files/extrapatch-no_alsa
+++ b/audio/libkcompactdisc/files/extrapatch-no_alsa
@ -1,9 +1,12 @@
--- CMakeLists.txt~	2012-06-29 16:45:48.000000000 -0300
-+++ CMakeLists.txt	2012-06-29 16:46:54.000000000 -0300
-@@ -6,8 +6,8 @@
- 
- add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+--- CMakeLists.txt.orig	2013-07-09 23:19:54.000000000 +0000
+++ CMakeLists.txt	2013-08-12 23:11:31.141329406 +0000
+@@ -8,10 +8,10 @@
 
+ ## Compiler flags
+ if(CMAKE_COMPILER_IS_GNUCXX)
+-    set(CMAKE_C_FLAGS "-std=c99")   ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")   ## ALSA no longer compiles with -std=c90, see https://bugzilla.novell.com/show_bug.cgi?id=817077
+ endif()
 -find_package(Alsa)
 -alsa_configure_file(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h)
 +find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH})
--- a/audio/libkcompactdisc/pkg-plist
+++ b/audio/libkcompactdisc/pkg-plist
@ -3,8 +3,8 @@ lib/cmake/libkcompactdisc/LibkcompactdiscConfig.cmake
 lib/cmake/libkcompactdisc/LibkcompactdiscTargets.cmake
 lib/cmake/libkcompactdisc/LibkcompactdiscTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/libkcompactdisc.so
-lib/libkcompactdisc.so.5
-lib/libkcompactdisc.so.5.0.1
+lib/libkcompactdisc.so.4
+lib/libkcompactdisc.so.%%KDE4_GENERIC_LIB_VERSION%%
@dirrm lib/cmake/libkcompactdisc
@dirrmtry lib/cmake
@dirrm include/libkcompactdisc
--- a/chinese/kde4-l10n-zh_CN/Makefile
+++ b/chinese/kde4-l10n-zh_CN/Makefile
@ -10,6 +10,5 @@ COMMENT=	Simplified Chinese messages and documentation for KDE SC 4

 KDE4_L10N=	zh_CN

-NO_STAGE=	yes
 .include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
--- a/chinese/kde4-l10n-zh_CN/distinfo
+++ b/chinese/kde4-l10n-zh_CN/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kde-l10n/kde-l10n-zh_CN-4.10.5.tar.xz) = 5aa9a679956a0f4da6bde406b6465ebb7eab8191e33bc878ce6c1c5632754832
-SIZE (KDE/4.10.5/kde-l10n/kde-l10n-zh_CN-4.10.5.tar.xz) = 3580528
+SHA256 (KDE/4.12.2/kde-l10n/kde-l10n-zh_CN-4.12.2.tar.xz) = 63e547c54ada657ed568d1eefe4a4f6b9ff8750ab43c173f84e299b21dcd4e76
+SIZE (KDE/4.12.2/kde-l10n/kde-l10n-zh_CN-4.12.2.tar.xz) = 3607660
--- a/chinese/kde4-l10n-zh_CN/pkg-message
+++ b/chinese/kde4-l10n-zh_CN/pkg-message
@ -0,0 +1,3 @@
+Documents written in Simplified Chinese often use text encodings which
+require a Qt plugin available as chinese/qt4-codecs-cn in the ports
+collection.
--- a/chinese/kde4-l10n-zh_CN/pkg-plist
+++ b/chinese/kde4-l10n-zh_CN/pkg-plist
@ -47,14 +47,15 @@ share/locale/zh_CN/LC_MESSAGES/accountwizard_maildir.mo
 share/locale/zh_CN/LC_MESSAGES/accountwizard_pop3.mo
 share/locale/zh_CN/LC_MESSAGES/accountwizard_tine20.mo
 share/locale/zh_CN/LC_MESSAGES/activitymanager_plugin_globalshortcuts.mo
-share/locale/zh_CN/LC_MESSAGES/activitymanager_uihandler_declarative.mo
 share/locale/zh_CN/LC_MESSAGES/adblock.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi-filestore.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_archivemail_agent.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/zh_CN/LC_MESSAGES/akonadi_google_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_facebook_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_googlecalendar_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_googlecontacts_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_imap_resource.mo
@ -76,6 +77,7 @@ share/locale/zh_CN/LC_MESSAGES/akonadi_microblog_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_mixedmaildir_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_nepomuk_feeder.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_nepomuktag_resource.mo
+share/locale/zh_CN/LC_MESSAGES/akonadi_newmailnotifier_agent.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_next.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_nntp_resource.mo
 share/locale/zh_CN/LC_MESSAGES/akonadi_openxchange_resource.mo
@ -158,6 +160,7 @@ share/locale/zh_CN/LC_MESSAGES/kate.mo
 share/locale/zh_CN/LC_MESSAGES/kate_kttsd.mo
 share/locale/zh_CN/LC_MESSAGES/katebacktracebrowserplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katebuild-plugin.mo
+share/locale/zh_CN/LC_MESSAGES/katecloseexceptplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katefilebrowserplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katefiletemplates.mo
 share/locale/zh_CN/LC_MESSAGES/kategdbplugin.mo
@ -168,7 +171,6 @@ share/locale/zh_CN/LC_MESSAGES/kateopenheader.mo
 share/locale/zh_CN/LC_MESSAGES/katepart4.mo
 share/locale/zh_CN/LC_MESSAGES/kateproject.mo
 share/locale/zh_CN/LC_MESSAGES/katesearch.mo
-share/locale/zh_CN/LC_MESSAGES/katesnippets_tng.mo
 share/locale/zh_CN/LC_MESSAGES/katesnippetsplugin.mo
 share/locale/zh_CN/LC_MESSAGES/katesql.mo
 share/locale/zh_CN/LC_MESSAGES/katesymbolviewer.mo
@ -178,7 +180,6 @@ share/locale/zh_CN/LC_MESSAGES/katetextfilter.mo
 share/locale/zh_CN/LC_MESSAGES/katexmlcheck.mo
 share/locale/zh_CN/LC_MESSAGES/katexmltools.mo
 share/locale/zh_CN/LC_MESSAGES/katomic.mo
-share/locale/zh_CN/LC_MESSAGES/kbattleship.mo
 share/locale/zh_CN/LC_MESSAGES/kblackbox.mo
 share/locale/zh_CN/LC_MESSAGES/kblankscrn.mo
 share/locale/zh_CN/LC_MESSAGES/kblocks.mo
@ -209,9 +210,9 @@ share/locale/zh_CN/LC_MESSAGES/kcm_memory.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_nepomuk.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_pci.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_phonon.mo
+share/locale/zh_CN/LC_MESSAGES/kcm_pimactivity.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_platform.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_remotecontrol.mo
-share/locale/zh_CN/LC_MESSAGES/kcm_solid.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_solid_actions.mo
 share/locale/zh_CN/LC_MESSAGES/kcm_standard_actions.mo
 share/locale/zh_CN/LC_MESSAGES/kcmaccess.mo
@ -386,6 +387,7 @@ share/locale/zh_CN/LC_MESSAGES/kmix.mo
 share/locale/zh_CN/LC_MESSAGES/kmousetool.mo
 share/locale/zh_CN/LC_MESSAGES/kmouth.mo
 share/locale/zh_CN/LC_MESSAGES/kmplot.mo
+share/locale/zh_CN/LC_MESSAGES/knavalbattle.mo
 share/locale/zh_CN/LC_MESSAGES/knetattach.mo
 share/locale/zh_CN/LC_MESSAGES/knetwalk.mo
 share/locale/zh_CN/LC_MESSAGES/knode.mo
@ -434,6 +436,7 @@ share/locale/zh_CN/LC_MESSAGES/kscreenlocker.mo
 share/locale/zh_CN/LC_MESSAGES/kscreenlocker_greet.mo
 share/locale/zh_CN/LC_MESSAGES/kscreensaver.mo
 share/locale/zh_CN/LC_MESSAGES/ksendemail.mo
+share/locale/zh_CN/LC_MESSAGES/ksgrd.mo
 share/locale/zh_CN/LC_MESSAGES/kshellcmdplugin.mo
 share/locale/zh_CN/LC_MESSAGES/kshisen.mo
 share/locale/zh_CN/LC_MESSAGES/kshorturifilter.mo
@ -455,8 +458,6 @@ share/locale/zh_CN/LC_MESSAGES/ksysguardlsofwidgets.mo
 share/locale/zh_CN/LC_MESSAGES/ksystemlog.mo
 share/locale/zh_CN/LC_MESSAGES/ksystraycmd.mo
 share/locale/zh_CN/LC_MESSAGES/kteatime.mo
-share/locale/zh_CN/LC_MESSAGES/ktesnippets_editor.mo
-share/locale/zh_CN/LC_MESSAGES/ktexteditor_codesnippets_core.mo
 share/locale/zh_CN/LC_MESSAGES/ktexteditor_plugins.mo
 share/locale/zh_CN/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
 share/locale/zh_CN/LC_MESSAGES/ktimer.mo
@ -515,6 +516,7 @@ share/locale/zh_CN/LC_MESSAGES/libkldap.mo
 share/locale/zh_CN/LC_MESSAGES/libkleopatra.mo
 share/locale/zh_CN/LC_MESSAGES/libkmahjongg.mo
 share/locale/zh_CN/LC_MESSAGES/libkmime.mo
+share/locale/zh_CN/LC_MESSAGES/libkomparediff2.mo
 share/locale/zh_CN/LC_MESSAGES/libkonq.mo
 share/locale/zh_CN/LC_MESSAGES/libkpgp.mo
 share/locale/zh_CN/LC_MESSAGES/libkpimidentities.mo
@ -542,6 +544,7 @@ share/locale/zh_CN/LC_MESSAGES/liboktetagui.mo
 share/locale/zh_CN/LC_MESSAGES/liboktetakasten.mo
 share/locale/zh_CN/LC_MESSAGES/liboxygenstyleconfig.mo
 share/locale/zh_CN/LC_MESSAGES/libphonon.mo
+share/locale/zh_CN/LC_MESSAGES/libpimactivity.mo
 share/locale/zh_CN/LC_MESSAGES/libpimcommon.mo
 share/locale/zh_CN/LC_MESSAGES/libplasma.mo
 share/locale/zh_CN/LC_MESSAGES/libplasma_groupingcontainment.mo
@ -564,14 +567,13 @@ share/locale/zh_CN/LC_MESSAGES/mplayerthumbs.mo
 share/locale/zh_CN/LC_MESSAGES/mplayerthumbsconfig.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukbackup.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukcleaner.mo
-share/locale/zh_CN/LC_MESSAGES/nepomukcontroller.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukfileindexer.mo
-share/locale/zh_CN/LC_MESSAGES/nepomukqueryservice.mo
+share/locale/zh_CN/LC_MESSAGES/nepomukfilewatch.mo
+share/locale/zh_CN/LC_MESSAGES/nepomukmigrator.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukserver.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukservicestub.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukstorage.mo
 share/locale/zh_CN/LC_MESSAGES/nepomukwidgets.mo
-share/locale/zh_CN/LC_MESSAGES/newmailnotifieragent.mo
 share/locale/zh_CN/LC_MESSAGES/notes-mobile.mo
 share/locale/zh_CN/LC_MESSAGES/nsplugin.mo
 share/locale/zh_CN/LC_MESSAGES/okteta-mobile.mo
@ -592,12 +594,14 @@ share/locale/zh_CN/LC_MESSAGES/okular_ooo.mo
 share/locale/zh_CN/LC_MESSAGES/okular_plucker.mo
 share/locale/zh_CN/LC_MESSAGES/okular_poppler.mo
 share/locale/zh_CN/LC_MESSAGES/okular_tiff.mo
+share/locale/zh_CN/LC_MESSAGES/okular_txt.mo
 share/locale/zh_CN/LC_MESSAGES/okular_xps.mo
 share/locale/zh_CN/LC_MESSAGES/org.kde.active.documentviewer.mo
 share/locale/zh_CN/LC_MESSAGES/pairs.mo
 share/locale/zh_CN/LC_MESSAGES/pairseditor.mo
 share/locale/zh_CN/LC_MESSAGES/palapeli.mo
 share/locale/zh_CN/LC_MESSAGES/parley.mo
+share/locale/zh_CN/LC_MESSAGES/pate.mo
 share/locale/zh_CN/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/zh_CN/LC_MESSAGES/phonon_kde.mo
 share/locale/zh_CN/LC_MESSAGES/phonon_vlc.mo
@ -633,7 +637,7 @@ share/locale/zh_CN/LC_MESSAGES/plasma_applet_groupingpanel.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_icon.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_icontasks.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_incomingmsg.mo
-share/locale/zh_CN/LC_MESSAGES/plasma_applet_kalgebra.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_applet_kalgebraplasmoid.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_kalzium.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_katesession.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_kdeobservatory.mo
@ -659,6 +663,7 @@ share/locale/zh_CN/LC_MESSAGES/plasma_applet_nuclearCalculator.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_opendesktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_opendesktop_activities.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.notifications.mo
+share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.printmanager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.showActivityManager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_pager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_panel.mo
@ -667,7 +672,6 @@ share/locale/zh_CN/LC_MESSAGES/plasma_applet_paste.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_pastebin.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_plasmaboard.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_previewer.mo
-share/locale/zh_CN/LC_MESSAGES/plasma_applet_printmanager.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_qalculate.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_qstardict.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_quicklaunch.mo
@ -697,7 +701,6 @@ share/locale/zh_CN/LC_MESSAGES/plasma_containmentactions_contextmenu.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_containmentactions_switchactivity.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_containmentactions_switchdesktop.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_containmentactions_switchwindow.mo
-share/locale/zh_CN/LC_MESSAGES/plasma_engine_calendar.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_kalzium.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_kdeobservatory.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_engine_keystate.mo
@ -758,7 +761,6 @@ share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_marble.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_pattern.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_potd.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_virus.mo
-share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_wallpaper-qml.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_weather.mo
 share/locale/zh_CN/LC_MESSAGES/plasmagenericshell.mo
 share/locale/zh_CN/LC_MESSAGES/plasmapkg.mo
@ -777,9 +779,7 @@ share/locale/zh_CN/LC_MESSAGES/rocscore.mo
 share/locale/zh_CN/LC_MESSAGES/rocsvisualeditor.mo
 share/locale/zh_CN/LC_MESSAGES/searchbarplugin.mo
 share/locale/zh_CN/LC_MESSAGES/solid-hardware.mo
-share/locale/zh_CN/LC_MESSAGES/solid-network.mo
 share/locale/zh_CN/LC_MESSAGES/solid_qt.mo
-share/locale/zh_CN/LC_MESSAGES/solidcontrol.mo
 share/locale/zh_CN/LC_MESSAGES/soliduiserver.mo
 share/locale/zh_CN/LC_MESSAGES/step.mo
 share/locale/zh_CN/LC_MESSAGES/step_qt.mo
--- a/chinese/kde4-l10n-zh_TW/Makefile
+++ b/chinese/kde4-l10n-zh_TW/Makefile
@ -10,6 +10,5 @@ COMMENT=	Traditional Chinese messages and documentation for KDE SC 4

 KDE4_L10N=	zh_TW

-NO_STAGE=	yes
 .include "${.CURDIR}/../../misc/kde4-l10n/files/bsd.l10n.mk"
 .include <bsd.port.mk>
--- a/chinese/kde4-l10n-zh_TW/distinfo
+++ b/chinese/kde4-l10n-zh_TW/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kde-l10n/kde-l10n-zh_TW-4.10.5.tar.xz) = bee85145de979c420c7672fd65aff40963216a7d40d7f365d183f352ba498851
-SIZE (KDE/4.10.5/kde-l10n/kde-l10n-zh_TW-4.10.5.tar.xz) = 2583072
+SHA256 (KDE/4.12.2/kde-l10n/kde-l10n-zh_TW-4.12.2.tar.xz) = c3b1166cc94e15d5466817747947a3227371fae2bb14ad316995722a36209b4a
+SIZE (KDE/4.12.2/kde-l10n/kde-l10n-zh_TW-4.12.2.tar.xz) = 2634604
--- a/chinese/kde4-l10n-zh_TW/pkg-message
+++ b/chinese/kde4-l10n-zh_TW/pkg-message
@ -0,0 +1,3 @@
+Documents written in Traditional Chinese often use text encodings which
+require a Qt plugin available as chinese/qt4-codecs-tw in the ports
+collection.
--- a/chinese/kde4-l10n-zh_TW/pkg-plist
+++ b/chinese/kde4-l10n-zh_TW/pkg-plist
@ -11,14 +11,17 @@ share/locale/zh_TW/LC_MESSAGES/accountwizard_maildir.mo
 share/locale/zh_TW/LC_MESSAGES/accountwizard_pop3.mo
 share/locale/zh_TW/LC_MESSAGES/accountwizard_tine20.mo
 share/locale/zh_TW/LC_MESSAGES/activitymanager_plugin_globalshortcuts.mo
-share/locale/zh_TW/LC_MESSAGES/activitymanager_uihandler_declarative.mo
 share/locale/zh_TW/LC_MESSAGES/adblock.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi-filestore.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_archivemail_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_birthdays_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_contacts_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_davgroupware_resource.mo
-share/locale/zh_TW/LC_MESSAGES/akonadi_google_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_facebook_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_folderarchive_agent.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_followupreminder_agent.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_googlecalendar_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_googlecontacts_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_ical_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_icaldir_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_imap_resource.mo
@ -37,13 +40,16 @@ share/locale/zh_TW/LC_MESSAGES/akonadi_mailfilter_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_mailtransport_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_mbox_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_microblog_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_migration_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_mixedmaildir_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_nepomuk_feeder.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_nepomuktag_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_newmailnotifier_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_next.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_nntp_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_openxchange_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_pop3_resource.mo
+share/locale/zh_TW/LC_MESSAGES/akonadi_sendlater_agent.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_serializer_plugins.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_singlefile_resource.mo
 share/locale/zh_TW/LC_MESSAGES/akonadi_strigi_feeder.mo
@ -67,9 +73,11 @@ share/locale/zh_TW/LC_MESSAGES/blinken.mo
 share/locale/zh_TW/LC_MESSAGES/blogilo.mo
 share/locale/zh_TW/LC_MESSAGES/bomber.mo
 share/locale/zh_TW/LC_MESSAGES/bovo.mo
+share/locale/zh_TW/LC_MESSAGES/calendarjanitor.mo
 share/locale/zh_TW/LC_MESSAGES/calendarsupport.mo
 share/locale/zh_TW/LC_MESSAGES/cantor.mo
 share/locale/zh_TW/LC_MESSAGES/cervisia.mo
+share/locale/zh_TW/LC_MESSAGES/contactthemeeditor.mo
 share/locale/zh_TW/LC_MESSAGES/cryptopageplugin.mo
 share/locale/zh_TW/LC_MESSAGES/cvsservice.mo
 share/locale/zh_TW/LC_MESSAGES/dirfilterplugin.mo
@ -86,8 +94,10 @@ share/locale/zh_TW/LC_MESSAGES/fileviewhgplugin.mo
 share/locale/zh_TW/LC_MESSAGES/fileviewsvnplugin.mo
 share/locale/zh_TW/LC_MESSAGES/freespacenotifier.mo
 share/locale/zh_TW/LC_MESSAGES/fsview.mo
+share/locale/zh_TW/LC_MESSAGES/gid-migrator.mo
 share/locale/zh_TW/LC_MESSAGES/granatier.mo
 share/locale/zh_TW/LC_MESSAGES/gwenview.mo
+share/locale/zh_TW/LC_MESSAGES/headerthemeeditor.mo
 share/locale/zh_TW/LC_MESSAGES/htmlsearch.mo
 share/locale/zh_TW/LC_MESSAGES/imagerename_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/imgalleryplugin.mo
@ -114,6 +124,8 @@ share/locale/zh_TW/LC_MESSAGES/kajongg.mo
 share/locale/zh_TW/LC_MESSAGES/kalarm.mo
 share/locale/zh_TW/LC_MESSAGES/kalgebra.mo
 share/locale/zh_TW/LC_MESSAGES/kalzium.mo
+share/locale/zh_TW/LC_MESSAGES/kanagram-active.mo
+share/locale/zh_TW/LC_MESSAGES/kanagram-engine.mo
 share/locale/zh_TW/LC_MESSAGES/kanagram-harmattan.mo
 share/locale/zh_TW/LC_MESSAGES/kanagram.mo
 share/locale/zh_TW/LC_MESSAGES/kapman.mo
@ -123,6 +135,7 @@ share/locale/zh_TW/LC_MESSAGES/kate.mo
 share/locale/zh_TW/LC_MESSAGES/kate_kttsd.mo
 share/locale/zh_TW/LC_MESSAGES/katebacktracebrowserplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katebuild-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/katecloseexceptplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katefilebrowserplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katefiletemplates.mo
 share/locale/zh_TW/LC_MESSAGES/kategdbplugin.mo
@ -133,7 +146,6 @@ share/locale/zh_TW/LC_MESSAGES/kateopenheader.mo
 share/locale/zh_TW/LC_MESSAGES/katepart4.mo
 share/locale/zh_TW/LC_MESSAGES/kateproject.mo
 share/locale/zh_TW/LC_MESSAGES/katesearch.mo
-share/locale/zh_TW/LC_MESSAGES/katesnippets_tng.mo
 share/locale/zh_TW/LC_MESSAGES/katesnippetsplugin.mo
 share/locale/zh_TW/LC_MESSAGES/katesql.mo
 share/locale/zh_TW/LC_MESSAGES/katesymbolviewer.mo
@ -143,7 +155,6 @@ share/locale/zh_TW/LC_MESSAGES/katetextfilter.mo
 share/locale/zh_TW/LC_MESSAGES/katexmlcheck.mo
 share/locale/zh_TW/LC_MESSAGES/katexmltools.mo
 share/locale/zh_TW/LC_MESSAGES/katomic.mo
-share/locale/zh_TW/LC_MESSAGES/kbattleship.mo
 share/locale/zh_TW/LC_MESSAGES/kblackbox.mo
 share/locale/zh_TW/LC_MESSAGES/kblankscrn.mo
 share/locale/zh_TW/LC_MESSAGES/kblocks.mo
@ -174,9 +185,9 @@ share/locale/zh_TW/LC_MESSAGES/kcm_memory.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_nepomuk.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_pci.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_phonon.mo
+share/locale/zh_TW/LC_MESSAGES/kcm_pimactivity.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_platform.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_remotecontrol.mo
-share/locale/zh_TW/LC_MESSAGES/kcm_solid.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_solid_actions.mo
 share/locale/zh_TW/LC_MESSAGES/kcm_standard_actions.mo
 share/locale/zh_TW/LC_MESSAGES/kcmaccess.mo
@ -351,6 +362,7 @@ share/locale/zh_TW/LC_MESSAGES/kmix.mo
 share/locale/zh_TW/LC_MESSAGES/kmousetool.mo
 share/locale/zh_TW/LC_MESSAGES/kmouth.mo
 share/locale/zh_TW/LC_MESSAGES/kmplot.mo
+share/locale/zh_TW/LC_MESSAGES/knavalbattle.mo
 share/locale/zh_TW/LC_MESSAGES/knetattach.mo
 share/locale/zh_TW/LC_MESSAGES/knetwalk.mo
 share/locale/zh_TW/LC_MESSAGES/knode.mo
@ -370,6 +382,7 @@ share/locale/zh_TW/LC_MESSAGES/konsoleprofiles.mo
 share/locale/zh_TW/LC_MESSAGES/kontact.mo
 share/locale/zh_TW/LC_MESSAGES/kontactinterfaces.mo
 share/locale/zh_TW/LC_MESSAGES/kopete.mo
+share/locale/zh_TW/LC_MESSAGES/korgac.mo
 share/locale/zh_TW/LC_MESSAGES/korganizer-mobile.mo
 share/locale/zh_TW/LC_MESSAGES/korganizer.mo
 share/locale/zh_TW/LC_MESSAGES/kpartloader.mo
@ -421,8 +434,6 @@ share/locale/zh_TW/LC_MESSAGES/ksysguardlsofwidgets.mo
 share/locale/zh_TW/LC_MESSAGES/ksystemlog.mo
 share/locale/zh_TW/LC_MESSAGES/ksystraycmd.mo
 share/locale/zh_TW/LC_MESSAGES/kteatime.mo
-share/locale/zh_TW/LC_MESSAGES/ktesnippets_editor.mo
-share/locale/zh_TW/LC_MESSAGES/ktexteditor_codesnippets_core.mo
 share/locale/zh_TW/LC_MESSAGES/ktexteditor_plugins.mo
 share/locale/zh_TW/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/ktimer.mo
@ -447,6 +458,7 @@ share/locale/zh_TW/LC_MESSAGES/kwin.mo
 share/locale/zh_TW/LC_MESSAGES/kwin_art_clients.mo
 share/locale/zh_TW/LC_MESSAGES/kwin_clients.mo
 share/locale/zh_TW/LC_MESSAGES/kwin_effects.mo
+share/locale/zh_TW/LC_MESSAGES/kwin_scripting.mo
 share/locale/zh_TW/LC_MESSAGES/kwinshutdown.mo
 share/locale/zh_TW/LC_MESSAGES/kwinstartmenu.mo
 share/locale/zh_TW/LC_MESSAGES/kwordquiz.mo
@ -457,9 +469,14 @@ share/locale/zh_TW/LC_MESSAGES/kxsconfig.mo
 share/locale/zh_TW/LC_MESSAGES/lancelot.mo
 share/locale/zh_TW/LC_MESSAGES/libakonadi-calendar.mo
 share/locale/zh_TW/LC_MESSAGES/libakonadi-kmime.mo
+share/locale/zh_TW/LC_MESSAGES/libakonadi-xml.mo
 share/locale/zh_TW/LC_MESSAGES/libakonadi.mo
+share/locale/zh_TW/LC_MESSAGES/libcomposereditorng.mo
 share/locale/zh_TW/LC_MESSAGES/libeventviews.mo
+share/locale/zh_TW/LC_MESSAGES/libgrantleetheme.mo
+share/locale/zh_TW/LC_MESSAGES/libgrantleethemeeditor.mo
 share/locale/zh_TW/LC_MESSAGES/libincidenceeditors.mo
+share/locale/zh_TW/LC_MESSAGES/libkaddressbookgrantlee.mo
 share/locale/zh_TW/LC_MESSAGES/libkalarmcal.mo
 share/locale/zh_TW/LC_MESSAGES/libkasten.mo
 share/locale/zh_TW/LC_MESSAGES/libkblog.mo
@ -481,6 +498,7 @@ share/locale/zh_TW/LC_MESSAGES/libkldap.mo
 share/locale/zh_TW/LC_MESSAGES/libkleopatra.mo
 share/locale/zh_TW/LC_MESSAGES/libkmahjongg.mo
 share/locale/zh_TW/LC_MESSAGES/libkmime.mo
+share/locale/zh_TW/LC_MESSAGES/libkomparediff2.mo
 share/locale/zh_TW/LC_MESSAGES/libkonq.mo
 share/locale/zh_TW/LC_MESSAGES/libkpgp.mo
 share/locale/zh_TW/LC_MESSAGES/libkpimidentities.mo
@ -508,11 +526,13 @@ share/locale/zh_TW/LC_MESSAGES/liboktetagui.mo
 share/locale/zh_TW/LC_MESSAGES/liboktetakasten.mo
 share/locale/zh_TW/LC_MESSAGES/liboxygenstyleconfig.mo
 share/locale/zh_TW/LC_MESSAGES/libphonon.mo
+share/locale/zh_TW/LC_MESSAGES/libpimactivity.mo
 share/locale/zh_TW/LC_MESSAGES/libpimcommon.mo
 share/locale/zh_TW/LC_MESSAGES/libplasma.mo
 share/locale/zh_TW/LC_MESSAGES/libplasma_groupingcontainment.mo
 share/locale/zh_TW/LC_MESSAGES/libplasmaclock.mo
 share/locale/zh_TW/LC_MESSAGES/libplasmaweather.mo
+share/locale/zh_TW/LC_MESSAGES/libpowerdevilcommonconfig.mo
 share/locale/zh_TW/LC_MESSAGES/libtaskmanager.mo
 share/locale/zh_TW/LC_MESSAGES/libtemplateparser.mo
 share/locale/zh_TW/LC_MESSAGES/lokalize.mo
@ -521,6 +541,7 @@ share/locale/zh_TW/LC_MESSAGES/mailreader.mo
 share/locale/zh_TW/LC_MESSAGES/marble.mo
 share/locale/zh_TW/LC_MESSAGES/marble_qt.mo
 share/locale/zh_TW/LC_MESSAGES/marble_xml_mimetypes.mo
+share/locale/zh_TW/LC_MESSAGES/mboximporter.mo
 share/locale/zh_TW/LC_MESSAGES/messageviewer_application_mstnef_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/messageviewer_text_calendar_plugin.mo
 share/locale/zh_TW/LC_MESSAGES/messageviewer_text_vcard_plugin.mo
@ -531,15 +552,14 @@ share/locale/zh_TW/LC_MESSAGES/mplayerthumbs.mo
 share/locale/zh_TW/LC_MESSAGES/mplayerthumbsconfig.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukbackup.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukcleaner.mo
-share/locale/zh_TW/LC_MESSAGES/nepomukcontroller.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukfileindexer.mo
+share/locale/zh_TW/LC_MESSAGES/nepomukfilewatch.mo
+share/locale/zh_TW/LC_MESSAGES/nepomukmigrator.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukpimindexerutility.mo
-share/locale/zh_TW/LC_MESSAGES/nepomukqueryservice.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukserver.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukservicestub.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukstorage.mo
 share/locale/zh_TW/LC_MESSAGES/nepomukwidgets.mo
-share/locale/zh_TW/LC_MESSAGES/newmailnotifieragent.mo
 share/locale/zh_TW/LC_MESSAGES/notes-mobile.mo
 share/locale/zh_TW/LC_MESSAGES/nsplugin.mo
 share/locale/zh_TW/LC_MESSAGES/okteta-mobile.mo
@ -560,12 +580,14 @@ share/locale/zh_TW/LC_MESSAGES/okular_ooo.mo
 share/locale/zh_TW/LC_MESSAGES/okular_plucker.mo
 share/locale/zh_TW/LC_MESSAGES/okular_poppler.mo
 share/locale/zh_TW/LC_MESSAGES/okular_tiff.mo
+share/locale/zh_TW/LC_MESSAGES/okular_txt.mo
 share/locale/zh_TW/LC_MESSAGES/okular_xps.mo
 share/locale/zh_TW/LC_MESSAGES/org.kde.active.documentviewer.mo
 share/locale/zh_TW/LC_MESSAGES/pairs.mo
 share/locale/zh_TW/LC_MESSAGES/pairseditor.mo
 share/locale/zh_TW/LC_MESSAGES/palapeli.mo
 share/locale/zh_TW/LC_MESSAGES/parley.mo
+share/locale/zh_TW/LC_MESSAGES/pate.mo
 share/locale/zh_TW/LC_MESSAGES/phonon_gstreamer.mo
 share/locale/zh_TW/LC_MESSAGES/phonon_kde.mo
 share/locale/zh_TW/LC_MESSAGES/phonon_vlc.mo
@ -601,7 +623,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_applet_groupingpanel.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_icon.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_icontasks.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_incomingmsg.mo
-share/locale/zh_TW/LC_MESSAGES/plasma_applet_kalgebra.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_applet_kalgebraplasmoid.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_kalzium.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_katesession.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_kdeobservatory.mo
@ -627,6 +649,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_applet_nuclearCalculator.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_opendesktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_opendesktop_activities.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.notifications.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.printmanager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.showActivityManager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_pager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_panel.mo
@ -635,7 +658,6 @@ share/locale/zh_TW/LC_MESSAGES/plasma_applet_paste.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_pastebin.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_plasmaboard.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_previewer.mo
-share/locale/zh_TW/LC_MESSAGES/plasma_applet_printmanager.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_qalculate.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_qstardict.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_quicklaunch.mo
@ -665,7 +687,6 @@ share/locale/zh_TW/LC_MESSAGES/plasma_containmentactions_contextmenu.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_containmentactions_switchactivity.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_containmentactions_switchdesktop.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_containmentactions_switchwindow.mo
-share/locale/zh_TW/LC_MESSAGES/plasma_engine_calendar.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_kalzium.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_kdeobservatory.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_engine_keystate.mo
@ -712,6 +733,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_runner_sessions.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_shell.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_solid.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_spellcheckrunner.mo
+share/locale/zh_TW/LC_MESSAGES/plasma_runner_translator.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_webshortcuts.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_windowedwidgets.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_windows.mo
@ -726,7 +748,6 @@ share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_marble.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_pattern.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_potd.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_virus.mo
-share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_wallpaper-qml.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_weather.mo
 share/locale/zh_TW/LC_MESSAGES/plasmagenericshell.mo
 share/locale/zh_TW/LC_MESSAGES/plasmapkg.mo
@ -745,9 +766,7 @@ share/locale/zh_TW/LC_MESSAGES/rocscore.mo
 share/locale/zh_TW/LC_MESSAGES/rocsvisualeditor.mo
 share/locale/zh_TW/LC_MESSAGES/searchbarplugin.mo
 share/locale/zh_TW/LC_MESSAGES/solid-hardware.mo
-share/locale/zh_TW/LC_MESSAGES/solid-network.mo
 share/locale/zh_TW/LC_MESSAGES/solid_qt.mo
-share/locale/zh_TW/LC_MESSAGES/solidcontrol.mo
 share/locale/zh_TW/LC_MESSAGES/soliduiserver.mo
 share/locale/zh_TW/LC_MESSAGES/step.mo
 share/locale/zh_TW/LC_MESSAGES/step_qt.mo
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@ -3,8 +3,7 @@
 PORTNAME=	kremotecontrol
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	comms kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -12,8 +11,6 @@ COMMENT=	KDE frontend for your remote controls

 RUN_DEPENDS=	lircd:${PORTSDIR}/comms/lirc

-CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
-
 USE_XZ=		yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 USES=		cmake:outsource
@ -21,5 +18,4 @@ USE_QT4=	corelib script xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes

-NO_STAGE=	yes
 .include <bsd.port.mk>
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kremotecontrol-4.10.5.tar.xz) = 9d348fdb3926ac45442615071d7e5b2322896764a5e2c75171e80c0fa994844b
-SIZE (KDE/4.10.5/kremotecontrol-4.10.5.tar.xz) = 1085016
+SHA256 (KDE/4.12.2/kremotecontrol-4.12.2.tar.xz) = e8b77ee5ad6057459ee0e17265adb12ff64c548698d9dff6679ad9fd8abaa0e7
+SIZE (KDE/4.12.2/kremotecontrol-4.12.2.tar.xz) = 1074672
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@ -4,19 +4,15 @@
 PORTNAME=	kcharselect
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Character selector for KDE

-CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
-
 USE_XZ=		yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build

-NO_STAGE=	yes
 .include <bsd.port.mk>
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kcharselect-4.10.5.tar.xz) = 2cc8c6685a5efc723e86cc42de19193f2ce2c6962d19189532f0e107e0af838b
-SIZE (KDE/4.10.5/kcharselect-4.10.5.tar.xz) = 86536
+SHA256 (KDE/4.12.2/kcharselect-4.12.2.tar.xz) = 444af977b84192aefd2789c54ae99898a9f077cdbc524b96af448f28fc8217d9
+SIZE (KDE/4.12.2/kcharselect-4.12.2.tar.xz) = 84716
--- a/deskutils/kdepim4-runtime/Makefile
+++ b/deskutils/kdepim4-runtime/Makefile
@ -3,25 +3,22 @@

 PORTNAME=	kdepim-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
-CATEGORIES=	deskutils kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES=	deskutils kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Libraries for KDE-PIM applications

 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
-		libkgapi.so:${PORTSDIR}/devel/libkgapi \
-		libkolab.so:${PORTSDIR}/devel/libkolab
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+		libkgapi2.so:${PORTSDIR}/devel/libkgapi \
+		libkolab.so:${PORTSDIR}/devel/libkolab \
+		libkfbapi.so:${PORTSDIR}/net/libkfbapi

-CONFLICTS=		akonadi-google-0.*
 CONFLICTS_INSTALL=	kdepim-runtime44-4.*

 USE_XZ=		yes
-USE_GNOME=	libxml2
+USE_GNOME=	libxml2 libxslt:build
 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs nepomuk-core \
 		akonadi automoc4 ontologies soprano strigi
 USES=		cmake:outsource shared-mime-info
@ -32,13 +29,11 @@ USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 CMAKE_ARGS=	-DKDEPIM_MOBILE_UI:BOOL=OFF

-NO_STAGE=	yes
 post-patch:
-	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
-		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
 # Prevent updating MIME during build.
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
 		${PATCH_WRKSRC}/CMakeLists.txt \
-		${PATCH_WRKSRC}/accountwizard/CMakeLists.txt
+		${PATCH_WRKSRC}/accountwizard/CMakeLists.txt \
+		${PATCH_WRKSRC}/resources/facebook/serializer/CMakeLists.txt

 .include <bsd.port.mk>
--- a/deskutils/kdepim4-runtime/distinfo
+++ b/deskutils/kdepim4-runtime/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdepim-runtime-4.10.5.tar.xz) = 83e6f9bfcb223d6b305105fa822d112a00c53160549b94e0390fb0c6f11f49dc
-SIZE (KDE/4.10.5/kdepim-runtime-4.10.5.tar.xz) = 1210604
+SHA256 (KDE/4.12.2/kdepim-runtime-4.12.2.tar.xz) = 787d46b960cfcbed5c74a0ba5aaaf21850da2fbacd949cee21bfd28069456a9c
+SIZE (KDE/4.12.2/kdepim-runtime-4.12.2.tar.xz) = 1191784
--- a/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt
+++ b/deskutils/kdepim4-runtime/files/patch-CMakeLists.txt
@ -1,23 +0,0 @@
--- ./CMakeLists.txt.orig	2012-04-29 20:39:36.039069000 +0000
-+++ ./CMakeLists.txt	2012-05-22 12:35:44.176575376 +0000
-@@ -154,7 +154,7 @@
- 
- ############### Needed commands before building anything ###############
- 
-include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS})
-+include_directories(${kdepim-runtime_SOURCE_DIR} ${kdepim-runtime_BINARY_DIR} ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS} ${AKONADI_INCLUDE_DIR} ${Boost_INCLUDE_DIR})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
- 
- ############### Generate akonadi-config.h ###############
-@@ -216,9 +216,9 @@
-   add_subdirectory(kresources)
- endif (KDEPIMLIBS_KRESOURCES_LIBS)
- endif(NOT WINCE)
-if (QT_QTDECLARATIVE_FOUND)
-+if (KDEPIM_MOBILE_UI AND QT_QTDECLARATIVE_FOUND)
-   add_subdirectory(qml)
-endif (QT_QTDECLARATIVE_FOUND)
-+endif (KDEPIM_MOBILE_UI AND QT_QTDECLARATIVE_FOUND)
- 
- #if(OPENSYNC_FOUND)
- #  add_subdirectory(opensync)
--- a/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
+++ b/deskutils/kdepim4-runtime/files/patch-xml__CMakeLists.txt
@ -1,12 +0,0 @@
--- xml/CMakeLists.txt.orig	2013-01-23 22:59:04.000000000 +0100
-+++ xml/CMakeLists.txt	2013-03-01 18:21:43.000000000 +0100
-@@ -4,6 +4,9 @@
-   add_definitions( -DHAVE_LIBXML2 )
- endif ( LIBXML2_FOUND )
- 
-+include_directories(${QT_QTCORE_INCLUDE_DIR})
-+include_directories(${QT_QTXML_INCLUDE_DIR})
-+
- add_subdirectory( tests )
- 
- add_definitions( -DQT_NO_CAST_FROM_ASCII )
--- a/deskutils/kdepim4-runtime/files/qt3to4headers.txt
+++ b/deskutils/kdepim4-runtime/files/qt3to4headers.txt
@ -1,4 +0,0 @@
-s/<qfile.h>/<QFile>/g
-s/<qimage.h>/<QImage>/g
-s/<qlabel.h>/<QLabel>/g
-s/<qobject.h>/<QObject>/g
--- a/deskutils/kdepim4-runtime/pkg-plist
+++ b/deskutils/kdepim4-runtime/pkg-plist
@ -1,7 +1,7 @@
 bin/accountwizard
-bin/akonadi2xml
 bin/akonadi_birthdays_resource
 bin/akonadi_davgroupware_resource
+bin/akonadi_facebook_resource
 bin/akonadi_googlecalendar_resource
 bin/akonadi_googlecontacts_resource
 bin/akonadi_icaldir_resource
@ -15,14 +15,17 @@ bin/akonadi_localbookmarks_resource
 bin/akonadi_maildispatcher_agent
 bin/akonadi_mailtransport_dummy_resource
 bin/akonadi_microblog_resource
+bin/akonadi_migration_agent
 bin/akonadi_mixedmaildir_resource
 bin/akonadi_nepomuk_feeder
 bin/akonadi_nepomuktag_resource
+bin/akonadi_newmailnotifier_agent
 bin/akonadi_nntp_resource
 bin/akonadi_openxchange_resource
 bin/akonadi_pop3_resource
 bin/akonadi_vcarddir_resource
 bin/akonaditray
+bin/gidmigrator
 bin/kaddressbookmigrator
 bin/kjotsmigrator
 bin/kmail-migrator
@ -34,7 +37,6 @@ lib/kde4/akonadi_contacts_resource.so
 lib/kde4/akonadi_ical_resource.so
 lib/kde4/akonadi_kalarm_dir_resource.so
 lib/kde4/akonadi_kalarm_resource.so
-lib/kde4/akonadi_knut_resource.so
 lib/kde4/akonadi_maildir_resource.so
 lib/kde4/akonadi_mbox_resource.so
 lib/kde4/akonadi_nepomuk_calendar_feeder.so
@ -50,7 +52,35 @@ lib/kde4/akonadi_serializer_kcal.so
 lib/kde4/akonadi_serializer_kcalcore.so
 lib/kde4/akonadi_serializer_mail.so
 lib/kde4/akonadi_serializer_microblog.so
+lib/kde4/akonadi_serializer_socialnotification.so
 lib/kde4/akonadi_vcard_resource.so
+lib/kde4/imports/org/kde/BreadcrumbNavigationView.qml
+lib/kde4/imports/org/kde/Dialog.qml
+lib/kde4/imports/org/kde/Flap.qml
+lib/kde4/imports/org/kde/Flap2.qml
+lib/kde4/imports/org/kde/SlideoutPanel.qml
+lib/kde4/imports/org/kde/SlideoutPanelContainer.qml
+lib/kde4/imports/org/kde/akonadi/AkonadiBreadcrumbNavigationView.qml
+lib/kde4/imports/org/kde/akonadi/CollectionDelegate.qml
+lib/kde4/imports/org/kde/akonadi/border_dot.png
+lib/kde4/imports/org/kde/akonadi/check.png
+lib/kde4/imports/org/kde/akonadi/collectionview.qml
+lib/kde4/imports/org/kde/akonadi/qmldir
+lib/kde4/imports/org/kde/akonadi/sliderbackground.png
+lib/kde4/imports/org/kde/akonadi/transparentplus.png
+lib/kde4/imports/org/kde/dividing-line-horizontal.png
+lib/kde4/imports/org/kde/dividing-line.png
+lib/kde4/imports/org/kde/flap-collapsed-bottom.png
+lib/kde4/imports/org/kde/flap-collapsed-mid.png
+lib/kde4/imports/org/kde/flap-collapsed-top.png
+lib/kde4/imports/org/kde/flap-expanded-bottom.png
+lib/kde4/imports/org/kde/flap-expanded-mid.png
+lib/kde4/imports/org/kde/flap-expanded-top.png
+lib/kde4/imports/org/kde/libkdeqmlplugin.so
+lib/kde4/imports/org/kde/list-line-top.png
+lib/kde4/imports/org/kde/qmldir
+lib/kde4/imports/org/kde/scrollable-bottom.png
+lib/kde4/imports/org/kde/scrollable-top.png
 lib/kde4/kabc_akonadi.so
 lib/kde4/kcal_akonadi.so
 lib/kde4/kcm_akonadi.so
@ -58,26 +88,24 @@ lib/kde4/kcm_akonadi_resources.so
 lib/kde4/kcm_akonadi_server.so
 lib/kde4/kio_akonadi.so
 lib/libakonadi-filestore.so
-lib/libakonadi-filestore.so.5
-lib/libakonadi-filestore.so.5.0.1
-lib/libakonadi-xml.so
-lib/libakonadi-xml.so.5
-lib/libakonadi-xml.so.5.0.1
+lib/libakonadi-filestore.so.4
+lib/libakonadi-filestore.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkdepim-copy.so
-lib/libkdepim-copy.so.5
-lib/libkdepim-copy.so.5.0.1
+lib/libkdepim-copy.so.4
+lib/libkdepim-copy.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkmindexreader.so
-lib/libkmindexreader.so.5
-lib/libkmindexreader.so.5.0.1
+lib/libkmindexreader.so.4
+lib/libkmindexreader.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmaildir.so
-lib/libmaildir.so.5
-lib/libmaildir.so.5.0.1
+lib/libmaildir.so.4
+lib/libmaildir.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libnepomukfeederpluginlib.a
 share/akonadi/agents/akonadinepomukfeederagent.desktop
 share/akonadi/agents/akonotesresource.desktop
 share/akonadi/agents/birthdaysresource.desktop
 share/akonadi/agents/contactsresource.desktop
 share/akonadi/agents/davgroupwareresource.desktop
+share/akonadi/agents/facebookresource.desktop
 share/akonadi/agents/googlecalendarresource.desktop
 share/akonadi/agents/googlecontactsresource.desktop
 share/akonadi/agents/icaldirresource.desktop
@ -89,16 +117,17 @@ share/akonadi/agents/kalarmdirresource.desktop
 share/akonadi/agents/kalarmresource.desktop
 share/akonadi/agents/kcalresource.desktop
 share/akonadi/agents/kdeaccountsresource.desktop
-share/akonadi/agents/knutresource.desktop
 share/akonadi/agents/kolabproxyresource.desktop
 share/akonadi/agents/localbookmarksresource.desktop
 share/akonadi/agents/maildirresource.desktop
 share/akonadi/agents/maildispatcheragent.desktop
 share/akonadi/agents/mboxresource.desktop
 share/akonadi/agents/microblog.desktop
+share/akonadi/agents/migrationagent.desktop
 share/akonadi/agents/mixedmaildirresource.desktop
 share/akonadi/agents/mtdummyresource.desktop
 share/akonadi/agents/nepomuktagresource.desktop
+share/akonadi/agents/newmailnotifieragent.desktop
 share/akonadi/agents/nntpresource.desktop
 share/akonadi/agents/notesresource.desktop
 share/akonadi/agents/openxchangeresource.desktop
@ -131,7 +160,6 @@ share/apps/akonadi/accountwizard/pop3/pop3wizard.ui
 share/apps/akonadi/accountwizard/tine20/tine20wizard.desktop
 share/apps/akonadi/accountwizard/tine20/tine20wizard.es
 share/apps/akonadi/accountwizard/tine20/tine20wizard.ui
-share/apps/akonadi/akonadi-xml.xsd
 share/apps/akonadi/firstrun/defaultaddressbook
 share/apps/akonadi/firstrun/defaultcalendar
 share/apps/akonadi/firstrun/defaultnotebook
@ -143,9 +171,11 @@ share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_kcalcore.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 share/apps/akonadi/plugins/serializer/akonadi_serializer_microblog.desktop
-share/apps/akonadi_knut_resource/knut-template.xml
+share/apps/akonadi/plugins/serializer/akonadi_serializer_socialnotification.desktop
+share/apps/akonadi_facebook_resource/akonadi_facebook_resource.notifyrc
 share/apps/akonadi_maildispatcher_agent/akonadi_maildispatcher_agent.notifyrc
-share/apps/akonadi_nepomuk_feeder/akonadi_nepomuk_feeder.notifyrc
+share/apps/akonadi_newmailnotifier_agent/akonadi_newmailnotifier_agent.notifyrc
+share/apps/kconf_update/newmailnotifier.upd
 share/apps/nepomukpimindexerutility/nepomukpimindexerutility.rc
 share/autostart/kaddressbookmigrator.desktop
 share/config/accountwizard.knsrc
@ -155,10 +185,14 @@ share/dbus-1/interfaces/org.kde.Akonadi.Maildir.Settings.xml
 share/dbus-1/interfaces/org.kde.Akonadi.MixedMaildir.Settings.xml
 share/icons/hicolor/128x128/apps/akonaditray.png
 share/icons/hicolor/128x128/apps/ox.png
+share/icons/hicolor/16x16/apps/facebookresource.png
 share/icons/hicolor/16x16/apps/ox.png
 share/icons/hicolor/22x22/apps/akonaditray.png
+share/icons/hicolor/22x22/apps/facebookresource.png
 share/icons/hicolor/32x32/apps/akonaditray.png
+share/icons/hicolor/32x32/apps/facebookresource.png
 share/icons/hicolor/32x32/apps/ox.png
+share/icons/hicolor/48x48/apps/facebookresource.png
 share/icons/hicolor/48x48/apps/ox.png
 share/icons/hicolor/64x64/apps/akonaditray.png
 share/icons/hicolor/64x64/apps/kolab.png
@ -169,6 +203,7 @@ share/kde4/services/akonadi/davgroupware-providers/citadel.desktop
 share/kde4/services/akonadi/davgroupware-providers/davical.desktop
 share/kde4/services/akonadi/davgroupware-providers/egroupware.desktop
 share/kde4/services/akonadi/davgroupware-providers/opengroupware.desktop
+share/kde4/services/akonadi/davgroupware-providers/owncloud-pre5.desktop
 share/kde4/services/akonadi/davgroupware-providers/owncloud.desktop
 share/kde4/services/akonadi/davgroupware-providers/scalix.desktop
 share/kde4/services/akonadi/davgroupware-providers/sogo.desktop
@ -188,6 +223,7 @@ share/kde4/servicetypes/akonadinepomukfeeder.desktop
 share/kde4/servicetypes/davgroupwareprovider.desktop
 share/mime/packages/accountwizard-mime.xml
 share/mime/packages/kdepim-mime.xml
+share/mime/packages/x-vnd.akonadi.socialnotification.xml
 share/ontology/kde/aneo.ontology
 share/ontology/kde/aneo.trig
@dirrmtry share/ontology/kde
@ -195,9 +231,9 @@ share/ontology/kde/aneo.trig
@dirrm share/kde4/services/akonadi/davgroupware-providers
@dirrmtry share/kde4/services/akonadi
@dirrm share/apps/nepomukpimindexerutility
-@dirrm share/apps/akonadi_nepomuk_feeder
+@dirrm share/apps/akonadi_newmailnotifier_agent
@dirrm share/apps/akonadi_maildispatcher_agent
-@dirrm share/apps/akonadi_knut_resource
+@dirrm share/apps/akonadi_facebook_resource
@dirrm share/apps/akonadi/plugins/serializer
@dirrm share/apps/akonadi/plugins
@dirrm share/apps/akonadi/firstrun
@ -213,3 +249,4 @@ share/ontology/kde/aneo.trig
@dirrmtry share/apps/akonadi
@dirrm share/akonadi/agents
@dirrm share/akonadi
+@dirrm lib/kde4/imports/org/kde/akonadi
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@ -3,10 +3,8 @@

 PORTNAME=	kdepim
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
-CATEGORIES=	deskutils kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES=	deskutils kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -17,31 +15,29 @@ LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme \
 		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 \
 		libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libgrantlee_gui.so:${PORTSDIR}/devel/grantlee \
-		libclucene-core.so:${PORTSDIR}/textproc/clucene
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+		libclucene-core.so:${PORTSDIR}/textproc/clucene \
+		liblink-grammar.so:${PORTSDIR}/textproc/link-grammar
 RUN_DEPENDS=	${KDE4_PREFIX}/bin/accountwizard:${PORTSDIR}/deskutils/kdepim4-runtime

 CONFLICTS_INSTALL=	kdepim44-4.*

 USE_XZ=		yes
-USE_GNOME=	libxml2
-USE_KDE4=	kdehier kdelibs kdeprefix pimlibs \
+USE_GNOME=	libxml2 libxslt:build
+USE_KDE4=	kdehier kdelibs kdeprefix pimlibs kactivities \
 		akonadi automoc4 ontologies soprano strigi nepomuk-widgets
-USES=		cmake:outsource iconv
+USES=		cmake:outsource gmake iconv
 USE_OPENLDAP=	yes
 USE_QT4=	corelib dbus declarative designer_build gui network opengl \
 		script sql webkit \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11 xscrnsaver
 CMAKE_ARGS+=	-DKDEPIM_BUILD_MOBILE:BOOL=FALSE
-USE_GMAKE=	yes
-NO_STAGE=	yes
 # Avoids Clang error:
 # https://git.reviewboard.kde.org/r/108617
 CXXFLAGS+=	-Wno-error=return-type
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null

-MAN1=		kabcclient.1
+PLIST_SUB=	GRANTLEE_VER=0.4

 .include <bsd.port.mk>
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdepim-4.10.5.tar.xz) = 016f05cf28ed546199d4aec0683bb4022beb52cc1799162085337fb7b3fd4163
-SIZE (KDE/4.10.5/kdepim-4.10.5.tar.xz) = 14442688
+SHA256 (KDE/4.12.2/kdepim-4.12.2.tar.xz) = 897c13fb65b3a8c182f67d67e0dba2b4e522de44648c3fe554eb380db699afab
+SIZE (KDE/4.12.2/kdepim-4.12.2.tar.xz) = 14133440
--- a/deskutils/kdepim4/files/patch-pimsettingexportermailexportmailjob.h
+++ b/deskutils/kdepim4/files/patch-pimsettingexportermailexportmailjob.h
@ -0,0 +1,11 @@
+--- pimsettingexporter/mail/exportmailjob.h.orig	2013-08-14 09:58:28.333460897 +0000
+++ pimsettingexporter/mail/exportmailjob.h	2013-08-14 10:01:42.142460369 +0000
+@@ -18,6 +18,8 @@
+ #ifndef ExportMailJob_H
+ #define ExportMailJob_H
+ 
+#include <time.h>
+
+ #include "abstractimportexportjob.h"
+ #include <KSharedConfig>
+ class KUrl;
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@ -1,9 +1,14 @@
 bin/akonadi_archivemail_agent
+bin/akonadi_folderarchive_agent
 bin/akonadi_mailfilter_agent
+bin/akonadi_sendlater_agent
 bin/akonadiconsole
 bin/akregator
 bin/akregatorstorageexporter
 bin/blogilo
+bin/calendarjanitor
+bin/contactthemeeditor
+bin/headerthemeeditor
 bin/ical2vcal
 bin/importwizard
 bin/kabc2mutt
@ -32,6 +37,7 @@ bin/ksendemail
 bin/ktimetracker
 bin/ktnef
 bin/kwatchgnupg
+bin/mboximporter
 bin/pimsettingexporter
 etc/dbus-1/system.d/org.kde.kalarmrtcwake.conf
 lib/akonadi/contact/editorpageplugins/cryptopageplugin.so
@ -44,6 +50,7 @@ lib/kde4/akregator_config_sharemicroblog.so
 lib/kde4/akregator_mk4storage_plugin.so
 lib/kde4/akregator_sharemicroblog_plugin.so
 lib/kde4/akregatorpart.so
+lib/kde4/grammar_link.so
 lib/kde4/kaddressbookpart.so
 lib/kde4/kcal_blog.so
 lib/kde4/kcal_remote.so
@ -60,6 +67,7 @@ lib/kde4/kcm_korganizer.so
 lib/kde4/kcm_kpimidentities.so
 lib/kde4/kcm_ktimetracker.so
 lib/kde4/kcm_ldap.so
+lib/kde4/kcm_pimactivity.so
 lib/kde4/kcm_sdsummary.so
 lib/kde4/kcm_todosummary.so
 lib/kde4/kjotspart.so
@ -95,109 +103,136 @@ lib/kde4/plasma_applet_akonotes_list.so
 lib/kde4/plasma_applet_akonotes_note.so
 lib/kde4/plugins/accessible/messagevieweraccessiblewidgetfactory.so
 lib/kde4/plugins/designer/kdepimwidgets.so
+lib/kde4/plugins/designer/mailcommonwidgets.so
+lib/kde4/plugins/designer/pimcommonwidgets.so
+lib/kde4/plugins/grantlee/%%GRANTLEE_VER%%/grantlee_messageheaderfilters.so
 lib/libakonadi_next.so
-lib/libakonadi_next.so.5
-lib/libakonadi_next.so.5.0.1
+lib/libakonadi_next.so.4
+lib/libakonadi_next.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libakregatorinterfaces.so
-lib/libakregatorinterfaces.so.5
-lib/libakregatorinterfaces.so.5.0.1
-lib/libakregatorprivate.so.5
-lib/libakregatorprivate.so.5.0.1
+lib/libakregatorinterfaces.so.4
+lib/libakregatorinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakregatorprivate.so.4
+lib/libakregatorprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libcalendarsupport.so
-lib/libcalendarsupport.so.5
-lib/libcalendarsupport.so.5.0.1
+lib/libcalendarsupport.so.4
+lib/libcalendarsupport.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libcomposereditorng.so
+lib/libcomposereditorng.so.4
+lib/libcomposereditorng.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libeventviews.so
-lib/libeventviews.so.5
-lib/libeventviews.so.5.0.1
+lib/libeventviews.so.4
+lib/libeventviews.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libfolderarchive.so
+lib/libfolderarchive.so.4
+lib/libfolderarchive.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libgrammar.so
+lib/libgrammar.so.4
+lib/libgrammar.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libgrantleetheme.so
+lib/libgrantleetheme.so.4
+lib/libgrantleetheme.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libgrantleethemeeditor.so
+lib/libgrantleethemeeditor.so.4
+lib/libgrantleethemeeditor.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libincidenceeditorsng.so
-lib/libincidenceeditorsng.so.5
-lib/libincidenceeditorsng.so.5.0.1
+lib/libincidenceeditorsng.so.4
+lib/libincidenceeditorsng.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libincidenceeditorsngmobile.so
-lib/libincidenceeditorsngmobile.so.5
-lib/libincidenceeditorsngmobile.so.5.0.1
-lib/libkaddressbookprivate.so.5
-lib/libkaddressbookprivate.so.5.0.1
+lib/libincidenceeditorsngmobile.so.4
+lib/libincidenceeditorsngmobile.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkaddressbookgrantlee.so.4
+lib/libkaddressbookgrantlee.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkaddressbookprivate.so.4
+lib/libkaddressbookprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkcal_resourceblog.so
-lib/libkcal_resourceblog.so.5
-lib/libkcal_resourceblog.so.5.0.1
+lib/libkcal_resourceblog.so.4
+lib/libkcal_resourceblog.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkcal_resourceremote.so
-lib/libkcal_resourceremote.so.5
-lib/libkcal_resourceremote.so.5.0.1
+lib/libkcal_resourceremote.so.4
+lib/libkcal_resourceremote.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkdepim.so
-lib/libkdepim.so.5
-lib/libkdepim.so.5.0.1
+lib/libkdepim.so.4
+lib/libkdepim.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkdepimdbusinterfaces.so
-lib/libkdepimdbusinterfaces.so.5
-lib/libkdepimdbusinterfaces.so.5.0.1
+lib/libkdepimdbusinterfaces.so.4
+lib/libkdepimdbusinterfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkdgantt2.so
 lib/libkdgantt2.so.0
 lib/libkdgantt2.so.0.1.0
 lib/libkleo.so
-lib/libkleo.so.5
-lib/libkleo.so.5.0.1
+lib/libkleo.so.4
+lib/libkleo.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkleopatraclientcore.so
 lib/libkleopatraclientcore.so.0
 lib/libkleopatraclientcore.so.0.3.0
 lib/libkleopatraclientgui.so
 lib/libkleopatraclientgui.so.0
 lib/libkleopatraclientgui.so.0.3.0
-lib/libkmailprivate.so.5
-lib/libkmailprivate.so.5.0.1
+lib/libkmailprivate.so.4
+lib/libkmailprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkmanagesieve.so
-lib/libkmanagesieve.so.5
-lib/libkmanagesieve.so.5.0.1
+lib/libkmanagesieve.so.4
+lib/libkmanagesieve.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libknodecommon.so
-lib/libknodecommon.so.5
-lib/libknodecommon.so.5.0.1
-lib/libkontactprivate.so.5
-lib/libkontactprivate.so.5.0.1
+lib/libknodecommon.so.4
+lib/libknodecommon.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libknotesprivate.so.4
+lib/libknotesprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkontactprivate.so.4
+lib/libkontactprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkorganizer_core.so
-lib/libkorganizer_core.so.5
-lib/libkorganizer_core.so.5.0.1
+lib/libkorganizer_core.so.4
+lib/libkorganizer_core.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkorganizer_interfaces.so
-lib/libkorganizer_interfaces.so.5
-lib/libkorganizer_interfaces.so.5.0.1
-lib/libkorganizerprivate.so.5
-lib/libkorganizerprivate.so.5.0.1
+lib/libkorganizer_interfaces.so.4
+lib/libkorganizer_interfaces.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libkorganizerprivate.so.4
+lib/libkorganizerprivate.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkpgp.so
-lib/libkpgp.so.5
-lib/libkpgp.so.5.0.1
+lib/libkpgp.so.4
+lib/libkpgp.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libksieve.so
-lib/libksieve.so.5
-lib/libksieve.so.5.0.1
+lib/libksieve.so.4
+lib/libksieve.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libksieveui.so
-lib/libksieveui.so.5
-lib/libksieveui.so.5.0.1
+lib/libksieveui.so.4
+lib/libksieveui.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmailcommon.so
-lib/libmailcommon.so.5
-lib/libmailcommon.so.5.0.1
+lib/libmailcommon.so.4
+lib/libmailcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmailimporter.so
-lib/libmailimporter.so.5
-lib/libmailimporter.so.5.0.1
+lib/libmailimporter.so.4
+lib/libmailimporter.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmessagecomposer.so
-lib/libmessagecomposer.so.5
-lib/libmessagecomposer.so.5.0.1
+lib/libmessagecomposer.so.4
+lib/libmessagecomposer.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmessagecore.so
-lib/libmessagecore.so.5
-lib/libmessagecore.so.5.0.1
+lib/libmessagecore.so.4
+lib/libmessagecore.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmessagelist.so
-lib/libmessagelist.so.5
-lib/libmessagelist.so.5.0.1
+lib/libmessagelist.so.4
+lib/libmessagelist.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmessageviewer.so
-lib/libmessageviewer.so.5
-lib/libmessageviewer.so.5.0.1
+lib/libmessageviewer.so.4
+lib/libmessageviewer.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libpimactivity.so
+lib/libpimactivity.so.4
+lib/libpimactivity.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libpimcommon.so
-lib/libpimcommon.so.5
-lib/libpimcommon.so.5.0.1
+lib/libpimcommon.so.4
+lib/libpimcommon.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libsendlater.so
+lib/libsendlater.so.4
+lib/libsendlater.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libtemplateparser.so
-lib/libtemplateparser.so.5
-lib/libtemplateparser.so.5.0.1
-lib/strigi/strigiea_ctg.so
-lib/strigi/strigiea_ics.so
-lib/strigi/strigiea_mail.so
-lib/strigi/strigiea_vcf.so
+lib/libtemplateparser.so.4
+lib/libtemplateparser.so.%%KDE4_GENERIC_LIB_VERSION%%
+man/man1/kabcclient.1.gz
 share/akonadi/agents/archivemailagent.desktop
+share/akonadi/agents/folderarchiveagent.desktop
 share/akonadi/agents/mailfilteragent.desktop
+share/akonadi/agents/sendlateragent.desktop
 share/applications/kde4/KMail2.desktop
 share/applications/kde4/KNode.desktop
 share/applications/kde4/Kjots.desktop
@ -205,6 +240,8 @@ share/applications/kde4/Kontact.desktop
 share/applications/kde4/akonadiconsole.desktop
 share/applications/kde4/akregator.desktop
 share/applications/kde4/blogilo.desktop
+share/applications/kde4/contactthemeeditor.desktop
+share/applications/kde4/headerthemeeditor.desktop
 share/applications/kde4/importwizard.desktop
 share/applications/kde4/kaddressbook.desktop
 share/applications/kde4/kalarm.desktop
@ -218,8 +255,11 @@ share/applications/kde4/korganizer-import.desktop
 share/applications/kde4/korganizer.desktop
 share/applications/kde4/ktimetracker.desktop
 share/applications/kde4/ktnef.desktop
+share/applications/kde4/mboximporter.desktop
 share/apps/akonadi_archivemail_agent/akonadi_archivemail_agent.notifyrc
+share/apps/akonadi_folderarchive_agent/akonadi_folderarchive_agent.notifyrc
 share/apps/akonadi_mailfilter_agent/akonadi_mailfilter_agent.notifyrc
+share/apps/akonadi_sendlater_agent/akonadi_sendlater_agent.notifyrc
 share/apps/akonadiconsole/akonadiconsoleui.rc
 share/apps/akregator/about/akregator.css
 share/apps/akregator/about/main.html
@ -232,14 +272,20 @@ share/apps/akregator/pageviewer.rc
 share/apps/akregator/pics/kmmsgnew.png
 share/apps/akregator/pics/kmmsgunseen.png
 share/apps/akregator_sharemicroblog_plugin/akregator_sharemicroblog_plugin.rc
-share/apps/blogilo/TextEditorInitialHtml
 share/apps/blogilo/blogiloui.rc
+share/apps/composereditor/composereditorinitialhtml
+share/apps/contactthemeeditor/contactthemeeditorui.rc
 share/apps/desktoptheme/default/widgets/stickynote.svgz
+share/apps/headerthemeeditor/headerthemeeditorui.rc
 share/apps/kaddressbook/kaddressbookui.rc
 share/apps/kaddressbook/printing/compact-style.png
 share/apps/kaddressbook/printing/detailed-style.png
 share/apps/kaddressbook/printing/mike-style.png
 share/apps/kaddressbook/printing/ringbinder-style.png
+share/apps/kaddressbook/printing/themes/big-theme-example/theme.desktop
+share/apps/kaddressbook/printing/themes/big-theme-example/theme.html
+share/apps/kaddressbook/printing/themes/default/theme.desktop
+share/apps/kaddressbook/printing/themes/default/theme.html
 share/apps/kaddressbook/viewertemplates/default/contact.html
 share/apps/kaddressbook/viewertemplates/default/contact_embedded.html
 share/apps/kaddressbook/viewertemplates/default/contact_row.html
@ -247,6 +293,7 @@ share/apps/kaddressbook/viewertemplates/default/contactgroup.html
 share/apps/kaddressbook/viewertemplates/default/contactgroup_additionalfieldrow.html
 share/apps/kaddressbook/viewertemplates/default/contactgroup_embedded.html
 share/apps/kaddressbook/viewertemplates/default/contactgroup_memberrow.html
+share/apps/kaddressbook/viewertemplates/default/theme.desktop
 share/apps/kalarm/icons/oxygen/16x16/actions/document-new-from-template.png
 share/apps/kalarm/icons/oxygen/16x16/actions/new-audio-alarm.png
 share/apps/kalarm/icons/oxygen/16x16/actions/new-command-alarm.png
@ -257,6 +304,7 @@ share/apps/kalarm/icons/oxygen/22x22/actions/kalarm.png
 share/apps/kalarm/icons/oxygen/22x22/actions/new-audio-alarm.png
 share/apps/kalarm/icons/oxygen/22x22/actions/new-command-alarm.png
 share/apps/kalarm/kalarmui.rc
+share/apps/kconf_update/grantleetheme.upd
 share/apps/kconf_update/kalarm-1.2.1-general.pl
 share/apps/kconf_update/kalarm-1.9.5-defaults.pl
 share/apps/kconf_update/kalarm-2.0.2-general.pl
@ -364,6 +412,11 @@ share/apps/knode/pics/snderr.png
 share/apps/knotes/knotes_part.rc
 share/apps/knotes/knotesappui.rc
 share/apps/knotes/knotesui.rc
+share/apps/knotes/print/themes/TODO
+share/apps/knotes/print/themes/big-title/theme.desktop
+share/apps/knotes/print/themes/big-title/theme.html
+share/apps/knotes/print/themes/default/theme.desktop
+share/apps/knotes/print/themes/default/theme.html
 share/apps/kontact/about/kontact.css
 share/apps/kontact/about/main.html
 share/apps/kontact/about/top-left-kontact.png
@ -473,10 +526,18 @@ share/apps/messagelist/pics/mail-thread-watch.png
 share/apps/messagelist/pics/mail-vertical-separator-line.png
 share/apps/messageviewer/about/main_mobile.html
 share/apps/messageviewer/about/messageviewer_mobile.css
+share/apps/messageviewer/longurlServices.json
+share/apps/messageviewer/messageviewer.notifyrc
 share/apps/messageviewer/plugins/bodypartformatter/application_ms-tnef.desktop
 share/apps/messageviewer/plugins/bodypartformatter/text_calendar.desktop
 share/apps/messageviewer/plugins/bodypartformatter/text_vcard.desktop
 share/apps/messageviewer/plugins/bodypartformatter/text_xdiff.desktop
+share/apps/messageviewer/themes/example/header.desktop
+share/apps/messageviewer/themes/example/header.html
+share/apps/messageviewer/themes/example/header_row.html
+share/apps/messageviewer/themes/example_fancy/header.desktop
+share/apps/messageviewer/themes/example_fancy/header.html
+share/apps/pimsettingexporter/backup-structure.txt
 share/apps/pimsettingexporter/pimsettingexporter.rc
 share/autostart/kalarm.autostart.desktop
 share/autostart/korgac.desktop
@ -491,10 +552,13 @@ share/config.kcfg/knotesglobalconfig.kcfg
 share/config.kcfg/kontact.kcfg
 share/config.kcfg/korganizer.kcfg
 share/config.kcfg/templatesconfiguration_kfg.kcfg
+share/config/kaddressbook_themes.knsrc
 share/config/kmail.antispamrc
 share/config/kmail.antivirusrc
 share/config/korganizer.knsrc
+share/config/ksieve_script.knsrc
 share/config/libkleopatrarc
+share/config/messageviewer_header_themes.knsrc
 share/dbus-1/interfaces/org.kde.KNotes.xml
 share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml
 share/dbus-1/interfaces/org.kde.addressbook.service.xml
@ -509,6 +573,20 @@ share/dbus-1/interfaces/org.kde.korganizer.Korganizer.xml
 share/dbus-1/interfaces/org.kde.ktimetracker.ktimetracker.xml
 share/dbus-1/interfaces/org.kde.mailtransport.service.xml
 share/dbus-1/system-services/org.kde.kalarmrtcwake.service
+share/doc/HTML/en/akonadi_archivemail_agent/add-archive-mail.png
+share/doc/HTML/en/akonadi_archivemail_agent/common
+share/doc/HTML/en/akonadi_archivemail_agent/configure-archive-mail-agent.png
+share/doc/HTML/en/akonadi_archivemail_agent/index.cache.bz2
+share/doc/HTML/en/akonadi_archivemail_agent/index.docbook
+share/doc/HTML/en/akonadi_folderarchive_agent/common
+share/doc/HTML/en/akonadi_folderarchive_agent/folderarchiveagent.png
+share/doc/HTML/en/akonadi_folderarchive_agent/index.cache.bz2
+share/doc/HTML/en/akonadi_folderarchive_agent/index.docbook
+share/doc/HTML/en/akonadi_sendlater_agent/common
+share/doc/HTML/en/akonadi_sendlater_agent/index.cache.bz2
+share/doc/HTML/en/akonadi_sendlater_agent/index.docbook
+share/doc/HTML/en/akonadi_sendlater_agent/sendlateragent-configure.png
+share/doc/HTML/en/akonadi_sendlater_agent/sendlateragent-dialog.png
 share/doc/HTML/en/akregator/add-feed.png
 share/doc/HTML/en/akregator/add-feed2.png
 share/doc/HTML/en/akregator/add-folder.png
@ -518,6 +596,7 @@ share/doc/HTML/en/akregator/appearance-tab.png
 share/doc/HTML/en/akregator/archive-tab.png
 share/doc/HTML/en/akregator/browser-tab.png
 share/doc/HTML/en/akregator/common
+share/doc/HTML/en/akregator/feed.png
 share/doc/HTML/en/akregator/general-tab.png
 share/doc/HTML/en/akregator/index.cache.bz2
 share/doc/HTML/en/akregator/index.docbook
@ -529,7 +608,7 @@ share/doc/HTML/en/akregator/main-window3.png
 share/doc/HTML/en/akregator/main-window4.png
 share/doc/HTML/en/akregator/quick-filter.png
 share/doc/HTML/en/akregator/rss.png
-share/doc/HTML/en/akregator/rss3.png
+share/doc/HTML/en/akregator/share-services-tab.png
 share/doc/HTML/en/blogilo/add-blog-1.png
 share/doc/HTML/en/blogilo/add-blog-2.png
 share/doc/HTML/en/blogilo/common
@ -541,6 +620,13 @@ share/doc/HTML/en/blogilo/toolbox-1.png
 share/doc/HTML/en/blogilo/toolbox-2.png
 share/doc/HTML/en/blogilo/toolbox-3.png
 share/doc/HTML/en/blogilo/toolbox-4.png
+share/doc/HTML/en/headerthemeeditor/common
+share/doc/HTML/en/headerthemeeditor/index.cache.bz2
+share/doc/HTML/en/headerthemeeditor/index.docbook
+share/doc/HTML/en/importwizard/common
+share/doc/HTML/en/importwizard/import-selection.png
+share/doc/HTML/en/importwizard/index.cache.bz2
+share/doc/HTML/en/importwizard/index.docbook
 share/doc/HTML/en/kabcclient/common
 share/doc/HTML/en/kabcclient/index.cache.bz2
 share/doc/HTML/en/kabcclient/index.docbook
@ -560,21 +646,47 @@ share/doc/HTML/en/kioslave/news/index.docbook
 share/doc/HTML/en/kjots/common
 share/doc/HTML/en/kjots/index.cache.bz2
 share/doc/HTML/en/kjots/index.docbook
+share/doc/HTML/en/kjots/mainwindow.png
 share/doc/HTML/en/kleopatra/common
 share/doc/HTML/en/kleopatra/index.cache.bz2
 share/doc/HTML/en/kleopatra/index.docbook
+share/doc/HTML/en/kmail/accountwizard.png
+share/doc/HTML/en/kmail/aggregationtheme.png
 share/doc/HTML/en/kmail/common
 share/doc/HTML/en/kmail/configure.docbook
+share/doc/HTML/en/kmail/configure.png
 share/doc/HTML/en/kmail/credits-and-licenses.docbook
 share/doc/HTML/en/kmail/faq.docbook
+share/doc/HTML/en/kmail/folder-example.png
+share/doc/HTML/en/kmail/folder-properties.png
 share/doc/HTML/en/kmail/getting-started.docbook
-share/doc/HTML/en/kmail/importing.docbook
+share/doc/HTML/en/kmail/identitiesadvanced.png
+share/doc/HTML/en/kmail/identity.png
+share/doc/HTML/en/kmail/identitycryptography.png
+share/doc/HTML/en/kmail/identitygeneral.png
+share/doc/HTML/en/kmail/identitypicture.png
+share/doc/HTML/en/kmail/identitysignature.png
+share/doc/HTML/en/kmail/identitytemplate.png
 share/doc/HTML/en/kmail/index.cache.bz2
 share/doc/HTML/en/kmail/index.docbook
 share/doc/HTML/en/kmail/intro.docbook
+share/doc/HTML/en/kmail/kmailwelcome.png
+share/doc/HTML/en/kmail/mail-mark-important.png
+share/doc/HTML/en/kmail/mail-mark-read.png
+share/doc/HTML/en/kmail/mail-mark-task.png
+share/doc/HTML/en/kmail/mail-mark-unread.png
+share/doc/HTML/en/kmail/mail-thread-ignored.png
+share/doc/HTML/en/kmail/mail-thread-watch.png
 share/doc/HTML/en/kmail/menus.docbook
+share/doc/HTML/en/kmail/message.png
+share/doc/HTML/en/kmail/messagelisttheme.png
+share/doc/HTML/en/kmail/smile.png
 share/doc/HTML/en/kmail/troubleshooting.docbook
 share/doc/HTML/en/kmail/using-kmail.docbook
+share/doc/HTML/en/kmailcvt/common
+share/doc/HTML/en/kmailcvt/index.cache.bz2
+share/doc/HTML/en/kmailcvt/index.docbook
+share/doc/HTML/en/kmailcvt/kmailcvt.png
 share/doc/HTML/en/knode/commands.docbook
 share/doc/HTML/en/knode/common
 share/doc/HTML/en/knode/credits.docbook
@ -702,14 +814,21 @@ share/doc/HTML/en/ktimetracker/systray.png
 share/doc/HTML/en/ktnef/common
 share/doc/HTML/en/ktnef/index.cache.bz2
 share/doc/HTML/en/ktnef/index.docbook
+share/doc/HTML/en/ktnef/mainwindow.png
+share/doc/HTML/en/ktnef/winmail_dat.png
 share/doc/HTML/en/kwatchgnupg/common
 share/doc/HTML/en/kwatchgnupg/index.cache.bz2
 share/doc/HTML/en/kwatchgnupg/index.docbook
+share/doc/HTML/en/pimsettingexporter/common
+share/doc/HTML/en/pimsettingexporter/index.cache.bz2
+share/doc/HTML/en/pimsettingexporter/index.docbook
+share/doc/HTML/en/pimsettingexporter/pimsettingexporter.png
 share/icons/hicolor/128x128/actions/upload-media.png
 share/icons/hicolor/128x128/apps/akonadiconsole.png
 share/icons/hicolor/128x128/apps/akregator.png
 share/icons/hicolor/128x128/apps/blogilo.png
 share/icons/hicolor/128x128/apps/kaddressbook.png
+share/icons/hicolor/128x128/apps/kalarm.png
 share/icons/hicolor/128x128/apps/kjots.png
 share/icons/hicolor/128x128/apps/kleopatra.png
 share/icons/hicolor/128x128/apps/kmail.png
@ -725,6 +844,10 @@ share/icons/hicolor/128x128/apps/ktimetracker.png
 share/icons/hicolor/16x16/actions/format-text-blockquote.png
 share/icons/hicolor/16x16/actions/format-text-code.png
 share/icons/hicolor/16x16/actions/insert-more-mark.png
+share/icons/hicolor/16x16/actions/knotes_alarm.png
+share/icons/hicolor/16x16/actions/knotes_close.png
+share/icons/hicolor/16x16/actions/knotes_date.png
+share/icons/hicolor/16x16/actions/knotes_delete.png
 share/icons/hicolor/16x16/actions/remove-link.png
 share/icons/hicolor/16x16/actions/upload-media.png
 share/icons/hicolor/16x16/apps/akonadiconsole.png
@ -736,6 +859,7 @@ share/icons/hicolor/16x16/apps/kalarm.png
 share/icons/hicolor/16x16/apps/kjots.png
 share/icons/hicolor/16x16/apps/kleopatra.png
 share/icons/hicolor/16x16/apps/kmail.png
+share/icons/hicolor/16x16/apps/kmailcvt.png
 share/icons/hicolor/16x16/apps/knode.png
 share/icons/hicolor/16x16/apps/knotes.png
 share/icons/hicolor/16x16/apps/konsolekalendar.png
@ -755,6 +879,7 @@ share/icons/hicolor/22x22/apps/akonadiconsole.png
 share/icons/hicolor/22x22/apps/akregator.png
 share/icons/hicolor/22x22/apps/blogilo.png
 share/icons/hicolor/22x22/apps/kaddressbook.png
+share/icons/hicolor/22x22/apps/kalarm.png
 share/icons/hicolor/22x22/apps/kjots.png
 share/icons/hicolor/22x22/apps/kleopatra.png
 share/icons/hicolor/22x22/apps/kmail.png
@ -779,6 +904,7 @@ share/icons/hicolor/32x32/apps/kalarm.png
 share/icons/hicolor/32x32/apps/kjots.png
 share/icons/hicolor/32x32/apps/kleopatra.png
 share/icons/hicolor/32x32/apps/kmail.png
+share/icons/hicolor/32x32/apps/kmailcvt.png
 share/icons/hicolor/32x32/apps/knode.png
 share/icons/hicolor/32x32/apps/knotes.png
 share/icons/hicolor/32x32/apps/konsolekalendar.png
@ -796,6 +922,7 @@ share/icons/hicolor/48x48/apps/kalarm.png
 share/icons/hicolor/48x48/apps/kjots.png
 share/icons/hicolor/48x48/apps/kleopatra.png
 share/icons/hicolor/48x48/apps/kmail.png
+share/icons/hicolor/48x48/apps/kmailcvt.png
 share/icons/hicolor/48x48/apps/knode.png
 share/icons/hicolor/48x48/apps/knotes.png
 share/icons/hicolor/48x48/apps/konsolekalendar.png
@ -810,6 +937,7 @@ share/icons/hicolor/64x64/apps/akonadiconsole.png
 share/icons/hicolor/64x64/apps/akregator.png
 share/icons/hicolor/64x64/apps/blogilo.png
 share/icons/hicolor/64x64/apps/kaddressbook.png
+share/icons/hicolor/64x64/apps/kalarm.png
 share/icons/hicolor/64x64/apps/kjots.png
 share/icons/hicolor/64x64/apps/kleopatra.png
 share/icons/hicolor/64x64/apps/kmail.png
@ -823,6 +951,7 @@ share/icons/hicolor/64x64/apps/korganizer.png
 share/icons/hicolor/64x64/apps/ktimetracker.png
 share/icons/hicolor/scalable/apps/akregator.svgz
 share/icons/hicolor/scalable/apps/kaddressbook.svgz
+share/icons/hicolor/scalable/apps/kalarm.svgz
 share/icons/hicolor/scalable/apps/kjots.svgz
 share/icons/hicolor/scalable/apps/kleopatra.svgz
 share/icons/hicolor/scalable/apps/kmail.svgz
@ -837,35 +966,21 @@ share/icons/locolor/16x16/actions/ktnef_extract_all_to.png
 share/icons/locolor/16x16/actions/ktnef_extract_to.png
 share/icons/locolor/16x16/apps/ktnef.png
 share/icons/locolor/32x32/apps/ktnef.png
-share/icons/oxygen/128x128/apps/kalarm.png
 share/icons/oxygen/128x128/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/16x16/actions/edit-delete-page.png
-share/icons/oxygen/16x16/actions/knotes_alarm.png
-share/icons/oxygen/16x16/actions/knotes_close.png
-share/icons/oxygen/16x16/actions/knotes_date.png
-share/icons/oxygen/16x16/actions/knotes_delete.png
 share/icons/oxygen/16x16/actions/smallclock.png
 share/icons/oxygen/16x16/actions/upindicator.png
-share/icons/oxygen/16x16/apps/kalarm.png
-share/icons/oxygen/16x16/apps/kmailcvt.png
 share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/22x22/actions/checkmark.png
 share/icons/oxygen/22x22/actions/edit-delete-page.png
-share/icons/oxygen/22x22/apps/kalarm.png
 share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/256x256/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/32x32/actions/edit-delete-page.png
-share/icons/oxygen/32x32/apps/kalarm.png
-share/icons/oxygen/32x32/apps/kmailcvt.png
 share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/48x48/actions/edit-delete-page.png
-share/icons/oxygen/48x48/apps/kalarm.png
-share/icons/oxygen/48x48/apps/kmailcvt.png
 share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
 share/icons/oxygen/512x512/mimetypes/x-mail-distribution-list.png
-share/icons/oxygen/64x64/apps/kalarm.png
 share/icons/oxygen/scalable/actions/edit-delete-page.svgz
-share/icons/oxygen/scalable/apps/kalarm.svgz
 share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
 share/kde4/services/ServiceMenus/kmail_addattachmentservicemenu.desktop
 share/kde4/services/akonotes_list.desktop
@ -880,12 +995,14 @@ share/kde4/services/akregator_mk4storage_plugin.desktop
 share/kde4/services/akregator_part.desktop
 share/kde4/services/akregator_sharemicroblog_plugin.desktop
 share/kde4/services/feed.protocol
+share/kde4/services/grammar_link.desktop
 share/kde4/services/kaddressbookpart.desktop
 share/kde4/services/kcm_kpimidentities.desktop
 share/kde4/services/kcmapptsummary.desktop
 share/kde4/services/kcmkmailsummary.desktop
 share/kde4/services/kcmkontactsummary.desktop
 share/kde4/services/kcmldap.desktop
+share/kde4/services/kcmpimactivity.desktop
 share/kde4/services/kcmsdsummary.desktop
 share/kde4/services/kcmtodosummary.desktop
 share/kde4/services/kjots_config_misc.desktop
@ -916,7 +1033,7 @@ share/kde4/services/knote_config_action.desktop
 share/kde4/services/knote_config_display.desktop
 share/kde4/services/knote_config_editor.desktop
 share/kde4/services/knote_config_network.desktop
-share/kde4/services/knote_config_style.desktop
+share/kde4/services/knote_config_print.desktop
 share/kde4/services/kontact/akregatorplugin.desktop
 share/kde4/services/kontact/journalplugin.desktop
 share/kde4/services/kontact/kaddressbookplugin.desktop
@ -976,6 +1093,7 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@dirrmtry share/icons/locolor/16x16/actions
@dirrmtry share/icons/locolor/16x16
@dirrmtry share/icons/locolor
+@dirrm share/doc/HTML/en/pimsettingexporter
@dirrm share/doc/HTML/en/kwatchgnupg
@dirrm share/doc/HTML/en/ktnef
@dirrm share/doc/HTML/en/ktimetracker
@ -985,15 +1103,24 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@dirrm share/doc/HTML/en/konsolekalendar
@dirrm share/doc/HTML/en/knotes
@dirrm share/doc/HTML/en/knode
+@dirrm share/doc/HTML/en/kmailcvt
@dirrm share/doc/HTML/en/kmail
@dirrm share/doc/HTML/en/kleopatra
@dirrm share/doc/HTML/en/kjots
@dirrm share/doc/HTML/en/kioslave/news
@dirrm share/doc/HTML/en/kalarm
@dirrm share/doc/HTML/en/kabcclient
+@dirrm share/doc/HTML/en/importwizard
+@dirrm share/doc/HTML/en/headerthemeeditor
@dirrm share/doc/HTML/en/blogilo
@dirrm share/doc/HTML/en/akregator
+@dirrm share/doc/HTML/en/akonadi_sendlater_agent
+@dirrm share/doc/HTML/en/akonadi_folderarchive_agent
+@dirrm share/doc/HTML/en/akonadi_archivemail_agent
@dirrm share/apps/pimsettingexporter
+@dirrm share/apps/messageviewer/themes/example_fancy
+@dirrm share/apps/messageviewer/themes/example
+@dirrm share/apps/messageviewer/themes
@dirrm share/apps/messageviewer/plugins/bodypartformatter
@dirrm share/apps/messageviewer/plugins
@dirrm share/apps/messageviewer/about
@ -1048,6 +1175,10 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@dirrm share/apps/kontact/ksettingsdialog
@dirrm share/apps/kontact/about
@dirrm share/apps/kontact
+@dirrm share/apps/knotes/print/themes/default
+@dirrm share/apps/knotes/print/themes/big-title
+@dirrm share/apps/knotes/print/themes
+@dirrm share/apps/knotes/print
@dirrm share/apps/knotes
@dirrm share/apps/knode/pics
@dirrm share/apps/knode/filters
@ -1076,17 +1207,24 @@ share/polkit-1/actions/org.kde.kalarmrtcwake.policy
@dirrm share/apps/kalarm
@dirrm share/apps/kaddressbook/viewertemplates/default
@dirrm share/apps/kaddressbook/viewertemplates
+@dirrm share/apps/kaddressbook/printing/themes/default
+@dirrm share/apps/kaddressbook/printing/themes/big-theme-example
+@dirrm share/apps/kaddressbook/printing/themes
@dirrm share/apps/kaddressbook/printing
@dirrm share/apps/kaddressbook
+@dirrm share/apps/headerthemeeditor
+@dirrm share/apps/contactthemeeditor
+@dirrm share/apps/composereditor
@dirrm share/apps/blogilo
@dirrm share/apps/akregator_sharemicroblog_plugin
@dirrmtry share/apps/akregator/pics
@dirrm share/apps/akregator/about
@dirrmtry share/apps/akregator
@dirrmtry share/apps/akonadiconsole
+@dirrm share/apps/akonadi_sendlater_agent
@dirrm share/apps/akonadi_mailfilter_agent
+@dirrm share/apps/akonadi_folderarchive_agent
@dirrm share/apps/akonadi_archivemail_agent
-@dirrmtry share/apps/akonadi/contact
@dirrmtry share/akonadi/agents
@dirrmtry share/akonadi
@dirrmtry lib/kde4/plugins/accessible
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@ -3,10 +3,8 @@

 PORTNAME=	kdepimlibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
-CATEGORIES=	deskutils kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES=	deskutils kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -31,7 +29,6 @@ USE_QT4=	corelib dbus declarative designer_build gui network sql xml \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes

-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/cmake/modules/*.cmake
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdepimlibs-4.10.5.tar.xz) = b9600f2ae1c61d65252ac5046c348f18d586114be3ab54744b0f5925f2881e06
-SIZE (KDE/4.10.5/kdepimlibs-4.10.5.tar.xz) = 2986664
+SHA256 (KDE/4.12.2/kdepimlibs-4.12.2.tar.xz) = e475a40f8e00ce57d7acead85a4e33040cc50dc43962c7ae1b030ddbc4ae47e2
+SIZE (KDE/4.12.2/kdepimlibs-4.12.2.tar.xz) = 2760192
--- a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
+++ b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
@ -1,6 +1,6 @@
--- ./cmake/modules/FindLibical.cmake.orgi	2009-02-27 17:59:51.000000000 +0100
-+++ ./cmake/modules/FindLibical.cmake	2009-02-27 18:00:20.000000000 +0100
-@@ -52,7 +52,7 @@
+--- cmake/modules/FindLibical.cmake.orig	2013-08-10 13:38:51.103327753 +0000
+++ cmake/modules/FindLibical.cmake	2013-08-10 13:40:47.134325441 +0000
+@@ -49,7 +49,7 @@
 
 if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
   set(FIND_LIBICAL_VERSION_SOURCE
--- a/deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake
+++ b/deskutils/kdepimlibs4/files/patch-kcalcore__ConfigureChecks.cmake
@ -1,15 +0,0 @@
--- ./kcalcore/ConfigureChecks.cmake.orig	2010-12-03 15:38:57.478419881 +1000
-+++ ./kcalcore/ConfigureChecks.cmake	2010-12-03 15:59:50.369411055 +1000
-@@ -2,6 +2,11 @@
- include(CheckLibraryExists)
- 
- check_include_files(uuid/uuid.h HAVE_UUID_UUID_H)
-check_library_exists(uuid uuid_generate_random "" HAVE_UUID_LIBRARY)
-+find_library(UUID_LIBRARY uuid)
-+set(UUID_LIBRARY_DIR "")
-+if(UUID_LIBRARY)
-+   get_filename_component(UUID_LIBRARY_DIR ${UUID_LIBRARY} PATH)
-+endif(UUID_LIBRARY)
-+check_library_exists(uuid uuid_generate_random "${UUID_LIBRARY_DIR}" HAVE_UUID_LIBRARY)
- 
- 
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@ -1,3 +1,4 @@
+bin/akonadi2xml
 include/KDE/Akonadi/AgentBase
 include/KDE/Akonadi/AgentFactory
 include/KDE/Akonadi/AgentFilterProxyModel
@ -13,8 +14,21 @@ include/KDE/Akonadi/AgentTypeWidget
 include/KDE/Akonadi/Attribute
 include/KDE/Akonadi/AttributeFactory
 include/KDE/Akonadi/CachePolicy
+include/KDE/Akonadi/Calendar/BlockAlarmsAttribute
+include/KDE/Akonadi/Calendar/CalendarBase
+include/KDE/Akonadi/Calendar/CalendarClipboard
+include/KDE/Akonadi/Calendar/CalendarSettings
+include/KDE/Akonadi/Calendar/ETMCalendar
+include/KDE/Akonadi/Calendar/FetchJobCalendar
+include/KDE/Akonadi/Calendar/FreeBusyManager
 include/KDE/Akonadi/Calendar/FreeBusyProviderBase
+include/KDE/Akonadi/Calendar/History
+include/KDE/Akonadi/Calendar/ICalImporter
+include/KDE/Akonadi/Calendar/ITIPHandler
+include/KDE/Akonadi/Calendar/IncidenceChanger
+include/KDE/Akonadi/Calendar/PublishDialog
 include/KDE/Akonadi/Calendar/StandardCalendarActionManager
+include/KDE/Akonadi/Calendar/TodoPurger
 include/KDE/Akonadi/ChangeRecorder
 include/KDE/Akonadi/Collection
 include/KDE/Akonadi/CollectionAttributesSynchronizationJob
@ -100,10 +114,12 @@ include/KDE/Akonadi/KMime/MessageThreaderProxyModel
 include/KDE/Akonadi/KMime/MessageThreadingAttribute
 include/KDE/Akonadi/KMime/RemoveDuplicatesJob
 include/KDE/Akonadi/KMime/SpecialMailCollections
+include/KDE/Akonadi/KMime/SpecialMailCollectionsDiscoveryJob
 include/KDE/Akonadi/KMime/SpecialMailCollectionsRequestJob
 include/KDE/Akonadi/LinkJob
 include/KDE/Akonadi/MimeTypeChecker
 include/KDE/Akonadi/Monitor
+include/KDE/Akonadi/Notes/NoteUtils
 include/KDE/Akonadi/PreprocessorBase
 include/KDE/Akonadi/RecursiveCollectionFilterProxyModel
 include/KDE/Akonadi/RecursiveItemFetchJob
@ -249,6 +265,7 @@ include/KDE/KCalCore/Incidence
 include/KDE/KCalCore/IncidenceBase
 include/KDE/KCalCore/Journal
 include/KDE/KCalCore/MemoryCalendar
+include/KDE/KCalCore/OccurrenceIterator
 include/KDE/KCalCore/Period
 include/KDE/KCalCore/Person
 include/KDE/KCalCore/Recurrence
@ -351,11 +368,15 @@ include/KDE/KPIMTextEdit/InsertImageDialog
 include/KDE/KPIMTextEdit/InsertImageWidget
 include/KDE/KPIMTextEdit/InsertTableDialog
 include/KDE/KPIMTextEdit/InsertTableWidget
+include/KDE/KPIMTextEdit/SelectSpecialChar
+include/KDE/KPIMTextEdit/TableCellFormatDialog
 include/KDE/KPIMTextEdit/TableFormatDialog
 include/KDE/KPIMTextEdit/TextEdit
 include/KDE/KPIMUtils/Email
 include/KDE/KPIMUtils/KFileIO
 include/KDE/KPIMUtils/LinkLocator
+include/KDE/KPIMUtils/ProgressIndicatorLabel
+include/KDE/KPIMUtils/ProgressIndicatorWidget
 include/KDE/KPIMUtils/SpellingFilter
 include/KDE/KResources/ConfigDialog
 include/KDE/KResources/ConfigPage
@ -440,8 +461,21 @@ include/akonadi/attributefactory.h
 include/akonadi/cachepolicy.h
 include/akonadi/cachepolicypage.h
 include/akonadi/calendar/akonadi-calendar_export.h
+include/akonadi/calendar/blockalarmsattribute.h
+include/akonadi/calendar/calendarbase.h
+include/akonadi/calendar/calendarclipboard.h
+include/akonadi/calendar/calendarsettings.h
+include/akonadi/calendar/etmcalendar.h
+include/akonadi/calendar/fetchjobcalendar.h
+include/akonadi/calendar/freebusymanager.h
 include/akonadi/calendar/freebusyproviderbase.h
+include/akonadi/calendar/history.h
+include/akonadi/calendar/icalimporter.h
+include/akonadi/calendar/incidencechanger.h
+include/akonadi/calendar/itiphandler.h
+include/akonadi/calendar/publishdialog.h
 include/akonadi/calendar/standardcalendaractionmanager.h
+include/akonadi/calendar/todopurger.h
 include/akonadi/changerecorder.h
 include/akonadi/collection.h
 include/akonadi/collectionattributessynchronizationjob.h
@ -456,6 +490,7 @@ include/akonadi/collectionfilterproxymodel.h
 include/akonadi/collectionmodel.h
 include/akonadi/collectionmodifyjob.h
 include/akonadi/collectionmovejob.h
+include/akonadi/collectionpathresolver_p.h
 include/akonadi/collectionpropertiesdialog.h
 include/akonadi/collectionpropertiespage.h
 include/akonadi/collectionquotaattribute.h
@ -487,6 +522,7 @@ include/akonadi/contact/contactviewerdialog.h
 include/akonadi/contact/emailaddressselection.h
 include/akonadi/contact/emailaddressselectiondialog.h
 include/akonadi/contact/emailaddressselectionwidget.h
+include/akonadi/contact/improtocols.h
 include/akonadi/contact/recentcontactscollectionrequestjob.h
 include/akonadi/contact/standardcontactactionmanager.h
 include/akonadi/contact/standardcontactformatter.h
@ -508,6 +544,7 @@ include/akonadi/entitytreeviewstatesaver.h
 include/akonadi/etmviewstatesaver.h
 include/akonadi/exception.h
 include/akonadi/favoritecollectionsmodel.h
+include/akonadi/gidextractorinterface.h
 include/akonadi/indexpolicyattribute.h
 include/akonadi/item.h
 include/akonadi/itemcopyjob.h
@ -541,6 +578,7 @@ include/akonadi/kmime/messagethreaderproxymodel.h
 include/akonadi/kmime/messagethreadingattribute.h
 include/akonadi/kmime/removeduplicatesjob.h
 include/akonadi/kmime/specialmailcollections.h
+include/akonadi/kmime/specialmailcollectionsdiscoveryjob.h
 include/akonadi/kmime/specialmailcollectionsrequestjob.h
 include/akonadi/kmime/standardmailactionmanager.h
 include/akonadi/linkjob.h
@ -568,6 +606,7 @@ include/akonadi/socialutils/libakonadisocialutils_export.h
 include/akonadi/socialutils/socialfeeditem.h
 include/akonadi/socialutils/socialnetworkattributes.h
 include/akonadi/specialcollections.h
+include/akonadi/specialcollectionsdiscoveryjob.h
 include/akonadi/specialcollectionsrequestjob.h
 include/akonadi/standardactionmanager.h
 include/akonadi/statisticsproxymodel.h
@ -579,6 +618,11 @@ include/akonadi/trashjob.h
 include/akonadi/trashrestorejob.h
 include/akonadi/trashsettings.h
 include/akonadi/unlinkjob.h
+include/akonadi/xml/akonadi-xml_export.h
+include/akonadi/xml/xmldocument.h
+include/akonadi/xml/xmlreader.h
+include/akonadi/xml/xmlwritejob.h
+include/akonadi/xml/xmlwriter.h
 include/gpgme++/assuanresult.h
 include/gpgme++/configuration.h
 include/gpgme++/context.h
@ -753,6 +797,7 @@ include/kcalcore/incidencebase.h
 include/kcalcore/journal.h
 include/kcalcore/kcalcore_export.h
 include/kcalcore/memorycalendar.h
+include/kcalcore/occurrenceiterator.h
 include/kcalcore/period.h
 include/kcalcore/person.h
 include/kcalcore/recurrence.h
@ -873,6 +918,8 @@ include/kpimtextedit/insertimagedialog.h
 include/kpimtextedit/insertimagewidget.h
 include/kpimtextedit/inserttabledialog.h
 include/kpimtextedit/kpimtextedit_export.h
+include/kpimtextedit/selectspecialchar.h
+include/kpimtextedit/tablecellformatdialog.h
 include/kpimtextedit/tableformatdialog.h
 include/kpimtextedit/textedit.h
 include/kpimtextedit/textutils.h
@ -883,6 +930,8 @@ include/kpimutils/kpimutils_export.h
 include/kpimutils/linklocator.h
 include/kpimutils/networkaccesshelper.h
 include/kpimutils/processes.h
+include/kpimutils/progressindicatorlabel.h
+include/kpimutils/progressindicatorwidget.h
 include/kpimutils/spellingfilter.h
 include/kpimutils/supertrait.h
 include/kresources/configdialog.h
@ -890,6 +939,7 @@ include/kresources/configpage.h
 include/kresources/configwidget.h
 include/kresources/factory.h
 include/kresources/idmapper.h
+include/kresources/kcmkresources_export.h
 include/kresources/kresources_export.h
 include/kresources/manager.h
 include/kresources/managerimpl.h
@ -1022,31 +1072,35 @@ lib/kde4/kio_nntp.so
 lib/kde4/kio_pop3.so
 lib/kde4/kio_sieve.so
 lib/kde4/kio_smtp.so
+lib/kde4/plugins/designer/akonadiwidgets.so
 lib/kde4/plugins/designer/kholidayswidgets.so
 lib/libakonadi-calendar.so
-lib/libakonadi-calendar.so.5
-lib/libakonadi-calendar.so.5.0.1
+lib/libakonadi-calendar.so.4
+lib/libakonadi-calendar.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libakonadi-contact.so
-lib/libakonadi-contact.so.5
-lib/libakonadi-contact.so.5.0.1
+lib/libakonadi-contact.so.4
+lib/libakonadi-contact.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libakonadi-kabc.so
-lib/libakonadi-kabc.so.5
-lib/libakonadi-kabc.so.5.0.1
+lib/libakonadi-kabc.so.4
+lib/libakonadi-kabc.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libakonadi-kcal.so
-lib/libakonadi-kcal.so.5
-lib/libakonadi-kcal.so.5.0.1
+lib/libakonadi-kcal.so.4
+lib/libakonadi-kcal.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libakonadi-kde.so
-lib/libakonadi-kde.so.5
-lib/libakonadi-kde.so.5.0.1
+lib/libakonadi-kde.so.4
+lib/libakonadi-kde.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libakonadi-kmime.so
-lib/libakonadi-kmime.so.5
-lib/libakonadi-kmime.so.5.0.1
+lib/libakonadi-kmime.so.4
+lib/libakonadi-kmime.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libakonadi-notes.so
-lib/libakonadi-notes.so.5
-lib/libakonadi-notes.so.5.0.1
+lib/libakonadi-notes.so.4
+lib/libakonadi-notes.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libakonadi-socialutils.so
-lib/libakonadi-socialutils.so.5
-lib/libakonadi-socialutils.so.5.0.1
+lib/libakonadi-socialutils.so.4
+lib/libakonadi-socialutils.so.%%KDE4_GENERIC_LIB_VERSION%%
+lib/libakonadi-xml.so
+lib/libakonadi-xml.so.4
+lib/libakonadi-xml.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libgpgme++-pthread.so
 lib/libgpgme++-pthread.so.2
 lib/libgpgme++-pthread.so.2.8.0
@ -1054,75 +1108,76 @@ lib/libgpgme++.so
 lib/libgpgme++.so.2
 lib/libgpgme++.so.2.8.0
 lib/libkabc.so
-lib/libkabc.so.5
-lib/libkabc.so.5.0.1
+lib/libkabc.so.4
+lib/libkabc.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkabc_file_core.so
-lib/libkabc_file_core.so.5
-lib/libkabc_file_core.so.5.0.1
+lib/libkabc_file_core.so.4
+lib/libkabc_file_core.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkalarmcal.so
 lib/libkalarmcal.so.2
 lib/libkalarmcal.so.2.7.0
 lib/libkblog.so
-lib/libkblog.so.5
-lib/libkblog.so.5.0.1
+lib/libkblog.so.4
+lib/libkblog.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkcal.so
-lib/libkcal.so.5
-lib/libkcal.so.5.0.1
+lib/libkcal.so.4
+lib/libkcal.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkcalcore.so
-lib/libkcalcore.so.5
-lib/libkcalcore.so.5.0.1
+lib/libkcalcore.so.4
+lib/libkcalcore.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkcalutils.so
-lib/libkcalutils.so.5
-lib/libkcalutils.so.5.0.1
+lib/libkcalutils.so.4
+lib/libkcalutils.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkholidays.so
-lib/libkholidays.so.5
-lib/libkholidays.so.5.0.1
+lib/libkholidays.so.4
+lib/libkholidays.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkimap.so
-lib/libkimap.so.5
-lib/libkimap.so.5.0.1
+lib/libkimap.so.4
+lib/libkimap.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkldap.so
-lib/libkldap.so.5
-lib/libkldap.so.5.0.1
+lib/libkldap.so.4
+lib/libkldap.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkmbox.so
-lib/libkmbox.so.5
-lib/libkmbox.so.5.0.1
+lib/libkmbox.so.4
+lib/libkmbox.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkmime.so
-lib/libkmime.so.5
-lib/libkmime.so.5.0.1
+lib/libkmime.so.4
+lib/libkmime.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkontactinterface.so
-lib/libkontactinterface.so.5
-lib/libkontactinterface.so.5.0.1
+lib/libkontactinterface.so.4
+lib/libkontactinterface.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkpimidentities.so
-lib/libkpimidentities.so.5
-lib/libkpimidentities.so.5.0.1
+lib/libkpimidentities.so.4
+lib/libkpimidentities.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkpimtextedit.so
-lib/libkpimtextedit.so.5
-lib/libkpimtextedit.so.5.0.1
+lib/libkpimtextedit.so.4
+lib/libkpimtextedit.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkpimutils.so
-lib/libkpimutils.so.5
-lib/libkpimutils.so.5.0.1
+lib/libkpimutils.so.4
+lib/libkpimutils.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkresources.so
-lib/libkresources.so.5
-lib/libkresources.so.5.0.1
+lib/libkresources.so.4
+lib/libkresources.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libktnef.so
-lib/libktnef.so.5
-lib/libktnef.so.5.0.1
+lib/libktnef.so.4
+lib/libktnef.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkxmlrpcclient.so
-lib/libkxmlrpcclient.so.5
-lib/libkxmlrpcclient.so.5.0.1
+lib/libkxmlrpcclient.so.4
+lib/libkxmlrpcclient.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmailtransport.so
-lib/libmailtransport.so.5
-lib/libmailtransport.so.5.0.1
+lib/libmailtransport.so.4
+lib/libmailtransport.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libmicroblog.so
-lib/libmicroblog.so.5
-lib/libmicroblog.so.5.0.1
+lib/libmicroblog.so.4
+lib/libmicroblog.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libqgpgme.so
 lib/libqgpgme.so.1
 lib/libqgpgme.so.1.0.1
 lib/libsyndication.so
-lib/libsyndication.so.5
-lib/libsyndication.so.5.0.1
+lib/libsyndication.so.4
+lib/libsyndication.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/apps/akonadi-kde/kcfg2dbus.xsl
+share/apps/akonadi/akonadi-xml.xsd
 share/apps/akonadi/contact/data/zone.tab
 share/apps/akonadi/contact/icons/oxygen/16x16/apps/aim_protocol.png
 share/apps/akonadi/contact/icons/oxygen/16x16/apps/gadu_protocol.png
@ -1137,6 +1192,7 @@ share/apps/akonadi/contact/icons/oxygen/16x16/apps/sms_protocol.png
 share/apps/akonadi/contact/icons/oxygen/16x16/apps/yahoo_protocol.png
 share/apps/akonadi/contact/pics/world.jpg
 share/apps/akonadi/plugins/serializer/akonadi_serializer_socialfeeditem.desktop
+share/apps/cmake/modules/AkonadiMacros.cmake
 share/apps/cmake/modules/CheckTimezone.cmake
 share/apps/cmake/modules/FindGpgme.cmake
 share/apps/cmake/modules/FindLdap.cmake
@ -1158,6 +1214,10 @@ share/apps/libkholidays/plan2/holiday_au-sa_en-gb
 share/apps/libkholidays/plan2/holiday_au-tas_en-gb
 share/apps/libkholidays/plan2/holiday_au-vic_en-gb
 share/apps/libkholidays/plan2/holiday_au-wa_en-gb
+share/apps/libkholidays/plan2/holiday_ba-srp_sr
+share/apps/libkholidays/plan2/holiday_ba-srp_sr@ijekavian
+share/apps/libkholidays/plan2/holiday_ba-srp_sr@ijekavianlatin
+share/apps/libkholidays/plan2/holiday_ba-srp_sr@latin
 share/apps/libkholidays/plan2/holiday_be_fr
 share/apps/libkholidays/plan2/holiday_be_nl
 share/apps/libkholidays/plan2/holiday_be_wa
@ -1239,6 +1299,9 @@ share/apps/libkholidays/plan2/holiday_py_es
 share/apps/libkholidays/plan2/holiday_re_fr
 share/apps/libkholidays/plan2/holiday_ro_ro
 share/apps/libkholidays/plan2/holiday_rs_sr
+share/apps/libkholidays/plan2/holiday_rs_sr@ijekavian
+share/apps/libkholidays/plan2/holiday_rs_sr@ijekavianlatin
+share/apps/libkholidays/plan2/holiday_rs_sr@latin
 share/apps/libkholidays/plan2/holiday_ru_ru
 share/apps/libkholidays/plan2/holiday_se_sv
 share/apps/libkholidays/plan2/holiday_sg_en-gb
@ -1322,10 +1385,8 @@ share/kde4/servicetypes/kaddressbookimprotocol.desktop
 share/kde4/servicetypes/kontactplugin.desktop
 share/kde4/servicetypes/kresources_manager.desktop
 share/kde4/servicetypes/kresources_plugin.desktop
-share/mime/application/x-vnd.kde.contactgroup.xml
 share/mime/packages/kdepimlibs-mime.xml
 share/mime/packages/x-vnd.akonadi.socialfeeditem.xml
-share/mime/text/x-vnd.akonadi.socialfeeditem.xml
@dirrm share/kde4/services/akonadi/contact
@dirrmtry share/kde4/services/akonadi
@dirrm share/doc/HTML/en/kioslave/smtp
@ -1379,6 +1440,7 @@ share/mime/text/x-vnd.akonadi.socialfeeditem.xml
@dirrm include/kabc
@dirrm include/gpgme++/interfaces
@dirrm include/gpgme++
+@dirrm include/akonadi/xml
@dirrmtry include/akonadi/socialutils
@dirrmtry include/akonadi/private
@dirrm include/akonadi/notes
@ -1407,6 +1469,7 @@ share/mime/text/x-vnd.akonadi.socialfeeditem.xml
@dirrm include/KDE/KAlarmCal
@dirrm include/KDE/KABC
@dirrm include/KDE/Akonadi/SocialUtils
+@dirrm include/KDE/Akonadi/Notes
@dirrm include/KDE/Akonadi/KMime
@dirrm include/KDE/Akonadi/KCal
@dirrm include/KDE/Akonadi/Contact
--- a/deskutils/kdeplasma-addons/Makefile
+++ b/deskutils/kdeplasma-addons/Makefile
@ -2,10 +2,8 @@

 PORTNAME=	kdeplasma-addons
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
-CATEGORIES=	deskutils kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+CATEGORIES=	deskutils kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
@ -16,7 +14,6 @@ LIB_DEPENDS=	libqalculate.so:${PORTSDIR}/math/libqalculate \
 		libqca.so:${PORTSDIR}/devel/qca \
 		libqoauth.so:${PORTSDIR}/net/qoauth \
 		libqjson.so:${PORTSDIR}/devel/qjson
-
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2

 CONFLICTS_INSTALL=	plasma-applet-icontasks-0.[89].*
@ -30,45 +27,24 @@ USE_QT4=	corelib dbus declarative gui network script sql webkit \
 USE_XORG=	x11 xrender xtst
 USE_LDCONFIG=	yes

-OPTIONS_DEFINE=	MARBLE SCIM # IBUS
+OPTIONS_DEFINE=	MARBLE SCIM IBUS
 OPTIONS_DEFAULT=	MARBLE
+OPTIONS_SUB=	yes

 MARBLE_DESC=	Support for desktop globe wallpaper
+MARBLE_USE=	KDE4=marble
+MARBLE_CMAKE_OFF=	-DWITH_Marble=off
+
 IBUS_DESC=	Enable IBUS backend for input dialog
+IBUS_LIB_DEPENDS=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
+IBUS_CMAKE_OFF=	-DBUILD_ibus=off
+
 SCIM_DESC=	Enable SCIM backend for input dialog
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMARBLE}
-USE_KDE4+=	marble
-PLIST_SUB+=	MARBLE=""
-.else
-CMAKE_ARGS+=	-DWITH_Marble:BOOL=FALSE
-PLIST_SUB+=	MARBLE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MIBUS}
-IGNORE=		requires ibus version 1.4.2 or greater
-LIB_DEPENDS+=	libibus-1.0.so:${PORTSDIR}/textproc/ibus
-PLIST_SUB+=	IBUS=""
-.else
-CMAKE_ARGS+=	-DBUILD_ibus=off
-PLIST_SUB+=	IBUS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSCIM}
-LIB_DEPENDS+=	libscim-1.0.so:${PORTSDIR}/textproc/scim
-PLIST_SUB+=	SCIM=""
-.else
-CMAKE_ARGS+=	-DBUILD_scim=off
-PLIST_SUB+=	SCIM="@comment "
-.endif
+SCIM_LIB_DEPENDS=	libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_CMAKE_OFF=	-DBUILD_scim=off

 post-patch:
-	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
-		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
-	# Respect prefix, don't update MIME when installing.
+# Respect prefix, don't update MIME when installing.
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
 		${WRKSRC}/applets/lancelot/parts/CMakeLists.txt

--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdeplasma-addons-4.10.5.tar.xz) = f76fac6b5c2c67c63efc9eea58b829f07f998405ab5e74f4a489b2475e5d4943
-SIZE (KDE/4.10.5/kdeplasma-addons-4.10.5.tar.xz) = 1791872
+SHA256 (KDE/4.12.2/kdeplasma-addons-4.12.2.tar.xz) = 1d547d1a203f3e025241e1a57b2cf0a2239b2ed08ffb72700c1b28d0ce86dab8
+SIZE (KDE/4.12.2/kdeplasma-addons-4.12.2.tar.xz) = 1758332
--- a/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
+++ b/deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
@ -1,5 +1,5 @@
--- ./CMakeLists.txt.orig	2011-05-21 07:37:49.000000000 +1100
-+++ ./CMakeLists.txt	2011-08-15 14:56:28.177306481 +1100
+--- CMakeLists.txt.orig	2013-08-14 12:32:08.088461763 +0000
+++ CMakeLists.txt	2013-08-14 12:33:12.856460461 +0000
@@ -36,17 +36,21 @@
 endif (DEPEND_PACKAGE_Marble)
 macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.")
--- a/deskutils/kdeplasma-addons/files/qt3to4headers.txt
+++ b/deskutils/kdeplasma-addons/files/qt3to4headers.txt
@ -1,46 +0,0 @@
-s/<q3dragobject.h>/<Q3DragObject>/g
-s/<q3frame.h>/<Q3Frame>/g
-s/<q3groupbox.h>/<Q3GroupBox>/g
-s/<q3hgroupbox.h>/<Q3HGroupBox>/g
-s/<q3listview.h>/<Q3ListView>/g
-s/<q3popupmenu.h>/<Q3PopupMenu>/g
-s/<q3process.h>/<Q3Process>/g
-s/<q3progressdialog.h>/<Q3ProgressDialog>/g
-s/<q3strlist.h>/<Q3StrList>/g
-s/<q3textview.h>/<Q3TextView>/g
-s/<q3vbox.h>/<Q3VBox>/g
-s/<q3vgroupbox.h>/<Q3VGroupBox>/g
-s/<qapplication.h>/<QApplication>/g
-s/<qbuttongroup.h>/<QButtonGroup>/g
-s/<qcheckbox.h>/<QCheckBox>/g
-s/<qcolor.h>/<QColor>/g
-s/<qcombobox.h>/<QComboBox>/g
-s/<qcursor.h>/<QCursor>/g
-s/<qdesktopwidget.h>/<QDesktopWidget>/g
-s/<qdir.h>/<QDir>/g
-s/<qevent.h>/<QEvent>/g
-s/<qfile.h>/<QFile>/g
-s/<qfileinfo.h>/<QFileInfo>/g
-s/<qfont.h>/<QFont>/g
-s/<qfontmetrics.h>/<QFontMetrics>/g
-s/<qgroupbox.h>/<QGroupBox>/g
-s/<qimage.h>/<QImage>/g
-s/<qlabel.h>/<QLabel>/g
-s/<qlayout.h>/<QLayout>/g
-s/<qlineedit.h>/<QLineEdit>/g
-s/<qmatrix.h>/<QMatrix>/g
-s/<qobject.h>/<QObject>/g
-s/<qpainter.h>/<QPainter>/g
-s/<qpalette.h>/<QPalette>/g
-s/<qpixmap.h>/<QPixmap>/g
-s/<qpointer.h>/<QPointer>/g
-s/<qpushbutton.h>/<QPushButton>/g
-s/<qradiobutton.h>/<QRadioButton>/g
-s/<qregexp.h>/<QRegExp>/g
-s/<qspinbox.h>/<QSpinBox>/g
-s/<qstring.h>/<QString>/g
-s/<qtextcodec.h>/<QTextCodec>/g
-s/<qtextstream.h>/<QTextStream>/g
-s/<qtimer.h>/<QTimer>/g
-s/<qtooltip.h>/<QToolTip>/g
-s/<qwidget.h>/<QWidget>/g
--- a/deskutils/kdeplasma-addons/pkg-plist
+++ b/deskutils/kdeplasma-addons/pkg-plist
@ -111,6 +111,7 @@ lib/kde4/krunner_konsolesessions.so
 lib/kde4/krunner_kopete.so
 lib/kde4/krunner_mediawiki.so
 lib/kde4/krunner_spellcheckrunner.so
+lib/kde4/krunner_translator.so
 lib/kde4/krunner_youtube.so
 %%IBUS%%lib/kde4/libexec/kimpanel-ibus-panel
 %%SCIM%%lib/kde4/libexec/kimpanel-scim-panel
@ -178,6 +179,7 @@ lib/kde4/plasma_packagestructure_comic.so
 lib/kde4/plasma_potd_apodprovider.so
 lib/kde4/plasma_potd_epodprovider.so
 lib/kde4/plasma_potd_flickrprovider.so
+lib/kde4/plasma_potd_natgeoprovider.so
 lib/kde4/plasma_potd_oseiprovider.so
 lib/kde4/plasma_potd_wcpotdprovider.so
 lib/kde4/plasma_runner_datetime.so
@ -196,8 +198,8 @@ lib/liblancelot.so
 lib/liblancelot.so.1.9.0
 lib/liblancelot.so.2
 lib/libplasma_groupingcontainment.so
-lib/libplasma_groupingcontainment.so.5
-lib/libplasma_groupingcontainment.so.5.0.1
+lib/libplasma_groupingcontainment.so.4
+lib/libplasma_groupingcontainment.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libplasmacomicprovidercore.so
 lib/libplasmacomicprovidercore.so.1
 lib/libplasmacomicprovidercore.so.1.0.0
@ -205,11 +207,11 @@ lib/libplasmapotdprovidercore.so
 lib/libplasmapotdprovidercore.so.1
 lib/libplasmapotdprovidercore.so.1.0.0
 lib/libplasmaweather.so
-lib/libplasmaweather.so.5
-lib/libplasmaweather.so.5.0.1
+lib/libplasmaweather.so.4
+lib/libplasmaweather.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/librtm.so
-lib/librtm.so.5
-lib/librtm.so.5.0.1
+lib/librtm.so.4
+lib/librtm.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/apps/bball/bball.svgz
 share/apps/bball/bounce.ogg
 share/apps/bball/football.svgz
@ -362,7 +364,7 @@ share/apps/plasma/plasmoids/konsoleprofiles/contents/ui/konsoleprofiles.qml
 share/apps/plasma/plasmoids/konsoleprofiles/metadata.desktop
 share/apps/plasma/plasmoids/nowplaying/contents/code/service.js
 share/apps/plasma/plasmoids/nowplaying/contents/config/main.xml
-share/apps/plasma/plasmoids/nowplaying/contents/images/nocover.svgz
+share/apps/plasma/plasmoids/nowplaying/contents/theme/nowplaying/nocover.svgz
 share/apps/plasma/plasmoids/nowplaying/contents/ui/AlbumArt.qml
 share/apps/plasma/plasmoids/nowplaying/contents/ui/CompactLayout.qml
 share/apps/plasma/plasmoids/nowplaying/contents/ui/Controls.qml
@ -452,7 +454,7 @@ share/icons/hicolor/128x128/apps/luna.png
 share/icons/hicolor/128x128/apps/plasmaapplet-shelf.png
 share/icons/hicolor/128x128/apps/previewer.png
 share/icons/hicolor/128x128/apps/qalculate-applet.png
-share/icons/hicolor/16x16/actions/youtube.png
+share/icons/hicolor/16x16/actions/krunner_youtube.png
 share/icons/hicolor/16x16/apps/bball.png
 share/icons/hicolor/16x16/apps/eyes.png
 share/icons/hicolor/16x16/apps/kdeobservatory.png
@ -462,7 +464,7 @@ share/icons/hicolor/16x16/apps/lifegame.png
 share/icons/hicolor/16x16/apps/luna.png
 share/icons/hicolor/16x16/apps/plasmaapplet-shelf.png
 share/icons/hicolor/16x16/apps/previewer.png
-share/icons/hicolor/22x22/actions/youtube.png
+share/icons/hicolor/22x22/actions/krunner_youtube.png
 share/icons/hicolor/22x22/apps/eyes.png
 share/icons/hicolor/22x22/apps/kdeobservatory.png
 share/icons/hicolor/22x22/apps/lancelot-start.png
@ -473,7 +475,7 @@ share/icons/hicolor/22x22/apps/plasmaapplet-shelf.png
 share/icons/hicolor/22x22/apps/previewer.png
 share/icons/hicolor/256x256/apps/eyes.png
 share/icons/hicolor/256x256/apps/lifegame.png
-share/icons/hicolor/32x32/actions/youtube.png
+share/icons/hicolor/32x32/actions/krunner_youtube.png
 share/icons/hicolor/32x32/apps/bball.png
 share/icons/hicolor/32x32/apps/kdeobservatory.png
 share/icons/hicolor/32x32/apps/lancelot-start.png
@ -482,7 +484,7 @@ share/icons/hicolor/32x32/apps/lifegame.png
 share/icons/hicolor/32x32/apps/luna.png
 share/icons/hicolor/32x32/apps/plasmaapplet-shelf.png
 share/icons/hicolor/32x32/apps/previewer.png
-share/icons/hicolor/48x48/actions/youtube.png
+share/icons/hicolor/48x48/actions/krunner_youtube.png
 share/icons/hicolor/48x48/apps/bball.png
 share/icons/hicolor/48x48/apps/kdeobservatory.png
 share/icons/hicolor/48x48/apps/lancelot-start.png
@ -492,7 +494,7 @@ share/icons/hicolor/48x48/apps/luna.png
 share/icons/hicolor/48x48/apps/plasmaapplet-shelf.png
 share/icons/hicolor/48x48/apps/previewer.png
 share/icons/hicolor/48x48/apps/qalculate-applet.png
-share/icons/hicolor/64x64/actions/youtube.png
+share/icons/hicolor/64x64/actions/krunner_youtube.png
 share/icons/hicolor/64x64/apps/bball.png
 share/icons/hicolor/64x64/apps/eyes.png
 share/icons/hicolor/64x64/apps/kdeobservatory.png
@ -502,7 +504,7 @@ share/icons/hicolor/64x64/apps/lifegame.png
 share/icons/hicolor/64x64/apps/luna.png
 share/icons/hicolor/64x64/apps/plasmaapplet-shelf.png
 share/icons/hicolor/64x64/apps/previewer.png
-share/icons/hicolor/scalable/actions/youtube.svgz
+share/icons/hicolor/scalable/actions/krunner_youtube.svgz
 share/icons/hicolor/scalable/apps/accessories-dictionary.svgz
 share/icons/hicolor/scalable/apps/bball.svgz
 share/icons/hicolor/scalable/apps/eyes.svgz
@ -520,6 +522,7 @@ share/kde4/services/katesessions.desktop
 share/kde4/services/konquerorsessions.desktop
 share/kde4/services/konsolesessions.desktop
 share/kde4/services/lancelot.desktop
+share/kde4/services/natgeoprovider.desktop
 share/kde4/services/oseiprovider.desktop
 share/kde4/services/plasma-applet-bball.desktop
 share/kde4/services/plasma-applet-binaryclock.desktop
@ -597,6 +600,7 @@ share/kde4/services/plasma-runner-kopete.desktop
 share/kde4/services/plasma-runner-spellchecker.desktop
 share/kde4/services/plasma-runner-spellchecker_config.desktop
 share/kde4/services/plasma-runner-techbase.desktop
+share/kde4/services/plasma-runner-translator.desktop
 share/kde4/services/plasma-runner-wikipedia.desktop
 share/kde4/services/plasma-runner-wikitravel.desktop
 share/kde4/services/plasma-runner-youtube.desktop
@ -628,7 +632,8 @@ share/mime/packages/lancelotpart-mime.xml
@dirrm share/apps/plasma/wallpapers/org.kde.animals
@dirrm share/apps/plasma/wallpapers
@dirrm share/apps/plasma/plasmoids/nowplaying/contents/ui
-@dirrm share/apps/plasma/plasmoids/nowplaying/contents/images
+@dirrm share/apps/plasma/plasmoids/nowplaying/contents/theme/nowplaying
+@dirrm share/apps/plasma/plasmoids/nowplaying/contents/theme
@dirrm share/apps/plasma/plasmoids/nowplaying/contents/config
@dirrm share/apps/plasma/plasmoids/nowplaying/contents/code
@dirrm share/apps/plasma/plasmoids/nowplaying/contents
--- a/deskutils/kruler/Makefile
+++ b/deskutils/kruler/Makefile
@ -3,20 +3,16 @@
 PORTNAME=	kruler
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 screen ruler

-CONFLICTS=	kdegraphics-4.[0-6].*
-
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_XORG=	x11
 USE_XZ=		yes

-NO_STAGE=	yes
 .include <bsd.port.mk>
--- a/deskutils/kruler/distinfo
+++ b/deskutils/kruler/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kruler-4.10.5.tar.xz) = 9d1833803d94f10ffcd18a72e89c66a6a588e6fa4f1e6cae5d051c8826f09e3f
-SIZE (KDE/4.10.5/kruler-4.10.5.tar.xz) = 134516
+SHA256 (KDE/4.12.2/kruler-4.12.2.tar.xz) = ea0f95149ca1bc21eb16b0aeeb80676d18a05964888c153ad9e5b1635e18ffe0
+SIZE (KDE/4.12.2/kruler-4.12.2.tar.xz) = 128560
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@ -3,21 +3,17 @@
 PORTNAME=	superkaramba
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	deskutils kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Widget framework for KDE

-CONFLICTS=	kdeutils-4.[0-7].*
-
 USE_XZ=		yes
-USE_PYTHON=	yes
+USE_PYTHON=	2
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4 qimageblitz
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes

-NO_STAGE=	yes
 .include <bsd.port.mk>
--- a/deskutils/superkaramba/distinfo
+++ b/deskutils/superkaramba/distinfo
@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/superkaramba-4.10.5.tar.xz) = a21f1dce36f35aea4d9f64578da75459048986ea83a76e87afd03c658a41ab6f
-SIZE (KDE/4.10.5/superkaramba-4.10.5.tar.xz) = 391704
+SHA256 (KDE/4.12.2/superkaramba-4.12.2.tar.xz) = 3695fbdabd4c2dcf33e0f6d04a0cca6cb9d58a2e81b3744b3c9f7ca77e41fdd8
+SIZE (KDE/4.12.2/superkaramba-4.12.2.tar.xz) = 383964
--- a/deskutils/superkaramba/pkg-plist
+++ b/deskutils/superkaramba/pkg-plist
@ -2,8 +2,8 @@ bin/superkaramba
 lib/kde4/plasma_package_superkaramba.so
 lib/kde4/plasma_scriptengine_superkaramba.so
 lib/libsuperkaramba.so
-lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.1
+lib/libsuperkaramba.so.4
+lib/libsuperkaramba.so.%%KDE4_GENERIC_LIB_VERSION%%
 share/applications/kde4/superkaramba.desktop
 share/apps/superkaramba/superkarambaui.rc
 share/config/superkaramba.knsrc
--- a/devel/Makefile
+++ b/devel/Makefile
@ -195,6 +195,7 @@
    SUBDIR += cdialog
    SUBDIR += cdk
    SUBDIR += cedet
+    SUBDIR += cervisia
    SUBDIR += cflow
    SUBDIR += cflow2vcg
    SUBDIR += cgdb
@ -363,6 +364,7 @@
    SUBDIR += dmalloc
    SUBDIR += dmucs
    SUBDIR += doctorj
+    SUBDIR += dolphin-plugins
    SUBDIR += dotconf
    SUBDIR += dotconf++
    SUBDIR += doxygen
@ -895,11 +897,17 @@
    SUBDIR += jzmq
    SUBDIR += k8048
    SUBDIR += kBuild
+    SUBDIR += kapptemplate
    SUBDIR += kaptain
    SUBDIR += kcachegrind
    SUBDIR += kdbg
+    SUBDIR += kde-dev-scripts
+    SUBDIR += kde-dev-utils
    SUBDIR += kdebindings4
    SUBDIR += kdesdk4
+    SUBDIR += kdesdk4-kioslaves
+    SUBDIR += kdesdk4-strigi-analyzers
+    SUBDIR += kdesdk4-thumbnailers
    SUBDIR += kdesvn-kde4
    SUBDIR += kdevelop-kde4
    SUBDIR += kdevelop-pg-qt
@ -1171,6 +1179,7 @@
    SUBDIR += log4net
    SUBDIR += log4sh
    SUBDIR += log4shib
+    SUBDIR += lokalize
    SUBDIR += loki
    SUBDIR += looks
    SUBDIR += love
@ -1320,6 +1329,7 @@
    SUBDIR += ode
    SUBDIR += ode-devel
    SUBDIR += ois
+    SUBDIR += okteta
    SUBDIR += omake
    SUBDIR += omniNotify
    SUBDIR += omniORB
@ -3405,6 +3415,7 @@
    SUBDIR += poco-ssl
    SUBDIR += popt
    SUBDIR += poslib
+    SUBDIR += poxml
    SUBDIR += premake
    SUBDIR += premake4
    SUBDIR += preps-gui
@ -4533,6 +4544,7 @@
    SUBDIR += ucpp
    SUBDIR += udis86
    SUBDIR += ultragetopt
+    SUBDIR += umbrello
    SUBDIR += umem
    SUBDIR += umlgraph
    SUBDIR += universalindentgui
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	cervisia
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	CVS Frontend for KDE
+
+USE_XZ=		yes
+USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USES=		cmake:outsource
+USE_QT4=	moc_build qmake_build rcc_build uic_build
+
+.include <bsd.port.mk>
--- a/devel/cervisia/distinfo
+++ b/devel/cervisia/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/cervisia-4.12.2.tar.xz) = 52a7cd5df4b9a693f50edcbc9061f172096357c3c391e832884d36d0b7cc3911
+SIZE (KDE/4.12.2/cervisia-4.12.2.tar.xz) = 368472
--- a/devel/cervisia/pkg-descr
+++ b/devel/cervisia/pkg-descr
@ -0,0 +1 @@
+CVS Frontend.
--- a/devel/cervisia/pkg-plist
+++ b/devel/cervisia/pkg-plist
@ -0,0 +1,72 @@
+bin/cervisia
+bin/cvsaskpass
+bin/cvsservice
+lib/kde4/cervisiapart.so
+lib/libkdeinit4_cervisia.so
+lib/libkdeinit4_cvsaskpass.so
+lib/libkdeinit4_cvsservice.so
+man/man1/cervisia.1.gz
+share/applications/kde4/cervisia.desktop
+share/apps/cervisia/cervisia.notifyrc
+share/apps/cervisia/cervisiashellui.rc
+share/apps/cervisiapart/cervisiaui.rc
+share/config.kcfg/cervisiapart.kcfg
+share/dbus-1/interfaces/org.kde.cervisia.cvsjob.xml
+share/dbus-1/interfaces/org.kde.cervisia.cvsloginjob.xml
+share/dbus-1/interfaces/org.kde.cervisia.cvsservice.xml
+share/dbus-1/interfaces/org.kde.cervisia.repository.xml
+share/doc/HTML/en/cervisia/annotate.png
+share/doc/HTML/en/cervisia/checkout.png
+share/doc/HTML/en/cervisia/commit.png
+share/doc/HTML/en/cervisia/common
+share/doc/HTML/en/cervisia/diff.png
+share/doc/HTML/en/cervisia/history.png
+share/doc/HTML/en/cervisia/import.png
+share/doc/HTML/en/cervisia/index.cache.bz2
+share/doc/HTML/en/cervisia/index.docbook
+share/doc/HTML/en/cervisia/logtree.png
+share/doc/HTML/en/cervisia/mainview.png
+share/doc/HTML/en/cervisia/patch.png
+share/doc/HTML/en/cervisia/popup.png
+share/doc/HTML/en/cervisia/repositories.png
+share/doc/HTML/en/cervisia/resolve.png
+share/doc/HTML/en/cervisia/updatetag.png
+share/icons/hicolor/16x16/actions/vcs-add-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-commit-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-diff-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-remove-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-status-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-update-cvs-cervisia.png
+share/icons/hicolor/16x16/apps/cervisia.png
+share/icons/hicolor/22x22/actions/vcs-add-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-commit-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-diff-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-remove-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-status-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-update-cvs-cervisia.png
+share/icons/hicolor/22x22/apps/cervisia.png
+share/icons/hicolor/32x32/actions/vcs-add-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-commit-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-diff-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-remove-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-status-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-update-cvs-cervisia.png
+share/icons/hicolor/32x32/apps/cervisia.png
+share/icons/hicolor/48x48/actions/vcs-add-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-commit-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-diff-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-remove-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-status-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-update-cvs-cervisia.png
+share/icons/hicolor/48x48/apps/cervisia.png
+share/icons/hicolor/scalable/actions/vcs-add-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-commit-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-diff-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-remove-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-status-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-update-cvs-cervisia.svgz
+share/kde4/services/cervisiapart.desktop
+share/kde4/services/cvsservice.desktop
+@dirrm share/doc/HTML/en/cervisia
+@dirrm share/apps/cervisiapart
+@dirrm share/apps/cervisia
--- a/devel/dolphin-plugins/Makefile
+++ b/devel/dolphin-plugins/Makefile
@ -0,0 +1,18 @@
+# Created by: Max Brazhnikov <makc@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	dolphin-plugins
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Plugins for Dolphin file manager
+
+USES=		cmake:outsource
+USE_XZ=		yes
+USE_KDE4=	kdelibs libkonq kdeprefix kdehier automoc4
+USE_QT4=	moc_build qmake_build rcc_build uic_build
+
+.include <bsd.port.mk>
--- a/devel/dolphin-plugins/distinfo
+++ b/devel/dolphin-plugins/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/dolphin-plugins-4.12.2.tar.xz) = eef2b694adb554d2eb20c77e06a893d3274453baeb4bf2a67c151b773cd0bbe1
+SIZE (KDE/4.12.2/dolphin-plugins-4.12.2.tar.xz) = 56056
--- a/devel/dolphin-plugins/pkg-descr
+++ b/devel/dolphin-plugins/pkg-descr
@ -0,0 +1,3 @@
+Plugins for Dolphin file manager.
+
+WWW: http://www.kde.org/
--- a/devel/dolphin-plugins/pkg-plist
+++ b/devel/dolphin-plugins/pkg-plist
@ -0,0 +1,11 @@
+lib/kde4/fileviewbazaarplugin.so
+lib/kde4/fileviewgitplugin.so
+lib/kde4/fileviewhgplugin.so
+lib/kde4/fileviewsvnplugin.so
+share/config.kcfg/fileviewgitpluginsettings.kcfg
+share/config.kcfg/fileviewhgpluginsettings.kcfg
+share/config.kcfg/fileviewsvnpluginsettings.kcfg
+share/kde4/services/fileviewbazaarplugin.desktop
+share/kde4/services/fileviewgitplugin.desktop
+share/kde4/services/fileviewhgplugin.desktop
+share/kde4/services/fileviewsvnplugin.desktop
--- a/devel/kapptemplate/Makefile
+++ b/devel/kapptemplate/Makefile
@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=	kapptemplate
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE template generator
+
+USE_XZ=		yes
+USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USES=		cmake:outsource gmake
+USE_QT4=	moc_build qmake_build rcc_build uic_build \
+		corelib dbus declarative
+
+.include <bsd.port.mk>
--- a/devel/kapptemplate/distinfo
+++ b/devel/kapptemplate/distinfo
@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/kapptemplate-4.12.2.tar.xz) = 93d0e40289893d0dbef6b3e672ede53d9a6effdbb967f9855cfcc28c6824fae7
+SIZE (KDE/4.12.2/kapptemplate-4.12.2.tar.xz) = 697888
--- a/devel/kapptemplate/pkg-descr
+++ b/devel/kapptemplate/pkg-descr
@ -0,0 +1 @@
+KDE Template Generator.
--- a/Show more
+++ b/Show more