29 files changed, 487 insertions, 68 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 502ac9947b2e..bfe2ee05f700 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -333,8 +333,11 @@
     SUBDIR += kexis
     SUBDIR += kid3
     SUBDIR += kid3-kde4
+    SUBDIR += kio-audiocd
     SUBDIR += kirocker
+    SUBDIR += kmix
     SUBDIR += kmp
+    SUBDIR += kscd
     SUBDIR += ksmp3play
     SUBDIR += kstreamripper
     SUBDIR += ladspa
@@ -367,6 +370,8 @@
     SUBDIR += libgme
     SUBDIR += libgpod
     SUBDIR += libid3tag
+    SUBDIR += libkcddb
+    SUBDIR += libkcompactdisc
     SUBDIR += liblastfm
     SUBDIR += liblo
     SUBDIR += liblscp
diff --git a/audio/juk/Makefile b/audio/juk/Makefile
index 6ade85d22007..49c18d30d288 100644
--- a/audio/juk/Makefile
+++ b/audio/juk/Makefile
@@ -1,69 +1,28 @@
-# New ports collection makefile for:	mpeglib_artsplug
-# Date created:				July 09 2004
-# Whom:					Michael Nottebrock <lofi@FreeBSD.org>
-#
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
 # $FreeBSD$
-#
 
-PORTNAME=	juk
-PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	7
-CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
-PKGNAMEPREFIX=	kdemultimedia-
-DISTNAME=	kdemultimedia-${PORTVERSION}
-DIST_SUBDIR=	KDE
+PORTNAME=		juk
+PORTVERSION=		${KDE4_VERSION}
+CATEGORIES=		audio kde
+MASTER_SITES=		${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=		KDE
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	KDE audio player
+MAINTAINER=		kde@FreeBSD.org
+COMMENT=		Juk is a jukebox, tagger and music collection manager
 
-LIB_DEPENDS=	akode:${PORTSDIR}/audio/akode \
-		tag:${PORTSDIR}/audio/taglib
+LICENSE=		GPLv2
 
-DEPRECATED=	Depends on QT3; unmaintained
-EXPIRATION_DATE=	2013-07-01
+LIB_DEPENDS=		tag.1:${PORTSDIR}/audio/taglib
 
-CONFLICTS=	kdemultimedia-3.3*
+CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
 
-OPTIONS_DEFINE=	GSTREAMER
+CMAKE_ARGS=		-DWITH_TunePimp:BOOL=OFF
+MAKE_JOBS_SAFE=		yes
+KDE4_BUILDENV=		yes
+USE_KDE4=		automoc4 kdehier kdelibs kdeprefix
+USE_QT4=		dbus qt3support svg \
+			moc_build qmake_build rcc_build uic_build
+USE_XZ=			yes
 
-USE_KDELIBS_VER=3
-PREFIX=		${KDE_PREFIX}
-
-USE_BZIP2=	yes
-USE_AUTOTOOLS=	libtool
-USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/kdemultimedia-${PORTVERSION}
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--without-musicbrainz
-
-WANT_GSTREAMER=	yes
-
-.include <bsd.port.pre.mk>
-
-.if  ${PORT_OPTIONS:MGSTREAMER} || exists(${LOCALBASE}/lib/libgstreamer-0.10.so)
-GSTREAMER_OVERRIDE=yes
-USE_GSTREAMER=	yes
-.endif
-
-
-pre-everything::
-.if defined(GSTREAMER_OVERRIDE)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "*********************************************************"
-	@${ECHO_MSG} "* gstreamer is installed and support has been enabled   *"
-	@${ECHO_MSG} "* automatically (no additional files will be installed) *"
-	@${ECHO_MSG} "*********************************************************"
-	@${ECHO_MSG}
-.endif
-
-do-build:
-	cd ${WRKSRC}/arts/runtime && ${SETENV} ${MAKE_ENV} ${GMAKE}
-	cd ${WRKSRC}/juk && ${SETENV} ${MAKE_ENV} ${GMAKE}
-
-do-install:
-	cd ${WRKSRC}/juk && ${SETENV} ${MAKE_ENV} ${GMAKE} install
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/juk/distinfo b/audio/juk/distinfo
index 93c2019c8549..6133356735e7 100644
--- a/audio/juk/distinfo
+++ b/audio/juk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdemultimedia-3.5.10.tar.bz2) = c1deb0dd1603b705ecd9199b4002ddbd87a457311882f84b1b5925ab83fc0dc0
-SIZE (KDE/kdemultimedia-3.5.10.tar.bz2) = 6333219
+SHA256 (KDE/juk-4.9.5.tar.xz) = 033cc5ee53e7b0febb94267a5151117d63bbe9a1e58fce6c9f2f21050df4954e
+SIZE (KDE/juk-4.9.5.tar.xz) = 445624
diff --git a/audio/juk/pkg-descr b/audio/juk/pkg-descr
index be1ed9204434..fe11a9795048 100644
--- a/audio/juk/pkg-descr
+++ b/audio/juk/pkg-descr
@@ -1 +1,6 @@
-IO slaves for various types of sound data, with streaming support.
+JuK is an audio jukebox application, supporting collections of MP3,
+Ogg Vorbis, and FLAC audio files. It allows you to edit the "tags" of
+your audio files, and manage your collection and playlists. Its main
+focus, in fact, is on music management.
+
+WWW:	http://www.kde.org/applications/multimedia/juk/
diff --git a/audio/juk/pkg-plist b/audio/juk/pkg-plist
index 3c620acf13ad..8287c4de5a66 100644
--- a/audio/juk/pkg-plist
+++ b/audio/juk/pkg-plist
@@ -1,16 +1,31 @@
 bin/juk
