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]

35 files changed, 181 insertions, 117 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 51b76d6..11a398b 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -431,6 +431,7 @@
     SUBDIR += k3b-kde4
     SUBDIR += k8temp
     SUBDIR += kcm-polkit-kde
+    SUBDIR += kcron
     SUBDIR += kdeadmin4
     SUBDIR += kdf
     SUBDIR += kdirstat
@@ -443,6 +444,8 @@
     SUBDIR += krename-kde4
     SUBDIR += kshutdown-kde4
     SUBDIR += ksysguardd
+    SUBDIR += ksystemlog
+    SUBDIR += kuser
     SUBDIR += lbl-cf
     SUBDIR += lbl-hf
     SUBDIR += lcdproc
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index 1f30d83..27bdbe6 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -4,21 +4,15 @@
 PORTNAME=	filelight
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils 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=	Map of concentric segmented-rings representing your file system
-
-LATEST_LINK=	${PORTNAME}-kde4
-
-CONFLICTS=	kdeutils-4.6.*
+COMMENT=	Map of concentric segmented-rings representing file system
 
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_XZ=		yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/filelight-kde4/distinfo b/sysutils/filelight-kde4/distinfo
index e449df2..85888ce 100644
--- a/sysutils/filelight-kde4/distinfo
+++ b/sysutils/filelight-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/filelight-4.10.5.tar.xz) = aeab9aa76e2794452a61458aff1cef8482b8214770681ff4643b861c5122cdf1
-SIZE (KDE/4.10.5/filelight-4.10.5.tar.xz) = 291080
+SHA256 (KDE/4.12.2/filelight-4.12.2.tar.xz) = 7320d0fd8c6ff98796e4732f4dec0d78d13a3b64f188ad918a27a5046a2b9d7c
+SIZE (KDE/4.12.2/filelight-4.12.2.tar.xz) = 287024
diff --git a/sysutils/filelight-kde4/pkg-plist b/sysutils/filelight-kde4/pkg-plist
index 57f67ca..5deb29e 100644
--- a/sysutils/filelight-kde4/pkg-plist
+++ b/sysutils/filelight-kde4/pkg-plist
@@ -17,6 +17,7 @@ share/icons/hicolor/32x32/actions/view_filelight.png
 share/icons/hicolor/32x32/apps/filelight.png
 share/icons/hicolor/48x48/apps/filelight.png
 share/icons/hicolor/64x64/apps/filelight.png
+share/icons/hicolor/scalable/apps/filelight.svgz
 share/kde4/services/filelightpart.desktop
 @dirrm share/doc/HTML/en/filelight
 @dirrm share/apps/filelightpart
diff --git a/sysutils/kcron/Makefile b/sysutils/kcron/Makefile
new file mode 100644
index 0000000..7351d6a
--- /dev/null
+++ b/sysutils/kcron/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	kcron
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	sysutils kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE task scheduler
+
+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>
diff --git a/sysutils/kcron/distinfo b/sysutils/kcron/distinfo
new file mode 100644
index 0000000..b1619bf
--- /dev/null
+++ b/sysutils/kcron/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/kcron-4.12.2.tar.xz) = 32d08b9a9ef582d832b0be4620d1f0f46a394fdcf369dea0cc5cb534faf87fbd
+SIZE (KDE/4.12.2/kcron-4.12.2.tar.xz) = 174652
diff --git a/sysutils/kcron/pkg-descr b/sysutils/kcron/pkg-descr
new file mode 100644
index 0000000..69d95b1
--- /dev/null
+++ b/sysutils/kcron/pkg-descr
@@ -0,0 +1,3 @@
+KDE frontend for cron.
+
+WWW: http://www.kde.org
diff --git a/sysutils/kcron/pkg-plist b/sysutils/kcron/pkg-plist
new file mode 100644
index 0000000..44cfc63
--- /dev/null
+++ b/sysutils/kcron/pkg-plist
@@ -0,0 +1,9 @@
+lib/kde4/kcm_cron.so
+share/doc/HTML/en/kcron/common
+share/doc/HTML/en/kcron/index.cache.bz2
+share/doc/HTML/en/kcron/index.docbook
+share/doc/HTML/en/kcron/kcronstart.png
+share/doc/HTML/en/kcron/newtask.png
+share/doc/HTML/en/kcron/newvariable.png
+share/kde4/services/kcm_cron.desktop
+@dirrm share/doc/HTML/en/kcron
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 33273da..b7fa11d 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -1,22 +1,28 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kdeadmin
 PORTVERSION=	${KDE4_VERSION}
