KDE/FreeBSD team presents KDE SC 4.12.4 and KDE Workspace 4.11.8!

KDE ports:
- Convert to USES=tar:xz

devel/p5-perlqt, multimedia/kdemultimedia4-ffmpegthumbs:
- Convert LIB_DEPENDS to new style

devel/p5-perlqt, devel/p5-perlkde:
- Don't remove directories installed by perl port

net/kdnssd:
- moved to net/zeroconf-ioslave (renamed upstream)

x11/kdelibs4:
- Clean up non-standard shared mime files and directories after deinstall

The area51 repository features commits by Alonso Schaich
<alonsoschaich@fastmail.fm> and makc.

50 files changed, 73 insertions, 106 deletions

diff --git a/devel/cervisia/Makefile b/devel/cervisia/Makefile
index 09396df369ab..95005bfb8969 100644
--- a/devel/cervisia/Makefile
+++ b/devel/cervisia/Makefile
@@ -9,9 +9,8 @@ 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
+USES=		cmake:outsource tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/devel/cervisia/distinfo b/devel/cervisia/distinfo
index 9f80b05d1e51..6f4d654f32ae 100644
--- a/devel/cervisia/distinfo
+++ b/devel/cervisia/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/cervisia-4.12.3.tar.xz) = 6ad147ec4228ce7037bad8f5a69be75efe3b88a0633dcfe2d2e65f60221be36e
-SIZE (KDE/4.12.3/cervisia-4.12.3.tar.xz) = 368536
+SHA256 (KDE/4.12.4/cervisia-4.12.4.tar.xz) = 4f7f89f0951d5c43c9aed1b1da3ac1f79c7ad9d197042fc51006183c25434745
+SIZE (KDE/4.12.4/cervisia-4.12.4.tar.xz) = 368608
diff --git a/devel/dolphin-plugins/Makefile b/devel/dolphin-plugins/Makefile
index c81df69da74c..b7170112621e 100644
--- a/devel/dolphin-plugins/Makefile
+++ b/devel/dolphin-plugins/Makefile
@@ -10,8 +10,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plugins for Dolphin file manager
 
-USES=		cmake:outsource
-USE_XZ=		yes
+USES=		cmake:outsource tar:xz
 USE_KDE4=	kdelibs libkonq kdeprefix kdehier automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
diff --git a/devel/dolphin-plugins/distinfo b/devel/dolphin-plugins/distinfo
index c0d5516b0eb4..ca240b4c5b9a 100644
--- a/devel/dolphin-plugins/distinfo
+++ b/devel/dolphin-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/dolphin-plugins-4.12.3.tar.xz) = 52f5d4abe35036ea5f2a636be377cd35119857264d3494eee2472fcd907dfd96
-SIZE (KDE/4.12.3/dolphin-plugins-4.12.3.tar.xz) = 56076
+SHA256 (KDE/4.12.4/dolphin-plugins-4.12.4.tar.xz) = 13f54ea2a9d43af314755472d7829979ae20e964a87c5803e387d275253a0222
+SIZE (KDE/4.12.4/dolphin-plugins-4.12.4.tar.xz) = 56088
diff --git a/devel/kapptemplate/Makefile b/devel/kapptemplate/Makefile
index 5aa9084c47f3..84841869d558 100644
--- a/devel/kapptemplate/Makefile
+++ b/devel/kapptemplate/Makefile
@@ -9,9 +9,8 @@ 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
+USES=		cmake:outsource gmake tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		corelib dbus declarative
 
diff --git a/devel/kapptemplate/distinfo b/devel/kapptemplate/distinfo
index 13130f64e94c..4f47249ed950 100644
--- a/devel/kapptemplate/distinfo
+++ b/devel/kapptemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kapptemplate-4.12.3.tar.xz) = 5aea452087ea4e250648f6227c9b3a17cf1b2ccd8a40a8ef01145f7b4d564523
-SIZE (KDE/4.12.3/kapptemplate-4.12.3.tar.xz) = 697984
+SHA256 (KDE/4.12.4/kapptemplate-4.12.4.tar.xz) = 7398205cdc5274fb5496c4994a521364d82f76b0e450c822addeccab13ec4822
+SIZE (KDE/4.12.4/kapptemplate-4.12.4.tar.xz) = 698744
diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile
index b7b24afdb543..81b62d789609 100644
--- a/devel/kcachegrind/Makefile
+++ b/devel/kcachegrind/Makefile
@@ -10,9 +10,8 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Profiler frontend for KDE
 
-USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		corelib dbus gui
 
diff --git a/devel/kcachegrind/distinfo b/devel/kcachegrind/distinfo
index 020f83887ca0..3e549090611e 100644
--- a/devel/kcachegrind/distinfo
+++ b/devel/kcachegrind/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kcachegrind-4.12.3.tar.xz) = fa1ddbb6e73b2d37a97e0b04824e511db975ca05cac52fc30613dcfefd3b09a0
-SIZE (KDE/4.12.3/kcachegrind-4.12.3.tar.xz) = 234952
+SHA256 (KDE/4.12.4/kcachegrind-4.12.4.tar.xz) = 1d7994e439a354f744af8d0351adfde7a38514d0a950f69525260a156a56cd37
+SIZE (KDE/4.12.4/kcachegrind-4.12.4.tar.xz) = 234976
diff --git a/devel/kde-dev-scripts/Makefile b/devel/kde-dev-scripts/Makefile
index 5bc184150bbb..3e224b1a0742 100644
--- a/devel/kde-dev-scripts/Makefile
+++ b/devel/kde-dev-scripts/Makefile
@@ -9,10 +9,9 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE development scripts
 
-USES=		cmake:outsource shebangfix
+USES=		cmake:outsource shebangfix tar:xz
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_XZ=		yes
 
 SHEBANG_FILES=	cxxmetric \
 		draw_lib_dependencies \
diff --git a/devel/kde-dev-scripts/distinfo b/devel/kde-dev-scripts/distinfo
index 55300780f470..df37ba917711 100644
--- a/devel/kde-dev-scripts/distinfo
+++ b/devel/kde-dev-scripts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kde-dev-scripts-4.12.3.tar.xz) = 3ffebb9225f25f2340538ebc50c2f06ba3243cd856a6622c77ac1b0bc4caeaf8
-SIZE (KDE/4.12.3/kde-dev-scripts-4.12.3.tar.xz) = 257104
+SHA256 (KDE/4.12.4/kde-dev-scripts-4.12.4.tar.xz) = 38abac7d0f7427141d30c74a2e434692b21c65b083453fa4411e4e15d6ceae50
+SIZE (KDE/4.12.4/kde-dev-scripts-4.12.4.tar.xz) = 257144
diff --git a/devel/kde-dev-utils/Makefile b/devel/kde-dev-utils/Makefile
index 9ceead1f469e..d385749bfac4 100644
--- a/devel/kde-dev-utils/Makefile
+++ b/devel/kde-dev-utils/Makefile
@@ -12,7 +12,6 @@ COMMENT=	KDE development utilities
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		corelib designer gui qt3support xml
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 
 .include <bsd.port.mk>
diff --git a/devel/kde-dev-utils/distinfo b/devel/kde-dev-utils/distinfo
index 8536608ff960..bfa2bf3e6c3b 100644
--- a/devel/kde-dev-utils/distinfo
+++ b/devel/kde-dev-utils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kde-dev-utils-4.12.3.tar.xz) = 1c621b4a46d890a2117af627188f442d29a276038bc57bcd73928894cedcd86a
-SIZE (KDE/4.12.3/kde-dev-utils-4.12.3.tar.xz) = 51556
+SHA256 (KDE/4.12.4/kde-dev-utils-4.12.4.tar.xz) = b2e5f67f4d0432b15d455666c4f44adbd18c2b6e31e4e4369a1867842b620720
+SIZE (KDE/4.12.4/kde-dev-utils-4.12.4.tar.xz) = 51544
diff --git a/devel/kdesdk4-kioslaves/Makefile b/devel/kdesdk4-kioslaves/Makefile
index e36c53968aa3..d64ebb60d595 100644
--- a/devel/kdesdk4-kioslaves/Makefile
+++ b/devel/kdesdk4-kioslaves/Makefile
@@ -11,8 +11,7 @@ COMMENT=	SDK related KIO slaves
 
 LIB_DEPENDS=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
 
