4 files changed, 28 insertions, 8 deletions

diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 5e77263ae2ab..3c1631d26e37 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,13 +14,12 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Multimedia applications
 
-BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
 		ogg.7:${PORTSDIR}/audio/libogg \
 		tag.1:${PORTSDIR}/audio/taglib \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
+		musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
 		tunepimp.5:${PORTSDIR}/audio/libtunepimp \
 		xine.1:${PORTSDIR}/multimedia/libxine \
 		swscale.1:${PORTSDIR}/multimedia/ffmpeg
@@ -30,7 +28,6 @@ RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
 RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame
 .endif
 
-CONFLICTS=	dolphin-plugins-mplayerthumbs-1.*
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
@@ -42,8 +39,8 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 USE_OPENLDAP=	yes
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	PULSEAUDIO "KMix control for PulseAudio" off \
-		ALSA "Build with ALSA compatibility library" off
+OPTIONS=	ALSA "Build with ALSA compatibility library" off \
+		PULSEAUDIO "KMix control for PulseAudio" off
 
 .include <bsd.port.options.mk>
 
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 5ba53a2e6d8a..75821f6698be 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdemultimedia-4.5.5.tar.bz2) = 86dc2c1e8656d4a505d17804a3e20e8420c36f3f2a52d46fd51523dc5e2caa9e
-SIZE (KDE/kdemultimedia-4.5.5.tar.bz2) = 1588980
+SHA256 (KDE/kdemultimedia-4.6.1.tar.bz2) = 3e800b06a218736f67ddb85b244f89cf994d87e5508782f48aafcf3d355e0e4d
+SIZE (KDE/kdemultimedia-4.6.1.tar.bz2) = 1611856
diff --git a/multimedia/kdemultimedia4/files/extrapatch-CMakeLists.txt b/multimedia/kdemultimedia4/files/extrapatch-CMakeLists.txt
index 7ffea797073a..1a24ca8d6cc8 100644
--- a/multimedia/kdemultimedia4/files/extrapatch-CMakeLists.txt
+++ b/multimedia/kdemultimedia4/files/extrapatch-CMakeLists.txt
@@ -18,3 +18,21 @@
  
  macro_optional_find_package(FFmpeg)
  macro_log_feature(FFMPEG_FOUND "FFmpeg" "FFmpeg libraries" "FFmpeg" FALSE "http://www.ffmpeg.org" "FFmpeg required for FFMpegVideoPreview backend")
+--- ./kmix/CMakeLists.txt.orig  2011-02-13 14:28:03.000000000 -0200
++++ ./kmix/CMakeLists.txt       2011-02-13 14:28:01.000000000 -0200
+@@ -1,13 +1,12 @@
+ project(kmix)
+ 
+ # search packages used by KDE
+-find_package(Alsa)
+-
+ set(PULSEAUDIO_MINIMUM_VERSION "0.9.12")
+ macro_optional_find_package(PulseAudio)
+ 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")
+-alsa_configure_file(${CMAKE_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)
+ 
+ add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
+ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index 99149025fba4..c4e92e58b51a 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -18,6 +18,7 @@ lib/kde4/dragonpart.so
 lib/kde4/ffmpegthumbs.so
 lib/kde4/kcm_audiocd.so
 lib/kde4/kcm_cddb.so
+lib/kde4/kded_kmixd.so
 lib/kde4/kio_audiocd.so
 lib/kde4/libaudiocd_encoder_flac.so
 lib/kde4/libaudiocd_encoder_lame.so
@@ -69,7 +70,10 @@ 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/konqsidebartng/virtual_folders/services/audiocd.desktop
 share/apps/kscd/skin/Chrome.svg
@@ -163,6 +167,7 @@ share/kde4/services/audiocd.desktop
 share/kde4/services/audiocd.protocol
 share/kde4/services/dragonplayer_part.desktop
 share/kde4/services/ffmpegthumbs.desktop
+share/kde4/services/kded/kmixd.desktop
 share/kde4/services/kmixctrl_restore.desktop
 share/kde4/services/libkcddb.desktop
 share/kde4/services/videopreview.desktop