-CATEGORIES=	sysutils kde ipv6
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DIST_SUBDIR=	KDE/${PORTVERSION}
+CATEGORIES=	sysutils kde
+DISTFILES=	#
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	KDE Admin applications
+COMMENT=	KDE Administration applications (meta port)
 
-LATEST_LINK=	${PORTNAME}4
+USE_KDE4=	kdeprefix
+NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 
-USE_XZ=		yes
-USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
-USES=		cmake:outsource
-USE_QT4=	dbus moc_build qmake_build rcc_build uic_build
+OPTIONS_DEFINE=	KCRON KSYSTEMLOG KUSER
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+
+KCRON_DESC=		Task scheduler
+KCRON_RUN_DEPENDS=	${KDE4_PREFIX}/lib/kde4/kcm_cron.so:${PORTSDIR}/sysutils/kcron
+
+KSYSTEMLOG_DESC=	System log viewer
+KSYSTEMLOG_RUN_DEPENDS=	${KDE4_PREFIX}/bin/ksystemlog:${PORTSDIR}/sysutils/ksystemlog
+
+KUSER_DESC=		User management application
+KUSER_RUN_DEPENDS=	${KDE4_PREFIX}/bin/kuser:${PORTSDIR}/sysutils/kuser
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
deleted file mode 100644
index c9db473..0000000
--- a/sysutils/kdeadmin4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/4.10.5/kdeadmin-4.10.5.tar.xz) = 84c5ef20903eb8b2f1d0b760de49532c51f0cbd20aaaed219c5bd747c54fe4b9
-SIZE (KDE/4.10.5/kdeadmin-4.10.5.tar.xz) = 662340
diff --git a/sysutils/kdeadmin4/pkg-descr b/sysutils/kdeadmin4/pkg-descr
index 5d4443a..4fba583 100644
--- a/sysutils/kdeadmin4/pkg-descr
+++ b/sysutils/kdeadmin4/pkg-descr
@@ -1 +1,3 @@
-KDEAdmin tools for KDE4.
+Administration applications for KDE.
+
+WWW: http://www.kde.org
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 4b60be1..3a114ea 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -4,19 +4,15 @@
 PORTNAME=	kdf
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils 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=	Shows free space of devices 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>
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 5341788..a59ebee 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kdf-4.10.5.tar.xz) = 503c4a1b56eef415b75faf80f5f5823092a13925048c94f92e48c019af2c7134
-SIZE (KDE/4.10.5/kdf-4.10.5.tar.xz) = 157404
+SHA256 (KDE/4.12.2/kdf-4.12.2.tar.xz) = 60ce40fd272cbab5574403d4f4fbf38e36f88cde829d5a2e528e65a3936615a4
+SIZE (KDE/4.12.2/kdf-4.12.2.tar.xz) = 148712
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index afcfa42..c438507 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -4,21 +4,15 @@
 PORTNAME=	kfloppy
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils 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=	Floppy disk formatter for KDE
 
-CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
-
-LATEST_LINK=	${PORTNAME}-kde4
-
 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>
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 2d42caf..24d1520 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/kfloppy-4.10.5.tar.xz) = 351d2a801cf2b05c7a040440331aab64f11ea6fd5d103253854f0555d145d80b
-SIZE (KDE/4.10.5/kfloppy-4.10.5.tar.xz) = 61312
+SHA256 (KDE/4.12.2/kfloppy-4.12.2.tar.xz) = 2580ddbc3191f6cb704e4281a93faf9a69ae3b832da01b1926361319e72823d7
+SIZE (KDE/4.12.2/kfloppy-4.12.2.tar.xz) = 52752
diff --git a/sysutils/ksysguardd/Makefile b/sysutils/ksysguardd/Makefile
index 9a561ac..155e67e 100644
--- a/sysutils/ksysguardd/Makefile
+++ b/sysutils/ksysguardd/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	ksysguardd
-PORTVERSION=	${KDE4_VERSION}
+PORTVERSION=	${KDE4_WORKSPACE_VERSION}
 CATEGORIES=	sysutils kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src/
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src
 DISTNAME=	kde-workspace-${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
@@ -27,7 +26,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/ksysguard/${PORTNAME}
 PLIST_FILES=	bin/${PORTNAME} \
 		etc/${PORTNAME}rc
 
-NO_STAGE=	yes
 pre-build:
 	${REINPLACE_CMD} -e 's/<config-workspace.h>/"config-${PORTNAME}.h"/' \
 		${WRKSRC}/${PORTNAME}.c
diff --git a/sysutils/ksystemlog/Makefile b/sysutils/ksystemlog/Makefile
new file mode 100644
index 0000000..c79602d
--- /dev/null
+++ b/sysutils/ksystemlog/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	ksystemlog
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	sysutils kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE system log application
+
+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>
diff --git a/sysutils/ksystemlog/distinfo b/sysutils/ksystemlog/distinfo
new file mode 100644
index 0000000..257b0aa
--- /dev/null
+++ b/sysutils/ksystemlog/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/ksystemlog-4.12.2.tar.xz) = e53bb63e1f8d0cb8c62f8b48399ab43e2c0a44240fb625d776a9580f9696deeb
+SIZE (KDE/4.12.2/ksystemlog-4.12.2.tar.xz) = 382188
diff --git a/sysutils/kdeadmin4/files/patch-ksystemlog-modes-daemon-daemonConfiguration.h b/sysutils/ksystemlog/files/patch-src-modes-daemon-daemonConfiguration.h
index 0bae5d0..c6de282 100644
--- a/sysutils/kdeadmin4/files/patch-ksystemlog-modes-daemon-daemonConfiguration.h
+++ b/sysutils/ksystemlog/files/patch-src-modes-daemon-daemonConfiguration.h
@@ -1,5 +1,5 @@
---- ksystemlog/src/modes/daemon/daemonConfiguration.h.o	2009-06-09 12:39:54.000000000 -0400
-+++ ksystemlog/src/modes/daemon/daemonConfiguration.h	2009-06-09 12:40:06.000000000 -0400
+--- src/modes/daemon/daemonConfiguration.h.orig	2013-08-10 12:25:48.939329058 +0000
++++ src/modes/daemon/daemonConfiguration.h	2013-08-10 12:26:06.097330372 +0000
 @@ -47,7 +47,7 @@
  			configuration->setCurrentGroup(QLatin1String( "DaemonLogMode" ));
  