-USES=		cmake:outsource perl5 shebangfix
-USE_XZ=		yes
+USES=		cmake:outsource perl5 shebangfix tar:xz
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
diff --git a/devel/kdesdk4-kioslaves/distinfo b/devel/kdesdk4-kioslaves/distinfo
index 8bcbee20d677..d86700ab6591 100644
--- a/devel/kdesdk4-kioslaves/distinfo
+++ b/devel/kdesdk4-kioslaves/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kdesdk-kioslaves-4.12.3.tar.xz) = c6eccc60b187639bf3a0a1cb23eb1d7fd0e85a7046e06a4f2704f3a8b818eed3
-SIZE (KDE/4.12.3/kdesdk-kioslaves-4.12.3.tar.xz) = 361288
+SHA256 (KDE/4.12.4/kdesdk-kioslaves-4.12.4.tar.xz) = a9bc6b0166dc27b4f76efd3b23223d1ea0cf86fd070143bb88e33da10971b310
+SIZE (KDE/4.12.4/kdesdk-kioslaves-4.12.4.tar.xz) = 361236
diff --git a/devel/kdesdk4-strigi-analyzers/Makefile b/devel/kdesdk4-strigi-analyzers/Makefile
index aaf2254f9cc9..cd33286c05be 100644
--- a/devel/kdesdk4-strigi-analyzers/Makefile
+++ b/devel/kdesdk4-strigi-analyzers/Makefile
@@ -9,8 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi analyzers for SDK related file formats
 
-USES=		cmake:outsource
-USE_XZ=		yes
+USES=		cmake:outsource tar:xz
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4 strigi
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
diff --git a/devel/kdesdk4-strigi-analyzers/distinfo b/devel/kdesdk4-strigi-analyzers/distinfo
index 24c99725a1d4..182d5c145c62 100644
--- a/devel/kdesdk4-strigi-analyzers/distinfo
+++ b/devel/kdesdk4-strigi-analyzers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kdesdk-strigi-analyzers-4.12.3.tar.xz) = 9228e72bc41816482531458305207cd0d61c51f46379aefcb45c65a51409cb5d
-SIZE (KDE/4.12.3/kdesdk-strigi-analyzers-4.12.3.tar.xz) = 18260
+SHA256 (KDE/4.12.4/kdesdk-strigi-analyzers-4.12.4.tar.xz) = 7b697fdbb9e663be7253cb677de39732fab17f4584f0ccd0a9e6aee2e3bbbd97
+SIZE (KDE/4.12.4/kdesdk-strigi-analyzers-4.12.4.tar.xz) = 18264
diff --git a/devel/kdesdk4-thumbnailers/Makefile b/devel/kdesdk4-thumbnailers/Makefile
index 74cadaca122b..005a9417295b 100644
--- a/devel/kdesdk4-thumbnailers/Makefile
+++ b/devel/kdesdk4-thumbnailers/Makefile
@@ -9,8 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE thumbnail generator for gettext po files
 
-USES=		cmake:outsource gettext
-USE_XZ=		yes
+USES=		cmake:outsource gettext tar:xz
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
diff --git a/devel/kdesdk4-thumbnailers/distinfo b/devel/kdesdk4-thumbnailers/distinfo
index acb8184ffc8c..6a6eaae66ec9 100644
--- a/devel/kdesdk4-thumbnailers/distinfo
+++ b/devel/kdesdk4-thumbnailers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kdesdk-thumbnailers-4.12.3.tar.xz) = 37b4e1597d6a28cfb0353dba7b782cf2aefae7957972ffc9ab814f355dd025db
-SIZE (KDE/4.12.3/kdesdk-thumbnailers-4.12.3.tar.xz) = 11348
+SHA256 (KDE/4.12.4/kdesdk-thumbnailers-4.12.4.tar.xz) = 502487f13ea48ebfb4c5e33548cee4ba90965a98c6cdcd68cc6d56720b7e390d
+SIZE (KDE/4.12.4/kdesdk-thumbnailers-4.12.4.tar.xz) = 11364
diff --git a/devel/lokalize/Makefile b/devel/lokalize/Makefile
index 157b6cfe5628..7da4137e6a2a 100644
--- a/devel/lokalize/Makefile
+++ b/devel/lokalize/Makefile
@@ -11,9 +11,8 @@ COMMENT=	Computer-aided translation system
 
 LIB_DEPENDS=	libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
 
-USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		sql
 
diff --git a/devel/lokalize/distinfo b/devel/lokalize/distinfo
index 661e47b350b7..6d032c2d17ba 100644
--- a/devel/lokalize/distinfo
+++ b/devel/lokalize/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/lokalize-4.12.3.tar.xz) = 453f024b512309783da7b1d7d3a152088fa72a68f137cd060efb0cf7b3b85da7
-SIZE (KDE/4.12.3/lokalize-4.12.3.tar.xz) = 846080
+SHA256 (KDE/4.12.4/lokalize-4.12.4.tar.xz) = 070ac2957e6a22274e5bca97062c455bea3da91a099918f3d014f46c4888896a
+SIZE (KDE/4.12.4/lokalize-4.12.4.tar.xz) = 846072
diff --git a/devel/okteta/Makefile b/devel/okteta/Makefile
index 0706389d8952..122eb51f2324 100644
--- a/devel/okteta/Makefile
+++ b/devel/okteta/Makefile
@@ -11,9 +11,8 @@ COMMENT=	KDE hex editor
 
 LIB_DEPENDS=	libqca.so:${PORTSDIR}/devel/qca
 
-USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USES=		cmake:outsource shared-mime-info
+USES=		cmake:outsource shared-mime-info tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		corelib designer gui script scripttools xml
 
diff --git a/devel/okteta/distinfo b/devel/okteta/distinfo
index 1f22cc7c2b62..920160966c46 100644
--- a/devel/okteta/distinfo
+++ b/devel/okteta/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/okteta-4.12.3.tar.xz) = 7e98014e204010d0700ef2d8497051b30b30102f120cd8dc4f96ed783aa3fd14
-SIZE (KDE/4.12.3/okteta-4.12.3.tar.xz) = 492768
+SHA256 (KDE/4.12.4/okteta-4.12.4.tar.xz) = 8c1be292cf191bf969f4c4a47fff36168d225fdd2dce4121b00ac9677d6f4a55
+SIZE (KDE/4.12.4/okteta-4.12.4.tar.xz) = 492784
diff --git a/devel/p5-perlkde/Makefile b/devel/p5-perlkde/Makefile
index 1c21c625644b..01b0b1a9974a 100644
--- a/devel/p5-perlkde/Makefile
+++ b/devel/p5-perlkde/Makefile
@@ -10,11 +10,10 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Perl bindings for KDE
 
-USE_XZ=		yes
 USE_KDE4=	kdehier kdeprefix perlqt smokekde automoc4
 USE_QT4=	network opengl sql svg xml \
 		qmake_build moc_build uic_build rcc_build
-USES=		cmake:outsource compiler:c++11-lib perl5
+USES=		cmake:outsource compiler:c++11-lib perl5 tar:xz
 
 # Respect PREFIX
 CMAKE_ARGS+=	-DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}
diff --git a/devel/p5-perlkde/distinfo b/devel/p5-perlkde/distinfo
index dd39dd2fdf2b..14405a3f7c1b 100644
--- a/devel/p5-perlkde/distinfo
+++ b/devel/p5-perlkde/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/perlkde-4.12.3.tar.xz) = 9a30c21fa726419a802e4a5fa26ee43861ac426fed3c4016cf728653fb8ed8d9
-SIZE (KDE/4.12.3/perlkde-4.12.3.tar.xz) = 40652
+SHA256 (KDE/4.12.4/perlkde-4.12.4.tar.xz) = 2e20f40b2cc0e0dd40a7aadc5d9959460b26557c93ce3b00c405bbc90681cb17
+SIZE (KDE/4.12.4/perlkde-4.12.4.tar.xz) = 40616
diff --git a/devel/p5-perlkde/pkg-plist b/devel/p5-perlkde/pkg-plist
index 525f38c27400..2ffaf470175f 100644
--- a/devel/p5-perlkde/pkg-plist
+++ b/devel/p5-perlkde/pkg-plist
@@ -62,8 +62,3 @@ lib/kde4/kperlpluginfactory.so
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/KDECore4
 %%ATTICA%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Attica
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Akonadi
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%
-@dirrmtry lib/perl5/site_perl
-@dirrmtry lib/perl5
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile
index d9ac722161a1..d2b827869ae8 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt/Makefile
@@ -10,14 +10,13 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Perl bindings for Qt
 
