5 files changed, 41 insertions, 92 deletions

diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index f357901b26be..892efb1a649d 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -8,28 +8,27 @@ PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	multimedia kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Multimedia applications
 
-LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
-		FLAC:${PORTSDIR}/audio/flac \
-		cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
-		ogg:${PORTSDIR}/audio/libogg \
-		tag:${PORTSDIR}/audio/taglib \
-		theora:${PORTSDIR}/multimedia/libtheora \
-		vorbis:${PORTSDIR}/audio/libvorbis \
-		mp3lame:${PORTSDIR}/audio/lame \
+LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
+		cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia \
+		ogg.5:${PORTSDIR}/audio/libogg \
+		tag.6:${PORTSDIR}/audio/taglib \
+		vorbis.4:${PORTSDIR}/audio/libvorbis \
+		musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		tunepimp.5:${PORTSDIR}/audio/libtunepimp \
 		xine.1:${PORTSDIR}/multimedia/libxine
-RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
+RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools \
+		lame:${PORTSDIR}/audio/lame
 
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
-USE_KDE4=	kdelibs workspace kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 21fb7e108b89..3d2ef12280c7 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-4.1.4.tar.bz2) = 4a4e046f0b862e7be9e916e0e29ed188
-SHA256 (KDE/kdemultimedia-4.1.4.tar.bz2) = f8c219a5b926e724e256dd1c2a99093a5c8e2f8d324f9539e3bf93d8fdab14e3
-SIZE (KDE/kdemultimedia-4.1.4.tar.bz2) = 1443501
+MD5 (KDE/kdemultimedia-4.2.0.tar.bz2) = 3e944c87888ac1ac5b11d3722dd31f88
+SHA256 (KDE/kdemultimedia-4.2.0.tar.bz2) = 632e920dfabda4600cbe9519aae75c8c47bd502fd013baa950db27926509ed36
+SIZE (KDE/kdemultimedia-4.2.0.tar.bz2) = 1550040
diff --git a/multimedia/kdemultimedia4/files/patch-CMakeLists.txt b/multimedia/kdemultimedia4/files/patch-CMakeLists.txt
deleted file mode 100644
index fd2660935b7a..000000000000
--- a/multimedia/kdemultimedia4/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../CMakeLists.txt.orgi	2008-07-24 15:05:33.000000000 +0200
-+++ ../CMakeLists.txt	2008-07-24 15:05:59.000000000 +0200
-@@ -40,10 +40,11 @@
- macro_optional_add_subdirectory(strigi-analyzer)
- macro_optional_add_subdirectory(kioslave)
- macro_optional_add_subdirectory(kmix)
--if(XINE_XCB_FOUND)
--  macro_optional_add_subdirectory(dragonplayer)
--else(XINE_XCB_FOUND)
--  message( STATUS "Xine and phonon-xine must be compiled with XCB support.")
--endif(XINE_XCB_FOUND)
-+#if(XINE_XCB_FOUND)
-+#  macro_optional_add_subdirectory(dragonplayer)
-+#else(XINE_XCB_FOUND)
-+#  message( STATUS "Xine and phonon-xine must be compiled with XCB support.")
-+#endif(XINE_XCB_FOUND)
-+add_subdirectory(dragonplayer)
- 
- macro_display_feature_log()
diff --git a/multimedia/kdemultimedia4/files/patch-doc-CMakeLists.txt b/multimedia/kdemultimedia4/files/patch-doc-CMakeLists.txt
deleted file mode 100644
index 91a91d95c588..000000000000
--- a/multimedia/kdemultimedia4/files/patch-doc-CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/CMakeLists.txt.orgi	2008-07-24 15:24:33.000000000 +0200
-+++ ../doc/CMakeLists.txt	2008-07-24 15:24:55.000000000 +0200
-@@ -3,9 +3,7 @@
- endif(TAGLIB_FOUND)
- add_subdirectory(kioslave)
- add_subdirectory(kmix)
--if(XINE_XCB_FOUND)
--  add_subdirectory(dragonplayer)
--endif(XINE_XCB_FOUND)
-+add_subdirectory(dragonplayer)
- if (NOT APPLE)
-   add_subdirectory(kscd)
- endif (NOT APPLE)
diff --git a/multimedia/kdemultimedia4/pkg-plist b/multimedia/kdemultimedia4/pkg-plist
index 067ab7bb4bfd..866220bc8b96 100644
--- a/multimedia/kdemultimedia4/pkg-plist
+++ b/multimedia/kdemultimedia4/pkg-plist
@@ -3,7 +3,6 @@ bin/juk
 bin/kmix
 bin/kmixctrl
 bin/kscd
-bin/workman2cddb.pl
 include/audiocdencoder.h
 include/libkcddb/cdinfo.h
 include/libkcddb/cdinfodialog.h
@@ -24,13 +23,13 @@ lib/kde4/libaudiocd_encoder_vorbis.so
 lib/kde4/libaudiocd_encoder_wav.so
 lib/libaudiocdplugins.so
 lib/libaudiocdplugins.so.5