diff --git a/sysutils/kdeadmin4/files/patch-ksystemlog-modes-system-systemConfiguration.h b/sysutils/ksystemlog/files/patch-src-modes-system-systemConfiguration.h
index 6c2f441..4d9bd61 100644
--- a/sysutils/kdeadmin4/files/patch-ksystemlog-modes-system-systemConfiguration.h
+++ b/sysutils/ksystemlog/files/patch-src-modes-system-systemConfiguration.h
@@ -1,5 +1,5 @@
---- ksystemlog/src/modes/system/systemConfiguration.h.o	2009-06-09 12:38:16.000000000 -0400
-+++ ksystemlog/src/modes/system/systemConfiguration.h	2009-06-09 12:38:27.000000000 -0400
+--- src/modes/system/systemConfiguration.h.orig	2013-08-10 12:29:30.156327556 +0000
++++ src/modes/system/systemConfiguration.h	2013-08-10 12:30:04.811327221 +0000
 @@ -39,7 +39,7 @@
  		SystemConfiguration() :
  			GenericLogModeConfiguration(
diff --git a/sysutils/ksystemlog/pkg-descr b/sysutils/ksystemlog/pkg-descr
new file mode 100644
index 0000000..b6ea843
--- /dev/null
+++ b/sysutils/ksystemlog/pkg-descr
@@ -0,0 +1,5 @@
+KSystemLog is a system log viewer tool. This program is developed for beginner
+users, who don't know how to find information about their Linux system, and
+don't know where log files are.
+
+WWW: http://kde.org/applications/system/ksystemlog/
diff --git a/sysutils/ksystemlog/pkg-plist b/sysutils/ksystemlog/pkg-plist
new file mode 100644
index 0000000..29c970d
--- /dev/null
+++ b/sysutils/ksystemlog/pkg-plist
@@ -0,0 +1,11 @@
+bin/ksystemlog
+share/applications/kde4/ksystemlog.desktop
+share/apps/ksystemlog/ksystemlogui.rc
+share/doc/HTML/en/ksystemlog/common
+share/doc/HTML/en/ksystemlog/filter-process.png
+share/doc/HTML/en/ksystemlog/first-opening.png
+share/doc/HTML/en/ksystemlog/index.cache.bz2
+share/doc/HTML/en/ksystemlog/index.docbook
+share/doc/HTML/en/ksystemlog/main-screen.png
+@dirrm share/doc/HTML/en/ksystemlog
+@dirrm share/apps/ksystemlog
diff --git a/sysutils/kuser/Makefile b/sysutils/kuser/Makefile
new file mode 100644
index 0000000..486104b
--- /dev/null
+++ b/sysutils/kuser/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME=	kuser
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	sysutils kde
+MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE/${PORTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	KDE user manager
+
+USE_XZ=		yes
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
+USES=		cmake:outsource
+USE_QT4=	moc_build qmake_build rcc_build uic_build
+
+.include <bsd.port.mk>
diff --git a/sysutils/kuser/distinfo b/sysutils/kuser/distinfo
new file mode 100644
index 0000000..f72a88a
--- /dev/null
+++ b/sysutils/kuser/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/4.12.2/kuser-4.12.2.tar.xz) = 939ebf070341ff2a053091dbbc29f3d1e3370255711a6a4c0e2d31c540e44d73
+SIZE (KDE/4.12.2/kuser-4.12.2.tar.xz) = 134748
diff --git a/sysutils/kuser/pkg-descr b/sysutils/kuser/pkg-descr
new file mode 100644
index 0000000..defa00d
--- /dev/null
+++ b/sysutils/kuser/pkg-descr
@@ -0,0 +1,3 @@
+KUser is a tool for managing users and groups on your system.
+
+WWW: http://kde.org/applications/system/kuser/
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kuser/pkg-plist
index d3b3437..a7a8f8c 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kuser/pkg-plist
@@ -1,27 +1,11 @@
-bin/ksystemlog
 bin/kuser
-lib/kde4/kcm_cron.so
-share/applications/kde4/ksystemlog.desktop
 share/applications/kde4/kuser.desktop
-share/apps/ksystemlog/ksystemlogui.rc
 share/apps/kuser/icons/hicolor/22x22/actions/user-group-delete.png
 share/apps/kuser/icons/hicolor/22x22/actions/user-group-properties.png
 share/apps/kuser/kuserui.rc
 share/apps/kuser/pics/group.png
 share/apps/kuser/pics/user.png
 share/config.kcfg/kuser.kcfg
-share/doc/HTML/en/kcron/common
-share/doc/HTML/en/kcron/index.cache.bz2
-share/doc/HTML/en/kcron/index.docbook
-share/doc/HTML/en/kcron/kcronstart.png
-share/doc/HTML/en/kcron/newtask.png
-share/doc/HTML/en/kcron/newvariable.png
-share/doc/HTML/en/ksystemlog/common
-share/doc/HTML/en/ksystemlog/filter-process.png
-share/doc/HTML/en/ksystemlog/first-opening.png
-share/doc/HTML/en/ksystemlog/index.cache.bz2
-share/doc/HTML/en/ksystemlog/index.docbook
-share/doc/HTML/en/ksystemlog/main-screen.png
 share/doc/HTML/en/kuser/common
 share/doc/HTML/en/kuser/index.cache.bz2
 share/doc/HTML/en/kuser/index.docbook
@@ -32,14 +16,11 @@ share/icons/hicolor/22x22/apps/kuser.png
 share/icons/hicolor/32x32/apps/kuser.png
 share/icons/hicolor/48x48/apps/kuser.png
 share/icons/hicolor/64x64/apps/kuser.png
-share/kde4/services/kcm_cron.desktop
 @dirrm share/doc/HTML/en/kuser
-@dirrm share/doc/HTML/en/ksystemlog
-@dirrm share/doc/HTML/en/kcron
 @dirrm share/apps/kuser/pics
 @dirrm share/apps/kuser/icons/hicolor/22x22/actions
 @dirrm share/apps/kuser/icons/hicolor/22x22
 @dirrm share/apps/kuser/icons/hicolor
 @dirrm share/apps/kuser/icons
 @dirrm share/apps/kuser
-@dirrm share/apps/ksystemlog
+
diff --git a/sysutils/nepomuk-core/Makefile b/sysutils/nepomuk-core/Makefile
index 9f0f60c..13092eb 100644
--- a/sysutils/nepomuk-core/Makefile
+++ b/sysutils/nepomuk-core/Makefile
@@ -3,21 +3,19 @@
 
 PORTNAME=	nepomuk-core
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils 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=	Core Nepomuk system libraries and services for KDE
 
 LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
-		tag.1:${PORTSDIR}/audio/taglib \
-		exiv2.12:${PORTSDIR}/graphics/exiv2 \
-		swscale:${PORTSDIR}/multimedia/ffmpeg
-
-CONFLICTS_INSTALL=	kde-runtime-4.[7-8].*
+		libtag.so:${PORTSDIR}/audio/taglib \
+		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
+		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
+		libepub.so:${PORTSDIR}/textproc/ebook-tools \
+		libqmobipocket.so:${PORTSDIR}/graphics/kdegraphics4-mobipocket
 
 USE_XZ=		yes
 USE_KDE4=	kdeprefix kdehier automoc4 kdelibs ontologies soprano
@@ -28,9 +26,8 @@ MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 
 SUB_FILES=	nepomuk-env.sh
 
-NO_STAGE=	yes
 post-install:
-	${MKDIR} ${PREFIX}/env
-	${INSTALL_SCRIPT} ${WRKDIR}/nepomuk-env.sh ${PREFIX}/env
+	${MKDIR} ${STAGEDIR}${PREFIX}/env
+	${INSTALL_SCRIPT} ${WRKDIR}/nepomuk-env.sh ${STAGEDIR}${PREFIX}/env
 
 .include <bsd.port.mk>
diff --git a/sysutils/nepomuk-core/distinfo b/sysutils/nepomuk-core/distinfo
index caa3192..ac3ee83 100644
--- a/sysutils/nepomuk-core/distinfo
+++ b/sysutils/nepomuk-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/nepomuk-core-4.10.5.tar.xz) = ffe6c39cc6fae22618ef98ddb9e1f66f2482f6bc50193260886411f610e2f989
-SIZE (KDE/4.10.5/nepomuk-core-4.10.5.tar.xz) = 372444
+SHA256 (KDE/4.12.2/nepomuk-core-4.12.2.tar.xz) = 64f9496f0c257b5fa566f2b0a0ebfcbbf04fe3cd8861f52a5fbf2ba98af26a5c
+SIZE (KDE/4.12.2/nepomuk-core-4.12.2.tar.xz) = 380300
diff --git a/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt b/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt
deleted file mode 100644
index b6bbd03..0000000
--- a/sysutils/nepomuk-core/files/patch-services__fileindexer__indexer__CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Reorder include directories to fix build when ffmpeg-0.7 is installed
-#
---- ./services/fileindexer/indexer/CMakeLists.txt.orig	2013-03-07 02:19:03.114665070 +0000
-+++ ./services/fileindexer/indexer/CMakeLists.txt	2013-03-07 02:19:11.568663110 +0000
-@@ -108,7 +108,7 @@
- endif(EXIV2_FOUND)
- 
- if(FFMPEG_FOUND)
--    include_directories( ${FFMPEG_INCLUDE_DIRS} )
-+    include_directories(BEFORE ${FFMPEG_INCLUDE_DIRS} )
- 
-     kde4_add_plugin( nepomukffmpegextractor ffmpegextractor.cpp extractorplugin.cpp )
- 
diff --git a/sysutils/nepomuk-core/pkg-plist b/sysutils/nepomuk-core/pkg-plist
index f4b8df8..fe38958 100644
--- a/sysutils/nepomuk-core/pkg-plist
+++ b/sysutils/nepomuk-core/pkg-plist
@@ -2,9 +2,17 @@ bin/nepomuk-simpleresource-rcgen
 bin/nepomuk2-rcgen
 bin/nepomukbackup
 bin/nepomukcleaner