-LIB_DEPENDS=	qscintilla2:${PORTSDIR}/devel/qscintilla2 \
-		qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+LIB_DEPENDS=	libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 \
+		libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
 
-USE_XZ=		yes
 USE_KDE4=	kdehier kdeprefix smokeqt qimageblitz
 USE_QT4=	corelib dbus gui network xml \
 		qmake_build moc_build uic_build rcc_build
-USES=		cmake:outsource perl5
+USES=		cmake:outsource perl5 tar:xz
 
 # Respect PREFIX
 CMAKE_ARGS+=	-DCUSTOM_PERL_SITE_ARCH_DIR=${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}
diff --git a/devel/p5-perlqt/distinfo b/devel/p5-perlqt/distinfo
index 7a9a4b983543..11dfb2939d5d 100644
--- a/devel/p5-perlqt/distinfo
+++ b/devel/p5-perlqt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/perlqt-4.12.3.tar.xz) = 6781e487dbb66d5b59cd54bf3bf1fb18ae1f6717c5d2990490f7df25769974dc
-SIZE (KDE/4.12.3/perlqt-4.12.3.tar.xz) = 1811396
+SHA256 (KDE/4.12.4/perlqt-4.12.4.tar.xz) = f4771b253d477c939d1fe581b3b9b0f084dd04792bdb4bc43b7d9285567fc3ba
+SIZE (KDE/4.12.4/perlqt-4.12.4.tar.xz) = 1811380
diff --git a/devel/p5-perlqt/pkg-plist b/devel/p5-perlqt/pkg-plist
index d59e327dc0d0..a7931a3387dd 100644
--- a/devel/p5-perlqt/pkg-plist
+++ b/devel/p5-perlqt/pkg-plist
@@ -92,11 +92,6 @@ share/perlqt/doxsubpp.pl
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Qsci
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/QImageBlitz
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Phonon
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/QtCore4
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%
-@dirrmtry %%SITE_PERL%%
-@dirrmtry lib/perl5/site_perl
-@dirrmtry lib/perl5
 @dirrm include/perlqt
 @dirrmtry env
diff --git a/devel/poxml/Makefile b/devel/poxml/Makefile
index e1515c4fb165..8172ec735f91 100644
--- a/devel/poxml/Makefile
+++ b/devel/poxml/Makefile
@@ -11,9 +11,8 @@ COMMENT=	Tools to translate Docbook XML using gettext
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libantlr.a:${PORTSDIR}/devel/antlr
 
-USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		corelib xml
 
diff --git a/devel/poxml/distinfo b/devel/poxml/distinfo
index 33b0aa87265b..a7e1406998cd 100644
--- a/devel/poxml/distinfo
+++ b/devel/poxml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/poxml-4.12.3.tar.xz) = f0d303cca94b12a5bced6b728360d037bbd60601dc3d6d16e5e05546096d04e9
-SIZE (KDE/4.12.3/poxml-4.12.3.tar.xz) = 30808
+SHA256 (KDE/4.12.4/poxml-4.12.4.tar.xz) = ae2dad18f326b3ee39e0d8c7be200927c9b2ca18c1d070ebe5bc6d44a3849c85
+SIZE (KDE/4.12.4/poxml-4.12.4.tar.xz) = 30808
diff --git a/devel/py-krosspython/Makefile b/devel/py-krosspython/Makefile
index ca6c4602dcf7..aacd255b2563 100644
--- a/devel/py-krosspython/Makefile
+++ b/devel/py-krosspython/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Kross Python scripting library
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USE_PYTHON=	2
 USE_QT4=	corelib gui qmake_build moc_build uic_build rcc_build
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 CMAKE_ARGS+=	-DBUILD_falcon:BOOL=FALSE \
 		-DBUILD_ruby:BOOL=FALSE \
 		-DBUILD_java:BOOL=FALSE