-share/applications/kde/juk.desktop
+share/applications/kde4/juk.desktop
+share/apps/juk/juk.notifyrc
 share/apps/juk/jukui-rtl.rc
 share/apps/juk/jukui.rc
 share/apps/juk/pics/playing.png
 share/apps/juk/pics/splash.png
-share/apps/juk/pics/yahoo_credit.png
-share/apps/konqueror/servicemenus/jukservicemenu.desktop
-share/icons/crystalsvg/22x22/actions/juk_dock.png
+share/apps/juk/pics/theme.svg
+share/dbus-1/interfaces/org.kde.juk.collection.xml
+share/dbus-1/interfaces/org.kde.juk.player.xml
+share/dbus-1/interfaces/org.kde.juk.search.xml
+share/doc/HTML/en/juk/common
+share/doc/HTML/en/juk/history-playlist.png
+share/doc/HTML/en/juk/index.cache.bz2
+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-tag-guesser.png
+share/doc/HTML/en/juk/normal-playlist.png
+share/doc/HTML/en/juk/search-playlist.png
+share/doc/HTML/en/juk/toolbar.png
 share/icons/hicolor/128x128/apps/juk.png
 share/icons/hicolor/16x16/apps/juk.png
 share/icons/hicolor/32x32/apps/juk.png
 share/icons/hicolor/48x48/apps/juk.png
 share/icons/hicolor/64x64/apps/juk.png
+share/kde4/services/ServiceMenus/jukservicemenu.desktop
+@dirrm share/doc/HTML/en/juk
 @dirrm share/apps/juk/pics
 @dirrm share/apps/juk