+bin/nepomukcmd
+bin/nepomukctl
+bin/nepomukfileindexer
+bin/nepomukfilewatch
 bin/nepomukindexer
+bin/nepomukmigrator
+bin/nepomuksearch
 bin/nepomukserver
 bin/nepomukservicestub
+bin/nepomukshow
+bin/nepomukstorage
 env/nepomuk-env.sh
 include/Nepomuk2/CreateResourceJob
 include/Nepomuk2/DataManagement
@@ -54,6 +62,7 @@ include/Nepomuk2/Vocabulary/PIMO
 include/Nepomuk2/Vocabulary/TMO
 include/nepomuk2/andterm.h
 include/nepomuk2/class.h
+include/nepomuk2/cleaningjob.h
 include/nepomuk2/comparisonterm.h
 include/nepomuk2/createresourcejob.h
 include/nepomuk2/datamanagement.h
@@ -94,6 +103,7 @@ include/nepomuk2/resourcetypeterm.h
 include/nepomuk2/resourcewatcher.h
 include/nepomuk2/result.h
 include/nepomuk2/resultiterator.h
+include/nepomuk2/service2.h
 include/nepomuk2/simpleresource.h
 include/nepomuk2/simpleresourcegraph.h
 include/nepomuk2/simpleterm.h