diff --git a/devel/py-krosspython/distinfo b/devel/py-krosspython/distinfo
index cb8ae222a85d..e7fdee7d872b 100644
--- a/devel/py-krosspython/distinfo
+++ b/devel/py-krosspython/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kross-interpreters-4.12.3.tar.xz) = 521781362ceb30a0f901e44c6a59c03d2b5f36a45b0783256f696b266493e3a3
-SIZE (KDE/4.12.3/kross-interpreters-4.12.3.tar.xz) = 130820
+SHA256 (KDE/4.12.4/kross-interpreters-4.12.4.tar.xz) = d1dc88c46c9effcacdcd01cb37c923e943cee57ee30fa46757b2b984d54cab31
+SIZE (KDE/4.12.4/kross-interpreters-4.12.4.tar.xz) = 130804
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile
index baa8a544c290..7dfa141f48b0 100644
--- a/devel/py-pykde4/Makefile
+++ b/devel/py-pykde4/Makefile
@@ -30,8 +30,7 @@ USE_KDE4=	kdehier kdelibs kdeprefix okular pimlibs \
 USE_PYTHON=	2
 USE_QT4=	corelib dbus designer_build gui network xml \
 		qmake_build moc_build uic_build rcc_build
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 CMAKE_ARGS+=	-DWITH_PolkitQt:BOOL=FALSE
 
 SUB_FILES=	kdebindings4.pth
diff --git a/devel/py-pykde4/distinfo b/devel/py-pykde4/distinfo
index b33e22422bda..03eb48900ea2 100644
--- a/devel/py-pykde4/distinfo
+++ b/devel/py-pykde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/pykde4-4.12.3.tar.xz) = 500573236af1a08279b02c1c8342d73a8e3596611cf2a9b602e160367960a1b8
-SIZE (KDE/4.12.3/pykde4-4.12.3.tar.xz) = 2005056
+SHA256 (KDE/4.12.4/pykde4-4.12.4.tar.xz) = af7666962c79bfd1160ece925a0063c9523118caf4d51ea6eb036da71f96f701
+SIZE (KDE/4.12.4/pykde4-4.12.4.tar.xz) = 2005196
diff --git a/devel/py-pykdeuic4/Makefile b/devel/py-pykdeuic4/Makefile
index ea8ad2418c4d..0423f77b3028 100644
--- a/devel/py-pykdeuic4/Makefile
+++ b/devel/py-pykdeuic4/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Enhanced version of pyuic4
 USE_KDE4=	kdelibs automoc4 pykde4
 USE_PYTHON=	2
 USE_QT4=	moc_build qmake_build rcc_build uic_build
-USE_XZ=		yes
 DISTINFO_FILE=	${PORTSDIR}/devel/py-pykde4/distinfo
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
 
diff --git a/devel/ruby-korundum/Makefile b/devel/ruby-korundum/Makefile
index 2602bdb0f3e5..069e9e7ad38d 100644
--- a/devel/ruby-korundum/Makefile
+++ b/devel/ruby-korundum/Makefile
@@ -16,8 +16,7 @@ USE_KDE4=	kate kdehier kdelibs kdeprefix okular pimlibs \
 USE_QT4=	corelib network opengl sql svg xml \
 		qmake_build moc_build uic_build rcc_build
 USE_RUBY=	yes
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 
 CMAKE_ARGS+=	-DRUBY_LIBRARY=${LOCALBASE}/lib/lib${RUBY_NAME}.so \
 		-DRUBY_INCLUDE_PATH=${LOCALBASE}/lib/ruby/${RUBY_VER}/${RUBY_ARCH} \
diff --git a/devel/ruby-korundum/distinfo b/devel/ruby-korundum/distinfo
index f2bc4a01d1db..bcee6a28dc9d 100644
--- a/devel/ruby-korundum/distinfo
+++ b/devel/ruby-korundum/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/korundum-4.12.3.tar.xz) = 867ccfa9282a59104123394dd023ba9804667009fbcb5972d82f83450e27029d
-SIZE (KDE/4.12.3/korundum-4.12.3.tar.xz) = 160420
+SHA256 (KDE/4.12.4/korundum-4.12.4.tar.xz) = 93ede79c99e5036f82fa34965fe68935c4ede92347017de22d914bf6f743d3e3
+SIZE (KDE/4.12.4/korundum-4.12.4.tar.xz) = 160444
diff --git a/devel/ruby-krossruby/Makefile b/devel/ruby-krossruby/Makefile
index 5b6674df16f5..8557bffb2d16 100644
--- a/devel/ruby-krossruby/Makefile
+++ b/devel/ruby-krossruby/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Ruby bindings for Qt/KDE
 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs automoc4
 USE_QT4=	corelib gui qmake_build moc_build uic_build rcc_build
 USE_RUBY=	yes
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 CMAKE_ARGS+=	-DBUILD_python:BOOL=FALSE \
 		-DBUILD_falcon:BOOL=FALSE \
 		-DBUILD_java:BOOL=FALSE