-lib/libaudiocdplugins.so.5.0.0
+lib/libaudiocdplugins.so.5.0.1
 lib/libkcddb.so
 lib/libkcddb.so.5
-lib/libkcddb.so.5.0.0
+lib/libkcddb.so.5.0.1
 lib/libkcompactdisc.so
 lib/libkcompactdisc.so.5
-lib/libkcompactdisc.so.5.0.0
+lib/libkcompactdisc.so.5.0.1
 lib/libkdeinit4_kmix.so
 lib/libkdeinit4_kmixctrl.so
 share/applications/kde4/dragonplayer.desktop
@@ -70,7 +69,14 @@ share/apps/kmix/pics/mix_volume.png
 share/apps/kmix/profiles/ALSA.default.xml
 share/apps/kmix/profiles/OSS.default.xml
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
+share/apps/kscd/skin/BubbleGum.svg
+share/apps/kscd/skin/Melon.svg
+share/apps/kscd/skin/NGRemote.svg
+share/apps/kscd/skin/Orange2.svg
+share/apps/kscd/skin/SquaredMelon.svg
+share/apps/kscd/skin/default.svg
 share/apps/profiles/kscd.profile.xml
+share/apps/solid/actions/dragonplayer-opendvd.desktop
 share/autostart/kmix_autostart.desktop
 share/autostart/restore_kmix_volumes.desktop
 share/config.kcfg/audiocd_lame_encoder.kcfg
@@ -82,6 +88,7 @@ share/dbus-1/interfaces/org.kde.KMix.xml
 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/dbus-1/interfaces/org.kde.kscd.cdplayer.xml
 share/doc/HTML/en/dragonplayer/common
 share/doc/HTML/en/dragonplayer/index.cache.bz2
 share/doc/HTML/en/dragonplayer/index.docbook
@@ -97,6 +104,9 @@ 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/doc/HTML/en/kioslave/audiocd/common
+share/doc/HTML/en/kioslave/audiocd/index.cache.bz2
+share/doc/HTML/en/kioslave/audiocd/index.docbook
 share/doc/HTML/en/kmix/common
 share/doc/HTML/en/kmix/index.cache.bz2
 share/doc/HTML/en/kmix/index.docbook
@@ -144,6 +154,7 @@ share/icons/hicolor/64x64/apps/kmix.png
 share/icons/hicolor/64x64/apps/kscd.png
 share/icons/hicolor/scalable/apps/dragonplayer.svgz
 share/icons/oxygen/16x16/actions/player-volume-muted.png
+share/icons/oxygen/22x22/actions/kscd-dock.png
 share/icons/oxygen/22x22/actions/player-volume-muted.png
 share/icons/oxygen/32x32/actions/player-volume-muted.png
 share/icons/oxygen/48x48/actions/player-volume-muted.png
@@ -156,47 +167,18 @@ share/kde4/services/audiocd.protocol
 share/kde4/services/dragonplayer_part.desktop
 share/kde4/services/kmixctrl_restore.desktop
 share/kde4/services/libkcddb.desktop
-@dirrmtry share/kde4/services/ServiceMenus
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/doc/HTML/en/kscd
-@dirrmtry share/doc/HTML/en/kmix
-@dirrmtry share/doc/HTML/en/juk
+@dirrm share/doc/HTML/en/kscd
+@dirrm share/doc/HTML/en/kmix
+@dirrm share/doc/HTML/en/kioslave/audiocd
+@dirrm share/doc/HTML/en/juk
 @dirrm share/doc/HTML/en/dragonplayer
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
-@dirrmtry share/doc
-@dirrmtry share/dbus-1/interfaces
-@dirrmtry share/dbus-1
-@dirrmtry share/config.kcfg
-@dirrmtry share/autostart
-@dirrmtry share/apps/profiles
-@dirrmtry share/apps/konqsidebartng/virtual_folders/services
-@dirrmtry share/apps/konqsidebartng/virtual_folders
-@dirrmtry share/apps/konqsidebartng
-@dirrmtry share/apps/kmix/profiles
-@dirrmtry share/apps/kmix/pics
-@dirrmtry share/apps/kmix
-@dirrmtry share/apps/kconf_update
-@dirrmtry share/apps/juk/pics
-@dirrmtry share/apps/juk
+@dirrm share/apps/kscd/skin
+@dirrm share/apps/kscd
+@dirrm share/apps/kmix/profiles
+@dirrm share/apps/kmix/pics
+@dirrm share/apps/kmix
+@dirrm share/apps/juk/pics
+@dirrm share/apps/juk
 @dirrm share/apps/dragonplayer
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications
-@dirrmtry lib/kde4
-@dirrmtry include/libkcompactdisc
-@dirrmtry include/libkcddb
-@dirrmtry include
+@dirrm include/libkcompactdisc
+@dirrm include/libkcddb