@@ -110,19 +120,24 @@ lib/cmake/NepomukCore/NepomukCoreConfig.cmake
 lib/cmake/NepomukCore/NepomukCoreConfigVersion.cmake
 lib/cmake/NepomukCore/NepomukCoreTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/NepomukCore/NepomukCoreTargetsWithPrefix.cmake
+lib/kde4/nepomukepubextractor.so
 lib/kde4/nepomukexiv2extractor.so
 lib/kde4/nepomukffmpegextractor.so
-lib/kde4/nepomukfileindexer.so
-lib/kde4/nepomukfilewatch.so
+lib/kde4/nepomukmobiextractor.so
+lib/kde4/nepomukodfextractor.so
+lib/kde4/nepomukoffice2007extractor.so
+lib/kde4/nepomukofficeextractor.so
 lib/kde4/nepomukplaintextextractor.so
 lib/kde4/nepomukpopplerextractor.so
-lib/kde4/nepomukstorage.so
 lib/kde4/nepomuktaglibextractor.so
 lib/libkdeinit4_nepomukserver.so
+lib/libnepomukcleaner.so
+lib/libnepomukcleaner.so.4
+lib/libnepomukcleaner.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libnepomukcommon.so
 lib/libnepomukcore.so
-lib/libnepomukcore.so.5
-lib/libnepomukcore.so.5.0.1
+lib/libnepomukcore.so.4
+lib/libnepomukcore.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libnepomukextractor.so
 share/applications/kde4/nepomukbackup.desktop
 share/applications/kde4/nepomukcleaner.desktop
@@ -134,6 +149,7 @@ share/dbus-1/interfaces/org.kde.NepomukServer.xml
 share/dbus-1/interfaces/org.kde.nepomuk.BackupManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.DataManagement.xml
 share/dbus-1/interfaces/org.kde.nepomuk.FileIndexer.xml
+share/dbus-1/interfaces/org.kde.nepomuk.FileWatch.xml
 share/dbus-1/interfaces/org.kde.nepomuk.OntologyManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Query.xml
 share/dbus-1/interfaces/org.kde.nepomuk.QueryService.xml
@@ -144,10 +160,15 @@ share/dbus-1/interfaces/org.kde.nepomuk.ServiceManager.xml
 share/dbus-1/interfaces/org.kde.nepomuk.Storage.xml
 share/kde4/services/nepomukactivitiesservice.desktop
 share/kde4/services/nepomukbackupsync.desktop
+share/kde4/services/nepomukepubextractor.desktop
 share/kde4/services/nepomukexiv2extractor.desktop
 share/kde4/services/nepomukffmpegextractor.desktop
 share/kde4/services/nepomukfileindexer.desktop
 share/kde4/services/nepomukfilewatch.desktop
+share/kde4/services/nepomukmobiextractor.desktop
+share/kde4/services/nepomukodfextractor.desktop
+share/kde4/services/nepomukoffice2007extractor.desktop
+share/kde4/services/nepomukofficeextractor.desktop
 share/kde4/services/nepomukontologyloader.desktop
 share/kde4/services/nepomukplaintextextractor.desktop
 share/kde4/services/nepomukpopplerextractor.desktop
@@ -156,22 +177,24 @@ share/kde4/services/nepomukremovablestorageservice.desktop
 share/kde4/services/nepomukstorage.desktop
 share/kde4/services/nepomukstrigiservice.desktop
 share/kde4/services/nepomuktaglibextractor.desktop
+share/kde4/servicetypes/nepomukcleaningjob.desktop
 share/kde4/servicetypes/nepomukextractor.desktop
 share/kde4/servicetypes/nepomukservice.desktop