diff --git a/devel/ruby-krossruby/distinfo b/devel/ruby-krossruby/distinfo
index cb8ae222a85d..e7fdee7d872b 100644
--- a/devel/ruby-krossruby/distinfo
+++ b/devel/ruby-krossruby/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/kross-interpreters-4.12.3.tar.xz) = 521781362ceb30a0f901e44c6a59c03d2b5f36a45b0783256f696b266493e3a3
-SIZE (KDE/4.12.3/kross-interpreters-4.12.3.tar.xz) = 130820
+SHA256 (KDE/4.12.4/kross-interpreters-4.12.4.tar.xz) = d1dc88c46c9effcacdcd01cb37c923e943cee57ee30fa46757b2b984d54cab31
+SIZE (KDE/4.12.4/kross-interpreters-4.12.4.tar.xz) = 130804
diff --git a/devel/ruby-qtruby/Makefile b/devel/ruby-qtruby/Makefile
index 2624aa690329..13e1b0206e7a 100644
--- a/devel/ruby-qtruby/Makefile
+++ b/devel/ruby-qtruby/Makefile
@@ -17,8 +17,7 @@ USE_KDE4=	kdehier kdeprefix smokeqt
 USE_QT4=	corelib dbus declarative gui network phonon script webkit xml \
 		qmake_build moc_build uic_build rcc_build
 USE_RUBY=	yes
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 USE_LDCONFIG=	yes
 
 SUB_FILES=	ruby-kdebindings-env.sh pkg-message
diff --git a/devel/ruby-qtruby/distinfo b/devel/ruby-qtruby/distinfo
index d605e04a9713..a964736ab9eb 100644
--- a/devel/ruby-qtruby/distinfo
+++ b/devel/ruby-qtruby/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/qtruby-4.12.3.tar.xz) = 30043ec0b4434390d6676ea348840d151ab60e17b928621ceb4aa67219f9209b
-SIZE (KDE/4.12.3/qtruby-4.12.3.tar.xz) = 529596
+SHA256 (KDE/4.12.4/qtruby-4.12.4.tar.xz) = 874405ca0c2d5d7adc1c5a4efc6c7bb1c53779f9a5b280202d38246037da228c
+SIZE (KDE/4.12.4/qtruby-4.12.4.tar.xz) = 529624
diff --git a/devel/smokegen/Makefile b/devel/smokegen/Makefile
index 9949f312a54f..ff10151406cc 100644
--- a/devel/smokegen/Makefile
+++ b/devel/smokegen/Makefile
@@ -11,8 +11,7 @@ COMMENT=	SMOKE bindings for KDE
 
 USE_KDE4=	kdehier kdeprefix
 USE_QT4=	corelib xml qmake_build moc_build uic_build rcc_build
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 CMAKE_ARGS+=	-DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke
 USE_LDCONFIG=	yes
 
