18 files changed, 48 insertions, 341 deletions

diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 3ee691423220..0532daea2985 100644
--- 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
diff --git a/audio/juk/distinfo b/audio/juk/distinfo
index 2146d1261fbf..89448a31cace 100644
--- 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
diff --git a/audio/juk/pkg-plist b/audio/juk/pkg-plist
index 8287c4de5a66..5e7c0064f434 100644
--- 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
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile
index 29ff06cc9194..0ca7351ca5a9 100644
--- 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>
diff --git a/audio/kio-audiocd/distinfo b/audio/kio-audiocd/distinfo
index 572b43b348c5..1475738b6dc3 100644
--- 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
diff --git a/audio/kio-audiocd/pkg-plist b/audio/kio-audiocd/pkg-plist
index 018cf6a1d297..377aa66a2f61 100644
--- 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
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
index 8891afbe6904..7f2d9e859c79 100644
--- 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>
-
-.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
+ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+ALSA_EXTRA_PATCHES=	${FILESDIR}/extrapatch-no_alsa
+
+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>
diff --git a/audio/kmix/distinfo b/audio/kmix/distinfo
index 3ee1a8c49a6a..d0ec6aa8a2c2 100644
--- 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
diff --git a/audio/kmix/files/patch-libcxx b/audio/kmix/files/patch-libcxx
deleted file mode 100644
index 61dbd8ab5417..000000000000
--- a/audio/kmix/files/patch-libcxx
+++ /dev/null
@@ -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())
diff --git a/audio/kscd/Makefile b/audio/kscd/Makefile
index ac4c5b8aee49..55a270e7d49d 100644
--- 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>
 
diff --git a/audio/kscd/distinfo b/audio/kscd/distinfo
index d6163b07ef3b..bc571d616a76 100644
--- 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
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
index fc246cf15e46..499cd44fa1fc 100644
--- 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
diff --git a/audio/libkcddb/distinfo b/audio/libkcddb/distinfo
index 835d9ca87762..07d59565d08b 100644
--- 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
diff --git a/audio/libkcddb/pkg-plist b/audio/libkcddb/pkg-plist
index 81508caa1b00..fb3d58deaf6c 100644
--- 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
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
index 90a1103e6c2e..6963049c5855 100644
--- 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>
diff --git a/audio/libkcompactdisc/distinfo b/audio/libkcompactdisc/distinfo
index bde5e06ca53e..6b66365b1106 100644
--- 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
diff --git a/audio/libkcompactdisc/files/extrapatch-no_alsa b/audio/libkcompactdisc/files/extrapatch-no_alsa
index 5f2fb4c5811f..2f83175e4738 100644
--- 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})
diff --git a/audio/libkcompactdisc/pkg-plist b/audio/libkcompactdisc/pkg-plist
index af5373324f2b..d13a1e9b67fb 100644
--- 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