diff --git a/audio/kio-audiocd/Makefile b/audio/kio-audiocd/Makefile
new file mode 100644
index 000000000000..71f15bf49fb1
--- /dev/null
+++ b/audio/kio-audiocd/Makefile
@@ -0,0 +1,43 @@
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=		kio-audiocd
+PORTVERSION=		${KDE4_VERSION}
+CATEGORIES=		audio kde
+MASTER_SITES=		${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DISTNAME=		audiocd-kio-${PORTVERSION}
+DIST_SUBDIR=		KDE
+
+MAINTAINER=		kde@FreeBSD.org
+COMMENT=		KDE IOSlave for accessing audio CDs
+
+LICENSE=		GPLv2
+
+LIB_DEPENDS=		FLAC.10:${PORTSDIR}/audio/flac \
+			cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
+			ogg.8:${PORTSDIR}/audio/libogg \
+			vorbis.4:${PORTSDIR}/audio/libvorbis
+
+CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
+
+MAKE_JOBS_SAFE=		yes
+KDE4_BUILDENV=		yes
+USE_KDE4=		kdehier kdelibs kdeprefix libkcddb libkcompactdisc \
+			automoc4
+USE_QT4=		moc_build qmake_build rcc_build uic_build
+USE_XZ=			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
+
+.include <bsd.port.mk>
diff --git a/audio/kio-audiocd/distinfo b/audio/kio-audiocd/distinfo
new file mode 100644
index 000000000000..ead1238fee6e
--- /dev/null
+++ b/audio/kio-audiocd/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/audiocd-kio-4.9.5.tar.xz) = 8b0f93267573de83917c80d8e6a30860c7c3331ecd45f6f181a123ce5ae02637
+SIZE (KDE/audiocd-kio-4.9.5.tar.xz) = 56640
diff --git a/audio/kio-audiocd/files/patch-audiocd.cpp b/audio/kio-audiocd/files/patch-audiocd.cpp
new file mode 100644
index 000000000000..30a560b26b72
--- /dev/null
+++ b/audio/kio-audiocd/files/patch-audiocd.cpp
@@ -0,0 +1,43 @@
+--- audiocd.cpp.orig	2010-06-06 08:15:20.000000000 -0400
++++ audiocd.cpp	2010-06-06 08:18:01.000000000 -0400
+@@ -229,20 +229,21 @@
+ 	// name associated with the device, which throws the rest of audiocd
+ 	// for a loop.
+ 	//
++	QString devname;
+ 	if ( !(drive->dev) || (COOKED_IOCTL == drive->interface) )
+ 	{
+ 		// For ATAPI devices, we have no real choice. Use the
+ 		// user selected value, even if there is none.
+ 		//
+ 		kWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user.";
+-		cd->setDevice( drive->cdda_device_name );
++		devname = drive->cdda_device_name;
+ 	}
+ 	else
+ 	{
+ 		kDebug(7117) << "Found a SCSI or ATAPICAM device.";
+ 		if ( strlen(drive->dev->device_path) > 0 )
+ 		{
+-			cd->setDevice( drive->dev->device_path );
++			devname = drive->dev->device_path;
+ 		}
+ 		else
+ 		{
+@@ -250,13 +251,14 @@
+ 			// circumstances, so build a representation from
+ 			// the unit number and SCSI device name.
+ 			//
+-			QString devname = QString::fromLatin1( "/dev/%1%2" )
++			devname = QString::fromLatin1( "/dev/%1%2" )
+ 				.arg( drive->dev->given_dev_name )
+ 				.arg( drive->dev->given_unit_number ) ;
+ 			kDebug(7117) << "  Using derived name " << devname;
+-			cd->setDevice( devname );
+ 		}
+ 	}
++	if ( cd->deviceName() != devname )
++		cd->setDevice( devname );
+ #else
+ #ifdef __GNUC__
+ 	#warning audiocd ioslave is not going to work for you
diff --git a/audio/kio-audiocd/pkg-descr b/audio/kio-audiocd/pkg-descr
new file mode 100644
index 000000000000..bb4d6cdb06f0
--- /dev/null
+++ b/audio/kio-audiocd/pkg-descr
@@ -0,0 +1,3 @@
+KDE IOSlave for accessing audio CDs.
+
+WWW:	http://www.kde.org/
diff --git a/audio/kio-audiocd/pkg-plist b/audio/kio-audiocd/pkg-plist
new file mode 100644
index 000000000000..683675b3cd3d
--- /dev/null
+++ b/audio/kio-audiocd/pkg-plist
@@ -0,0 +1,22 @@
+include/audiocdencoder.h
+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
+share/apps/kconf_update/audiocd.upd
+share/apps/kconf_update/upgrade-metadata.sh
+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
+share/kde4/services/audiocd.desktop
+share/kde4/services/audiocd.protocol
+@dirrm share/doc/HTML/en/kioslave/audiocd
diff --git a/audio/kmix/Makefile b/audio/kmix/Makefile
new file mode 100644
index 000000000000..f2b2b00cae55
--- /dev/null
+++ b/audio/kmix/Makefile
@@ -0,0 +1,46 @@
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=		kmix
+PORTVERSION=		${KDE4_VERSION}
+CATEGORIES=		audio kde
+MASTER_SITES=		${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=		KDE
+
+MAINTAINER=		kde@FreeBSD.org
+COMMENT=		Sound mixer for KDE
+
+LICENSE=		GPLv2
+
+CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
+
+MAKE_JOBS_SAFE=		yes
+KDE4_BUILDENV=		yes
+USE_KDE4=		automoc4 kdehier kdelibs kdeprefix
+USE_QT4=		dbus phonon xml \
+			moc_build qmake_build rcc_build uic_build
+USE_XZ=			yes
+
+OPTIONS_DEFINE=		ALSA PULSEAUDIO
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+=		asound.2:${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+=		canberra.0:${PORTSDIR}/audio/libcanberra \
+			pulse.0:${PORTSDIR}/audio/pulseaudio
+USE_GNOME=		glib20
+.else
+CMAKE_ARGS+=		-DWITH_Canberra:BOOL=OFF \
+			-DWITH_PulseAudio:BOOL=OFF
+.endif
+
+.include <bsd.port.mk>
diff --git a/audio/kmix/distinfo b/audio/kmix/distinfo
new file mode 100644
index 000000000000..9727ac2df655
--- /dev/null
+++ b/audio/kmix/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/kmix-4.9.5.tar.xz) = 92736cd071b42ead1efdc7b29ba93057628a77da21e23d535d8d59690497a23c
+SIZE (KDE/kmix-4.9.5.tar.xz) = 306136
diff --git a/audio/kmix/files/extrapatch-no_alsa b/audio/kmix/files/extrapatch-no_alsa
new file mode 100644
index 000000000000..ccf4476743fd
--- /dev/null
+++ b/audio/kmix/files/extrapatch-no_alsa
@@ -0,0 +1,20 @@
+--- CMakeLists.txt~	2012-06-29 17:55:35.000000000 -0300
++++ CMakeLists.txt	2012-06-29 17:56:25.000000000 -0300
+@@ -6,7 +6,7 @@
+ include(KDE4Defaults)
+ include(MacroLibrary)
+ 
+-find_package(Alsa)
++find_file(CONFIG_ALSA_H_CMAKE config-alsa.h.cmake ${CMAKE_MODULE_PATH})
+ 
+ macro_optional_find_package(PulseAudio "0.9.12")
+ macro_log_feature(PULSEAUDIO_FOUND "PulseAudio" "PulseAudio Audio Server" "http://www.pulseaudio.org/" FALSE "0.9.12" "libpulse is needed to let KMix control PulseAudio")
+@@ -14,7 +14,7 @@
+ macro_optional_find_package(Canberra)
+ macro_log_feature(CANBERRA_FOUND "libcanberra" "libcanberra audio library" "http://0pointer.de/lennart/projects/libcanberra/" FALSE "" "libcanberra is needed for kmix sound feedback")
+ 
+-alsa_configure_file(${CMAKE_BINARY_DIR}/config-alsa.h)
++configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h)
+ 
+ 
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
diff --git a/audio/kmix/pkg-descr b/audio/kmix/pkg-descr
new file mode 100644
index 000000000000..a133640b11a5
--- /dev/null
+++ b/audio/kmix/pkg-descr
@@ -0,0 +1,5 @@
+KMix is an application to allow you to change the volume of your sound
+card. Though small, it is full-featured, and it supports several
+platforms and sound drivers.
+
+WWW:	http://www.kde.org/applications/multimedia/kmix/
diff --git a/audio/kmix/pkg-plist b/audio/kmix/pkg-plist
new file mode 100644
index 000000000000..e60aa51e2a9e
--- /dev/null
+++ b/audio/kmix/pkg-plist
@@ -0,0 +1,58 @@
+bin/kmix
+bin/kmixctrl
+lib/kde4/kded_kmixd.so
+lib/kde4/plasma_engine_mixer.so
+lib/libkdeinit4_kmix.so
+lib/libkdeinit4_kmixctrl.so
+share/applications/kde4/kmix.desktop
+share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/kmixdocked.png
+share/apps/kmix/pics/kmixdocked_error.png
+share/apps/kmix/pics/kmixdocked_mute.png
+share/apps/kmix/pics/mixer-ac97.png
+share/apps/kmix/pics/mixer-capture.png
+share/apps/kmix/pics/mixer-cd.png
+share/apps/kmix/pics/mixer-digital.png
+share/apps/kmix/pics/mixer-front.png
+share/apps/kmix/pics/mixer-headset.png
+share/apps/kmix/pics/mixer-lfe.png
+share/apps/kmix/pics/mixer-line.png
+share/apps/kmix/pics/mixer-master.png
+share/apps/kmix/pics/mixer-microphone.png
+share/apps/kmix/pics/mixer-midi.png
+share/apps/kmix/pics/mixer-pcm-default.png
+share/apps/kmix/pics/mixer-pcm.png
+share/apps/kmix/pics/mixer-surround.png
+share/apps/kmix/pics/mixer-video.png
+share/apps/kmix/profiles/ALSA.TerraTec_DMX6Fire.1.default.xml
+share/apps/kmix/profiles/ALSA.capture.xml
+share/apps/kmix/profiles/ALSA.default.xml
+share/apps/kmix/profiles/ALSA.playback.xml
+share/apps/kmix/profiles/OSS.default.xml
+share/apps/plasma/services/mixer.operations
+share/autostart/kmix_autostart.desktop
+share/autostart/restore_kmix_volumes.desktop
+share/dbus-1/interfaces/org.kde.kmix.control.xml
+share/dbus-1/interfaces/org.kde.kmix.mixer.xml
+share/dbus-1/interfaces/org.kde.kmix.mixset.xml
+share/doc/HTML/en/kmix/common
+share/doc/HTML/en/kmix/index.cache.bz2
+share/doc/HTML/en/kmix/index.docbook
+share/doc/HTML/en/kmix/kmix-channels.png
+share/doc/HTML/en/kmix/kmix-configure.png
+share/doc/HTML/en/kmix/kmix-file.png
+share/doc/HTML/en/kmix/kmix-master.png
+share/doc/HTML/en/kmix/kmix-options.png
+share/doc/HTML/en/kmix/kmix.png
+share/icons/hicolor/128x128/apps/kmix.png
+share/icons/hicolor/16x16/apps/kmix.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/hicolor/64x64/apps/kmix.png
+share/kde4/services/kded/kmixd.desktop
+share/kde4/services/kmixctrl_restore.desktop
+share/kde4/services/plasma-engine-mixer.desktop
+@dirrm share/doc/HTML/en/kmix
+@dirrm share/apps/kmix/profiles
+@dirrm share/apps/kmix/pics
+@dirrm share/apps/kmix
diff --git a/audio/kscd/Makefile b/audio/kscd/Makefile
new file mode 100644
index 000000000000..cedf72c74fc4
--- /dev/null
+++ b/audio/kscd/Makefile
@@ -0,0 +1,38 @@
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=		kscd
+PORTVERSION=		${KDE4_VERSION}
+CATEGORIES=		audio kde
+MASTER_SITES=		${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=		KDE
+
+MAINTAINER=		kde@FreeBSD.org
+COMMENT=		CD Player for KDE
+
+LICENSE=		GPLv2
+
+LIB_DEPENDS=		musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3
+
+CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
+
+MAKE_JOBS_SAFE=		yes
+KDE4_BUILDENV=		yes
+USE_KDE4=		kdehier kdelibs kdeprefix libkcddb libkcompactdisc \
+			automoc4
+USE_QT4=		phonon moc_build qmake_build rcc_build uic_build
+USE_XZ=			yes
+
+OPTIONS_DEFINE=		ALSA
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+=		asound.2:${PORTSDIR}/audio/alsa-lib
+.else
+EXTRA_PATCHES+=		${FILESDIR}/extrapatch-no_alsa
+.endif
+
+.include <bsd.port.mk>
+
diff --git a/audio/kscd/distinfo b/audio/kscd/distinfo
new file mode 100644
index 000000000000..60ab38ec731e
--- /dev/null
+++ b/audio/kscd/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/kscd-4.9.5.tar.xz) = 8b0b0b36fb21385d4353cc402880a9c61f5fee6997cba14932629641a64a0cc7
+SIZE (KDE/kscd-4.9.5.tar.xz) = 95608
diff --git a/audio/kscd/files/extrapatch-no_alsa b/audio/kscd/files/extrapatch-no_alsa
new file mode 100644
index 000000000000..d3e61dcc5379
--- /dev/null
+++ b/audio/kscd/files/extrapatch-no_alsa
@@ -0,0 +1,13 @@
+--- CMakeLists.txt~	2012-06-29 17:23:16.000000000 -0300
++++ CMakeLists.txt	2012-06-29 17:24:13.000000000 -0300
+@@ -8,8 +8,8 @@
+ include(MacroLibrary)
+ include_directories(${QT_INCLUDES} ${KDE4_INCLUDES})
+ 
+-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})
++configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h)
+ 
+ 
+ # If these two fail, behavior falls back to pre-git-migration
diff --git a/audio/kscd/pkg-descr b/audio/kscd/pkg-descr
new file mode 100644
index 000000000000..8940e5505e0f
--- /dev/null
+++ b/audio/kscd/pkg-descr
@@ -0,0 +1,4 @@
+KsCD is a small, fast, CDDB enabled audio CD player which supports
+multiple platforms.
+
+WWW:	http://www.kde.org/applications/multimedia/kscd/
diff --git a/audio/kscd/pkg-plist b/audio/kscd/pkg-plist
new file mode 100644
index 000000000000..29ce3aae5602
--- /dev/null
+++ b/audio/kscd/pkg-plist
@@ -0,0 +1,17 @@
+bin/kscd
+share/applications/kde4/kscd.desktop
+share/apps/kscd/skin/Chrome.svg
+share/apps/kscd/skin/Obsidian-Coast.svg
+share/apps/kscd/skin/Steel.svg
+share/apps/kscd/skin/default.svg
+share/apps/solid/actions/kscd-play-audiocd.desktop
+share/config.kcfg/kscd.kcfg
+share/dbus-1/interfaces/org.kde.kscd.cdplayer.xml
+share/icons/hicolor/128x128/apps/kscd.png
+share/icons/hicolor/16x16/apps/kscd.png
+share/icons/hicolor/32x32/apps/kscd.png
+share/icons/hicolor/48x48/apps/kscd.png
+share/icons/hicolor/64x64/apps/kscd.png
+share/icons/oxygen/22x22/actions/kscd-dock.png
+@dirrm share/apps/kscd/skin
+@dirrm share/apps/kscd
diff --git a/audio/libkcddb/Makefile b/audio/libkcddb/Makefile
new file mode 100644
index 000000000000..24b39731b917
--- /dev/null
+++ b/audio/libkcddb/Makefile
@@ -0,0 +1,24 @@
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=		libkcddb
+PORTVERSION=		${KDE4_VERSION}
+CATEGORIES=		audio kde
+MASTER_SITES=		${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=		KDE
+
+MAINTAINER=		kde@FreeBSD.org
+COMMENT=		KDE CDDB library
+
+LIB_DEPENDS=		musicbrainz5:${PORTSDIR}/audio/libmusicbrainz5
+
+CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
+
+MAKE_JOBS_SAFE=		yes
+KDE4_BUILDENV=		yes
+USE_KDE4=		automoc4 kdehier kdelibs kdeprefix
+USE_QT4=		moc_build qmake_build rcc_build uic_build
+USE_XZ=			yes
+
+.include <bsd.port.mk>
diff --git a/audio/libkcddb/distinfo b/audio/libkcddb/distinfo
new file mode 100644
index 000000000000..9557ac22c4bc
--- /dev/null
+++ b/audio/libkcddb/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/libkcddb-4.9.5.tar.xz) = 66f57e104079152e609c5d054d253da243449198b18e7e73c450b24be198c49b
+SIZE (KDE/libkcddb-4.9.5.tar.xz) = 159220
diff --git a/audio/libkcddb/pkg-descr b/audio/libkcddb/pkg-descr
new file mode 100644
index 000000000000..0c1b96dc7572
--- /dev/null
+++ b/audio/libkcddb/pkg-descr
@@ -0,0 +1,3 @@
+KDE library to access CDDB information.
+
+WWW:	http://www.kde.org/
diff --git a/audio/libkcddb/pkg-plist b/audio/libkcddb/pkg-plist
new file mode 100644
index 000000000000..938bec9a4b0e
--- /dev/null
+++ b/audio/libkcddb/pkg-plist
@@ -0,0 +1,28 @@
+include/libkcddb/cdinfo.h
+include/libkcddb/cdinfodialog.h
+include/libkcddb/client.h
+include/libkcddb/configbase.h
+include/libkcddb/genres.h
+include/libkcddb/kcddb.h
+include/libkcddb/kcddb_export.h
+include/libkcddb/kcddbconfig.h
+lib/cmake/libkcddb/LibkcddbConfig.cmake
+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
+share/apps/kconf_update/kcmcddb-emailsettings.upd
+share/config.kcfg/libkcddb.kcfg
+share/doc/HTML/en/kcontrol/cddbretrieval/common
+share/doc/HTML/en/kcontrol/cddbretrieval/index.cache.bz2
+share/doc/HTML/en/kcontrol/cddbretrieval/index.docbook
+share/doc/HTML/en/kcontrol/cddbretrieval/kscd13.png
+share/doc/HTML/en/kcontrol/cddbretrieval/kscd14.png
+share/doc/HTML/en/kcontrol/cddbretrieval/kscd16.png
+share/kde4/services/libkcddb.desktop
+@dirrm share/doc/HTML/en/kcontrol/cddbretrieval
+@dirrm lib/cmake/libkcddb
+@dirrmtry lib/cmake
+@dirrm include/libkcddb
diff --git a/audio/libkcompactdisc/Makefile b/audio/libkcompactdisc/Makefile
new file mode 100644
index 000000000000..40750752b092
--- /dev/null
+++ b/audio/libkcompactdisc/Makefile
@@ -0,0 +1,32 @@
+# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=		libkcompactdisc
+PORTVERSION=		${KDE4_VERSION}
+CATEGORIES=		audio kde
+MASTER_SITES=		${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
+DIST_SUBDIR=		KDE
+
+MAINTAINER=		kde@FreeBSD.org
+COMMENT=		KDE library for interfacing with audio CDs
+
+CONFLICTS_INSTALL=	kdemultimedia-4.[1-8].*
+
+MAKE_JOBS_SAFE=		yes
+KDE4_BUILDENV=		yes
+USE_KDE4=		automoc4 kdehier kdelibs kdeprefix
+USE_QT4=		dbus phonon moc_build qmake_build rcc_build uic_build
+USE_XZ=			yes
+
+OPTIONS_DEFINE=		ALSA
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MALSA}
+LIB_DEPENDS+=		asound.2:${PORTSDIR}/audio/alsa-lib
+.else
+EXTRA_PATCHES+=		${FILESDIR}/extrapatch-no_alsa
+.endif
+
+.include <bsd.port.mk>
diff --git a/audio/libkcompactdisc/distinfo b/audio/libkcompactdisc/distinfo
new file mode 100644
index 000000000000..2489ffb8d447
--- /dev/null
+++ b/audio/libkcompactdisc/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/libkcompactdisc-4.9.5.tar.xz) = dfc31475b0797dfc563bdda1bee04d44e182798ffa1808dcf8d3716b14a2942f
+SIZE (KDE/libkcompactdisc-4.9.5.tar.xz) = 77264
diff --git a/audio/libkcompactdisc/files/extrapatch-no_alsa b/audio/libkcompactdisc/files/extrapatch-no_alsa
new file mode 100644
index 000000000000..5f2fb4c5811f
--- /dev/null
+++ b/audio/libkcompactdisc/files/extrapatch-no_alsa
@@ -0,0 +1,13 @@
+--- 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})
+ 
+-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})
++configure_file(${CONFIG_ALSA_H_CMAKE} ${CMAKE_BINARY_DIR}/config-alsa.h)
+ 
+ include_directories(${KDE4_INCLUDES})
+ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/audio/libkcompactdisc/pkg-descr b/audio/libkcompactdisc/pkg-descr
new file mode 100644
index 000000000000..930b46ff84b0
--- /dev/null
+++ b/audio/libkcompactdisc/pkg-descr
@@ -0,0 +1,3 @@
+KDE library for interfacing with audio CDs.
+
+WWW:	http://www.kde.org/
diff --git a/audio/libkcompactdisc/pkg-plist b/audio/libkcompactdisc/pkg-plist
new file mode 100644
index 000000000000..af5373324f2b
--- /dev/null
+++ b/audio/libkcompactdisc/pkg-plist
@@ -0,0 +1,10 @@
+include/libkcompactdisc/kcompactdisc.h
+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
+@dirrm lib/cmake/libkcompactdisc
+@dirrmtry lib/cmake
+@dirrm include/libkcompactdisc