diff --git a/devel/smokegen/distinfo b/devel/smokegen/distinfo
index 3dae177bf340..f8d521428c7f 100644
--- a/devel/smokegen/distinfo
+++ b/devel/smokegen/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/smokegen-4.12.3.tar.xz) = 8bf91e31a20cdc578cb94334b2b2a1f5b249633be679d91467f4b8aaf37f7705
-SIZE (KDE/4.12.3/smokegen-4.12.3.tar.xz) = 146456
+SHA256 (KDE/4.12.4/smokegen-4.12.4.tar.xz) = cace83ebadd75e12bbf9e1d8b1551301be50d32664f8ea00dec472346ff89874
+SIZE (KDE/4.12.4/smokegen-4.12.4.tar.xz) = 146456
diff --git a/devel/smokekde/Makefile b/devel/smokekde/Makefile
index 43eed3435995..5248b3311b6a 100644
--- a/devel/smokekde/Makefile
+++ b/devel/smokekde/Makefile
@@ -13,8 +13,7 @@ USE_KDE4=	kate kdehier kdelibs kdeprefix okular pimlibs \
 		smokegen smokeqt akonadi automoc4 soprano
 USE_QT4=	corelib dbus designer_build gui network opengl sql svg xml \
 		qmake_build moc_build uic_build rcc_build
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	ATTICA
diff --git a/devel/smokekde/distinfo b/devel/smokekde/distinfo
index b126eabe9e42..ee8d139f9e1f 100644
--- a/devel/smokekde/distinfo
+++ b/devel/smokekde/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/smokekde-4.12.3.tar.xz) = 191475bec62bfabd1dfaa0e91564129e6896c33cdec98d77e8eef9b892a5fea4
-SIZE (KDE/4.12.3/smokekde-4.12.3.tar.xz) = 36868
+SHA256 (KDE/4.12.4/smokekde-4.12.4.tar.xz) = b54bac62e81b8ee25595c28f02b028b93b88f3f13b483bfff4796f9fbc4488f2
+SIZE (KDE/4.12.4/smokekde-4.12.4.tar.xz) = 36868
diff --git a/devel/smokeqt/Makefile b/devel/smokeqt/Makefile
index d74da8790ae0..f2f3f44f7acf 100644
--- a/devel/smokeqt/Makefile
+++ b/devel/smokeqt/Makefile
@@ -17,8 +17,7 @@ USE_QT4=	corelib dbus declarative designer_build gui help \
 		multimedia network opengl phonon qtestlib script \
 		sql svg webkit xml xmlpatterns \
 		qmake_build moc_build uic_build rcc_build
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/smokeqt/distinfo b/devel/smokeqt/distinfo
index abbc5eae40c3..693e8eebc92a 100644
--- a/devel/smokeqt/distinfo
+++ b/devel/smokeqt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/smokeqt-4.12.3.tar.xz) = 4ebf79aa2874d5d2f49d8d10bc61d7f70ef74389de2fa55329177adf1b6fb459
-SIZE (KDE/4.12.3/smokeqt-4.12.3.tar.xz) = 30664
+SHA256 (KDE/4.12.4/smokeqt-4.12.4.tar.xz) = f2642ee70dcabc309bfbf1f43ee4bc9c7e586ff9477a83270d56fbcdba6cf0d2
+SIZE (KDE/4.12.4/smokeqt-4.12.4.tar.xz) = 30680
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index 7562b4e6d3ed..45c26ccec093 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -11,10 +11,9 @@ COMMENT=	UML modeller for KDE
 
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs
 
-USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 USE_GNOME=	libxml2 libxslt
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
 .include <bsd.port.mk>
diff --git a/devel/umbrello/distinfo b/devel/umbrello/distinfo
index 617e81783f79..ac683d64dfc1 100644
--- a/devel/umbrello/distinfo
+++ b/devel/umbrello/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/4.12.3/umbrello-4.12.3.tar.xz) = 028f36447a33d4dd871deb9f5bf5ca91e7079f754582686e2eb460782392345d
-SIZE (KDE/4.12.3/umbrello-4.12.3.tar.xz) = 1471416
+SHA256 (KDE/4.12.4/umbrello-4.12.4.tar.xz) = 2a6ddd19280e51e64949330048519096feb2c2f2a18d46b6ed8047aca57cbe52
+SIZE (KDE/4.12.4/umbrello-4.12.4.tar.xz) = 1471460
diff --git a/devel/umbrello/pkg-plist b/devel/umbrello/pkg-plist
index a413eabe4264..f6fc70304f59 100644
--- a/devel/umbrello/pkg-plist
+++ b/devel/umbrello/pkg-plist
@@ -36,6 +36,7 @@ share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_sequence.png
 share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_state.png
 share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_usecase.png
 share/apps/umbrello/layouts/activity-export.desktop
+share/apps/umbrello/layouts/activity-vertical.desktop
 share/apps/umbrello/layouts/class-export.desktop
 share/apps/umbrello/layouts/class-horizontal.desktop
 share/apps/umbrello/layouts/class-vertical.desktop