+share/kde4/servicetypes/nepomukservice2.desktop
 share/ontology/kde/kext.ontology
 share/ontology/kde/kext.trig
 share/ontology/kde/kuvo.ontology
 share/ontology/kde/kuvo.trig
 share/ontology/kde/nrio.ontology
 share/ontology/kde/nrio.trig
-@dirrm share/ontology/kde
+@dirrmtry share/ontology/kde
 @dirrmtry share/ontology
 @dirrm share/apps/nepomukstorage
 @dirrm share/apps/nepomukfilewatch
 @dirrm share/apps/fileindexerservice
 @dirrm lib/cmake/NepomukCore
 @dirrmtry lib/cmake
-@dirrm include/nepomuk2
+@dirrmtry include/nepomuk2
 @dirrm include/Nepomuk2/Vocabulary
 @dirrm include/Nepomuk2/Types
 @dirrm include/Nepomuk2/Query
diff --git a/sysutils/nepomuk-widgets/Makefile b/sysutils/nepomuk-widgets/Makefile
index af13a7c..c8bcebf 100644
--- a/sysutils/nepomuk-widgets/Makefile
+++ b/sysutils/nepomuk-widgets/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=	nepomuk-widgets
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils 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
@@ -16,5 +15,4 @@ USE_QT4=	corelib dbus gui moc_build qmake_build rcc_build uic_build
 USE_XZ=		yes
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/nepomuk-widgets/distinfo b/sysutils/nepomuk-widgets/distinfo
index 5078276..f16d3b4 100644
--- a/sysutils/nepomuk-widgets/distinfo
+++ b/sysutils/nepomuk-widgets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/nepomuk-widgets-4.10.5.tar.xz) = d09323a0d0a8e086044c39d9565edbacb082f4f53b24a112339115b8c3e6f5da
-SIZE (KDE/4.10.5/nepomuk-widgets-4.10.5.tar.xz) = 80484
+SHA256 (KDE/4.12.2/nepomuk-widgets-4.12.2.tar.xz) = e5d7a4ebe3c6b94f7e29a6cb43450c84e4e47efc9c7dfbdcebc62e6fc87ba2aa
+SIZE (KDE/4.12.2/nepomuk-widgets-4.12.2.tar.xz) = 48716
diff --git a/sysutils/nepomuk-widgets/pkg-plist b/sysutils/nepomuk-widgets/pkg-plist
index a5e6146..b3a07c5 100644
--- a/sysutils/nepomuk-widgets/pkg-plist
+++ b/sysutils/nepomuk-widgets/pkg-plist
@@ -1,13 +1,15 @@
+include/nepomuk2/filemetadataconfigwidget.h
 include/nepomuk2/filemetadatawidget.h
 include/nepomuk2/nepomukwidgets_export.h
+include/nepomuk2/resourcemodel.h
 include/nepomuk2/tagwidget.h
 lib/cmake/NepomukWidgets/NepomukWidgetsConfig.cmake
 lib/cmake/NepomukWidgets/NepomukWidgetsConfigVersion.cmake
 lib/cmake/NepomukWidgets/NepomukWidgetsTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/NepomukWidgets/NepomukWidgetsTargetsWithPrefix.cmake
 lib/libnepomukwidgets.so
-lib/libnepomukwidgets.so.5
-lib/libnepomukwidgets.so.5.0.1
+lib/libnepomukwidgets.so.4
+lib/libnepomukwidgets.so.%%KDE4_GENERIC_LIB_VERSION%%
 @dirrmtry lib/cmake/NepomukWidgets
 @dirrmtry lib/cmake
-@dirrm include/nepomuk2
+@dirrmtry include/nepomuk2
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index e502c8b..33247ad 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -4,19 +4,15 @@
 PORTNAME=	sweeper
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils 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=	Cleans temporal files 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>
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index e34a6ab..bf00ee6 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.10.5/sweeper-4.10.5.tar.xz) = 841834e01b2f6fa5b61355fee4d601d846c53b085c8c2488b08f9fa8c434177a
-SIZE (KDE/4.10.5/sweeper-4.10.5.tar.xz) = 84692
+SHA256 (KDE/4.12.2/sweeper-4.12.2.tar.xz) = 05fbe846da529ec8c4d9b5cdb3635cc04ad2c6a13ecc88d46777f8a48a771865
+SIZE (KDE/4.12.2/sweeper-4.12.2.tar.xz) = 82340