Update to KDE 3.5

Many new features and refinements.

Notable changes include:
* Konqueror is the second web browser to pass the Acid2 CSS test,
  ahead of Firefox and Internet Explorer
* Konqueror can also now free web pages from adverts with its
  ad-block feature
* SuperKaramba is included in KDE, providing well-integrated and
  easy-to-install widgets for the user's desktop
* Kopete has support for MSN and Yahoo! webcams
* The edutainment module has three new applications (KGeography,
  Kanagram and blinKen), and has seen huge improvements in Kalzium

7 files changed, 145 insertions, 158 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index f6e64ab388f..3e7fcde0a23 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2005/12/11 09:40:45 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/11 11:20:51 markd Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	1
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
@@ -54,6 +53,7 @@ UNLIMIT_RESOURCES+=	datasize
 .include "../../audio/musicbrainz/buildlink3.mk"
 .include "../../audio/tunepimp/buildlink3.mk"
 .include "../../audio/taglib/buildlink3.mk"
+.include "../../multimedia/libtheora/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
index b67a7d4dadb..abd79848537 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2005/07/30 11:22:20 markd Exp $
+@comment $NetBSD: PLIST,v 1.19 2005/12/11 11:20:51 markd Exp $
 bin/artsbuilder
 bin/artscontrol
 bin/juk
@@ -19,30 +19,6 @@ bin/yaf-splay
 bin/yaf-tplay
 bin/yaf-vorbis
 bin/yaf-yuv
-include/akode/akodelib.h
-include/akode/audiobuffer.h
-include/akode/audioconfiguration.h
-include/akode/audioframe.h
-include/akode/auto_sink.h
-include/akode/converter.h
-include/akode/crossfader.h
-include/akode/decoder.h
-include/akode/encoder.h
-include/akode/fast_resampler.h
-include/akode/file.h
-include/akode/framedecoder.h
-include/akode/frametostream_decoder.h
-include/akode/localfile.h
-include/akode/magic.h
-include/akode/mmapfile.h
-include/akode/player.h
-include/akode/pluginhandler.h
-include/akode/resampler.h
-include/akode/sink.h
-include/akode/streamdecoder.h
-include/akode/streamtoframe_decoder.h
-include/akode/volumefilter.h
-include/akode/wav_decoder.h
 include/arts/artsbuilder.h
 include/arts/artsbuilder.idl
 include/arts/artsgui.h
@@ -187,8 +163,10 @@ lib/kde3/kfile_flac.la
 lib/kde3/kfile_m3u.la
 lib/kde3/kfile_mp3.la
 lib/kde3/kfile_mpc.la
+lib/kde3/kfile_mpeg.la
 lib/kde3/kfile_ogg.la
 lib/kde3/kfile_sid.la
+lib/kde3/kfile_theora.la
 lib/kde3/kfile_wav.la
 lib/kde3/kio_audiocd.la
 lib/kde3/kmix.la
@@ -223,12 +201,6 @@ lib/kde3/noatun_voiceprint.la
 lib/kde3/noatun_winskin.la
 lib/kde3/noatunsimple.la
 lib/kde3/videothumbnail.la
-lib/libakode.la
-lib/libakode_mpc_decoder.la
-lib/libakode_mpeg_decoder.la
-lib/libakode_oss_sink.la
-lib/libakode_xiph_decoder.la
-lib/libarts_akode.la
 lib/libarts_mpeglib.la
 lib/libarts_splay.la
 lib/libarts_xine.la
@@ -370,14 +342,6 @@ lib/mcop/RawWriter.mcopclass
 lib/mcop/SplayPlayObject.mcopclass
 lib/mcop/VoiceRemoval.mcopclass
 lib/mcop/WAVPlayObject.mcopclass
-lib/mcop/akodeMPCPlayObject.mcopclass
-lib/mcop/akodeMPEGPlayObject.mcopclass
-lib/mcop/akodePlayObject.mcopclass
-lib/mcop/akodeSpeexStreamPlayObject.mcopclass
-lib/mcop/akodeVorbisStreamPlayObject.mcopclass
-lib/mcop/akodeXiphPlayObject.mcopclass
-lib/mcop/akodearts.mcopclass
-lib/mcop/akodearts.mcoptype
 lib/mcop/artsbuilder.mcopclass
 lib/mcop/artsbuilder.mcoptype
 lib/mcop/artseffects.mcopclass
@@ -498,10 +462,7 @@ share/doc/kde/HTML/en/juk/toolbar.png
 share/doc/kde/HTML/en/kaboodle/common
 share/doc/kde/HTML/en/kaboodle/index.cache.bz2
 share/doc/kde/HTML/en/kaboodle/index.docbook
-share/doc/kde/HTML/en/kcontrol/kmixcfg/common
-share/doc/kde/HTML/en/kcontrol/kmixcfg/index.cache.bz2
-share/doc/kde/HTML/en/kcontrol/kmixcfg/index.docbook
-share/doc/kde/HTML/en/kio_audiocd/audiocd.docbook
+share/doc/kde/HTML/en/kioslave/audiocd.docbook
 share/doc/kde/HTML/en/kmid/common
 share/doc/kde/HTML/en/kmid/index.cache.bz2
 share/doc/kde/HTML/en/kmid/index.docbook
@@ -534,7 +495,6 @@ share/doc/kde/HTML/en/kscd/kscd3.png
 share/doc/kde/HTML/en/kscd/kscd5.png
 share/doc/kde/HTML/en/kscd/kscd6.png
 share/doc/kde/HTML/en/kscd/kscd9.png
-share/doc/kde/HTML/en/kscd/kscdannounc.png
 share/doc/kde/HTML/en/noatun/common
 share/doc/kde/HTML/en/noatun/index.cache.bz2
 share/doc/kde/HTML/en/noatun/index.docbook
@@ -633,6 +593,7 @@ share/kde/apps/artscontrol/artsmidimanagerview.rc
 share/kde/apps/juk/jukui-rtl.rc
 share/kde/apps/juk/jukui.rc
 share/kde/apps/juk/pics/playing.png
+share/kde/apps/juk/pics/splash.png
 share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
 share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
 share/kde/apps/kaboodle/kaboodlepartui.rc
@@ -716,6 +677,7 @@ share/kde/apps/kmix/pics/mix_treble.png
 share/kde/apps/kmix/pics/mix_unknown.png
 share/kde/apps/kmix/pics/mix_video.png
 share/kde/apps/kmix/pics/mix_volume.png
+share/kde/apps/konqueror/servicemenus/audiocd_extract.desktop
 share/kde/apps/konqueror/servicemenus/audiocd_play.desktop
 share/kde/apps/konqueror/servicemenus/jukservicemenu.desktop
 share/kde/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
@@ -984,29 +946,12 @@ share/kde/icons/crystalsvg/128x128/actions/artsenvironment.png
 share/kde/icons/crystalsvg/128x128/actions/artsfftscope.png
 share/kde/icons/crystalsvg/128x128/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/128x128/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/128x128/apps/artscontrol.png
-share/kde/icons/crystalsvg/128x128/apps/juk.png
-share/kde/icons/crystalsvg/128x128/apps/kaboodle.png
-share/kde/icons/crystalsvg/128x128/apps/kmix.png
-share/kde/icons/crystalsvg/128x128/apps/krec.png
-share/kde/icons/crystalsvg/128x128/apps/kscd.png
-share/kde/icons/crystalsvg/128x128/apps/noatun.png
 share/kde/icons/crystalsvg/16x16/actions/artsaudiomanager.png
 share/kde/icons/crystalsvg/16x16/actions/artsbuilderexecute.png
 share/kde/icons/crystalsvg/16x16/actions/artsenvironment.png
 share/kde/icons/crystalsvg/16x16/actions/artsfftscope.png
 share/kde/icons/crystalsvg/16x16/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/16x16/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/16x16/apps/artsbuilder.png
-share/kde/icons/crystalsvg/16x16/apps/artscontrol.png
-share/kde/icons/crystalsvg/16x16/apps/juk.png
-share/kde/icons/crystalsvg/16x16/apps/kaboodle.png
-share/kde/icons/crystalsvg/16x16/apps/kaudiocreator.png
-share/kde/icons/crystalsvg/16x16/apps/kmid.png
-share/kde/icons/crystalsvg/16x16/apps/kmix.png
-share/kde/icons/crystalsvg/16x16/apps/krec.png
-share/kde/icons/crystalsvg/16x16/apps/kscd.png
-share/kde/icons/crystalsvg/16x16/apps/noatun.png
 share/kde/icons/crystalsvg/22x22/actions/artsaudiomanager.png
 share/kde/icons/crystalsvg/22x22/actions/artsbuilderexecute.png
 share/kde/icons/crystalsvg/22x22/actions/artsenvironment.png
@@ -1014,56 +959,73 @@ share/kde/icons/crystalsvg/22x22/actions/artsfftscope.png
 share/kde/icons/crystalsvg/22x22/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/22x22/actions/artsmidimanager.png
 share/kde/icons/crystalsvg/22x22/actions/juk_dock.png
-share/kde/icons/crystalsvg/22x22/apps/artscontrol.png
-share/kde/icons/crystalsvg/22x22/apps/kaboodle.png
-share/kde/icons/crystalsvg/22x22/apps/krec.png
-share/kde/icons/crystalsvg/22x22/apps/noatun.png
 share/kde/icons/crystalsvg/32x32/actions/artsaudiomanager.png
 share/kde/icons/crystalsvg/32x32/actions/artsenvironment.png
 share/kde/icons/crystalsvg/32x32/actions/artsfftscope.png
 share/kde/icons/crystalsvg/32x32/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/32x32/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/32x32/apps/artscontrol.png
-share/kde/icons/crystalsvg/32x32/apps/juk.png
-share/kde/icons/crystalsvg/32x32/apps/kaboodle.png
-share/kde/icons/crystalsvg/32x32/apps/kaudiocreator.png
-share/kde/icons/crystalsvg/32x32/apps/kmid.png
-share/kde/icons/crystalsvg/32x32/apps/kmix.png
-share/kde/icons/crystalsvg/32x32/apps/krec.png
-share/kde/icons/crystalsvg/32x32/apps/kscd.png
-share/kde/icons/crystalsvg/32x32/apps/noatun.png
 share/kde/icons/crystalsvg/48x48/actions/artsaudiomanager.png
 share/kde/icons/crystalsvg/48x48/actions/artsenvironment.png
 share/kde/icons/crystalsvg/48x48/actions/artsfftscope.png
 share/kde/icons/crystalsvg/48x48/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/48x48/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/48x48/apps/artscontrol.png
-share/kde/icons/crystalsvg/48x48/apps/juk.png
-share/kde/icons/crystalsvg/48x48/apps/kaboodle.png
-share/kde/icons/crystalsvg/48x48/apps/kmid.png
-share/kde/icons/crystalsvg/48x48/apps/kmix.png
-share/kde/icons/crystalsvg/48x48/apps/krec.png
-share/kde/icons/crystalsvg/48x48/apps/kscd.png
-share/kde/icons/crystalsvg/48x48/apps/noatun.png
 share/kde/icons/crystalsvg/64x64/actions/artsaudiomanager.png
 share/kde/icons/crystalsvg/64x64/actions/artsenvironment.png
 share/kde/icons/crystalsvg/64x64/actions/artsfftscope.png
 share/kde/icons/crystalsvg/64x64/actions/artsmediatypes.png
 share/kde/icons/crystalsvg/64x64/actions/artsmidimanager.png
-share/kde/icons/crystalsvg/64x64/apps/artscontrol.png
-share/kde/icons/crystalsvg/64x64/apps/juk.png
-share/kde/icons/crystalsvg/64x64/apps/kaboodle.png
-share/kde/icons/crystalsvg/64x64/apps/kmix.png
-share/kde/icons/crystalsvg/64x64/apps/krec.png
-share/kde/icons/crystalsvg/64x64/apps/kscd.png
-share/kde/icons/crystalsvg/64x64/apps/noatun.png
-share/kde/icons/crystalsvg/scalable/actions/artsaudiomanager.svg
-share/kde/icons/crystalsvg/scalable/actions/artsenvironment.svg
-share/kde/icons/crystalsvg/scalable/actions/artsfftscope.svg
-share/kde/icons/crystalsvg/scalable/actions/artsmediatypes.svg
-share/kde/icons/crystalsvg/scalable/actions/artsmidimanager.svg
-share/kde/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/kde/icons/crystalsvg/scalable/apps/artscontrol.svg
+share/kde/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
+share/kde/icons/crystalsvg/scalable/actions/artsenvironment.svgz
+share/kde/icons/crystalsvg/scalable/actions/artsfftscope.svgz
+share/kde/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
+share/kde/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
+share/kde/icons/hicolor/128x128/apps/artscontrol.png
+share/kde/icons/hicolor/128x128/apps/juk.png
+share/kde/icons/hicolor/128x128/apps/kaboodle.png
+share/kde/icons/hicolor/128x128/apps/kmix.png
+share/kde/icons/hicolor/128x128/apps/krec.png
+share/kde/icons/hicolor/128x128/apps/kscd.png
+share/kde/icons/hicolor/128x128/apps/noatun.png
+share/kde/icons/hicolor/16x16/apps/artsbuilder.png
+share/kde/icons/hicolor/16x16/apps/artscontrol.png
+share/kde/icons/hicolor/16x16/apps/juk.png
+share/kde/icons/hicolor/16x16/apps/kaboodle.png
+share/kde/icons/hicolor/16x16/apps/kaudiocreator.png
+share/kde/icons/hicolor/16x16/apps/kmid.png
+share/kde/icons/hicolor/16x16/apps/kmix.png
+share/kde/icons/hicolor/16x16/apps/krec.png
+share/kde/icons/hicolor/16x16/apps/kscd.png
+share/kde/icons/hicolor/16x16/apps/noatun.png
+share/kde/icons/hicolor/22x22/apps/artscontrol.png
+share/kde/icons/hicolor/22x22/apps/kaboodle.png
+share/kde/icons/hicolor/22x22/apps/krec.png
+share/kde/icons/hicolor/22x22/apps/noatun.png
+share/kde/icons/hicolor/32x32/apps/artscontrol.png
+share/kde/icons/hicolor/32x32/apps/juk.png
+share/kde/icons/hicolor/32x32/apps/kaboodle.png
+share/kde/icons/hicolor/32x32/apps/kaudiocreator.png
+share/kde/icons/hicolor/32x32/apps/kmid.png
+share/kde/icons/hicolor/32x32/apps/kmix.png
+share/kde/icons/hicolor/32x32/apps/krec.png
+share/kde/icons/hicolor/32x32/apps/kscd.png
+share/kde/icons/hicolor/32x32/apps/noatun.png
+share/kde/icons/hicolor/48x48/apps/artscontrol.png
+share/kde/icons/hicolor/48x48/apps/juk.png
+share/kde/icons/hicolor/48x48/apps/kaboodle.png
+share/kde/icons/hicolor/48x48/apps/kmid.png
+share/kde/icons/hicolor/48x48/apps/kmix.png
+share/kde/icons/hicolor/48x48/apps/krec.png
+share/kde/icons/hicolor/48x48/apps/kscd.png
+share/kde/icons/hicolor/48x48/apps/noatun.png
+share/kde/icons/hicolor/64x64/apps/artscontrol.png
+share/kde/icons/hicolor/64x64/apps/juk.png
+share/kde/icons/hicolor/64x64/apps/kaboodle.png
+share/kde/icons/hicolor/64x64/apps/kmix.png
+share/kde/icons/hicolor/64x64/apps/krec.png
+share/kde/icons/hicolor/64x64/apps/kscd.png
+share/kde/icons/hicolor/64x64/apps/noatun.png
+share/kde/icons/hicolor/scalable/apps/artsbuilder.svgz
+share/kde/icons/hicolor/scalable/apps/artscontrol.svgz
 share/kde/icons/locolor/16x16/apps/kaudiocreator.png
 share/kde/icons/locolor/32x32/apps/kaudiocreator.png
 share/kde/mimelnk/application/x-artsbuilder.desktop
@@ -1081,8 +1043,10 @@ share/kde/services/kfile_flac.desktop
 share/kde/services/kfile_m3u.desktop
 share/kde/services/kfile_mp3.desktop
 share/kde/services/kfile_mpc.desktop
+share/kde/services/kfile_mpeg.desktop
 share/kde/services/kfile_ogg.desktop
 share/kde/services/kfile_sid.desktop
+share/kde/services/kfile_theora.desktop
 share/kde/services/kfile_wav.desktop
 share/kde/services/kmixctrl_restore.desktop
 share/kde/services/krec_exportmp3.desktop
@@ -1099,6 +1063,13 @@ share/kde/servicetypes/krec_exportitem.desktop
 @comment in kde: @dirrm share/kde/mimelnk/application
 @comment in kde: @dirrm share/kde/icons/locolor/32x32/apps
 @comment in kde: @dirrm share/kde/icons/locolor/16x16/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/actions
 @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
@@ -1201,8 +1172,11 @@ share/kde/servicetypes/krec_exportitem.desktop
 @dirrm share/doc/kde/HTML/en/krec
 @dirrm share/doc/kde/HTML/en/kmix
 @dirrm share/doc/kde/HTML/en/kmid
-@dirrm share/doc/kde/HTML/en/kio_audiocd
-@dirrm share/doc/kde/HTML/en/kcontrol/kmixcfg
+@dirrm share/doc/kde/HTML/en/kioslave
+@exec ${MKDIR} %D/share/doc/kde/HTML/en/kdemultimedia-apidocs/libkcddb/html
+@dirrm share/doc/kde/HTML/en/kdemultimedia-apidocs/libkcddb/html
+@dirrm share/doc/kde/HTML/en/kdemultimedia-apidocs/libkcddb
+@dirrm share/doc/kde/HTML/en/kdemultimedia-apidocs
 @comment in kde: @dirrm share/doc/kde/HTML/en/kcontrol
 @dirrm share/doc/kde/HTML/en/kaboodle
 @dirrm share/doc/kde/HTML/en/juk
@@ -1236,4 +1210,3 @@ share/kde/servicetypes/krec_exportitem.desktop
 @dirrm include/mpeglib
 @dirrm include/libkcddb
 @comment in arts: @dirrm include/arts
-@dirrm include/akode
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index 25874f24346..cb10bd2e6f0 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2005/12/11 09:40:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2005/12/11 11:20:51 markd Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 KDEMULTIMEDIA_BUILDLINK3_MK:=	${KDEMULTIMEDIA_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	kdemultimedia
 
 .if !empty(KDEMULTIMEDIA_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdemultimedia+=	kdemultimedia>=3.2.2
-BUILDLINK_RECOMMENDED.kdemultimedia+=	kdemultimedia>=3.4.3nb1
+BUILDLINK_RECOMMENDED.kdemultimedia+=	kdemultimedia>=3.5.0
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
 .endif	# KDEMULTIMEDIA_BUILDLINK3_MK
 
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 6d1f80bfe9a..3da229a3796 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.22 2005/10/13 12:52:11 markd Exp $
+$NetBSD: distinfo,v 1.23 2005/12/11 11:20:51 markd Exp $
 
-SHA1 (kdemultimedia-3.4.3.tar.bz2) = 8916577123446be621527603b31febb9997609ba
-RMD160 (kdemultimedia-3.4.3.tar.bz2) = 318ebd3149019ec2e5d98b57a548d3ef350a7924
-Size (kdemultimedia-3.4.3.tar.bz2) = 5495757 bytes
-SHA1 (patch-aa) = ecea21cb53b01cc98a15408becd319c2930b67d0
+SHA1 (kdemultimedia-3.5.0.tar.bz2) = 0d64a4d748dee95d7f7dbc03eb4f538f8c0a133d
+RMD160 (kdemultimedia-3.5.0.tar.bz2) = 1609307178bed9f46c19fb99743789d4799f1b54
+Size (kdemultimedia-3.5.0.tar.bz2) = 5519386 bytes
+SHA1 (patch-aa) = c722daaac3aa027eadeaeab8027003098d13486e
 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
 SHA1 (patch-ad) = faf216d3b26c6dfed1b2fa919de69b14a92d0966
+SHA1 (patch-ae) = 286ee08e2478bd9a417ae1270a0a851fb470570a
 SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2
 SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1
 SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
-SHA1 (patch-cu) = 5a93444eee0f7aabbdc2879debc56eac28e1deed
+SHA1 (patch-cu) = cd0c0a11c850f658e69015681d3ccca9d4be7d37
diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa
index 8f5ffad877b..e77d8871d7b 100644
--- a/multimedia/kdemultimedia3/patches/patch-aa
+++ b/multimedia/kdemultimedia3/patches/patch-aa
@@ -1,8 +1,35 @@
-$NetBSD: patch-aa,v 1.6 2005/03/24 22:41:58 markd Exp $
+$NetBSD: patch-aa,v 1.7 2005/12/11 11:20:51 markd Exp $
 
---- configure.orig	2005-03-05 01:31:57.000000000 +1300
+--- configure.orig	2005-11-26 20:14:02.000000000 +1300
 +++ configure
-@@ -35079,7 +35079,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
+@@ -34500,7 +34500,7 @@ fi
+ 
+   if test "x$have_ossaudio" = xyes; then
+     # for kmix/ and akode/
+-    LIBOSSAUDIO="-lossaudio"
++    LIBOSSAUDIO="${LIBOSSAUDIO}"
+   fi
+ 
+ 
+@@ -35097,7 +35097,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <cdda_interface.h>
++#include <cdparanoia/cdda_interface.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -35141,7 +35141,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <cdda_interface.h>
++#include <cdparanoia/cdda_interface.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -37888,7 +37888,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,25 +38,7 @@ $NetBSD: patch-aa,v 1.6 2005/03/24 22:41:58 markd Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -39778,7 +39780,7 @@ echo "${ECHO_T}incs=$para_incdir libs=$p
- echo "${ECHO_T}$with_cdparanoia" >&6
-     CDPARANOIA_ROOT="$with_cdparanoia"
-     if test "x$CDPARANOIA_ROOT" != "x/usr" ; then
--      CDPARANOIA_INCS="-I${CDPARANOIA_ROOT}/include"
-+      CDPARANOIA_INCS="-I${CDPARANOIA_ROOT}/include/cdparanoia"
-       CDPARANOIA_LIBS="-L${CDPARANOIA_ROOT}/lib "
-       if test "$USE_RPATH" = "yes" ; then
-         CDPARANOIA_RPATH="-R ${CDPARANOIA_ROOT}/lib"
-@@ -40333,7 +40335,7 @@ fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5
- echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6
- if test $ac_cv_lib_ossaudio_main = yes; then
--  LIBOSSAUDIO="-lossaudio"
-+  LIBOSSAUDIO="${LIBOSSAUDIO}"
- fi
- 
- 
-@@ -42057,8 +42059,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40058,8 +40058,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -55,7 +64,7 @@ $NetBSD: patch-aa,v 1.6 2005/03/24 22:41:58 markd Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -42121,7 +42138,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40122,7 +40137,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -78,7 +87,7 @@ $NetBSD: patch-aa,v 1.6 2005/03/24 22:41:58 markd Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -42185,7 +42217,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -40186,7 +40216,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
  
@@ -101,27 +110,7 @@ $NetBSD: patch-aa,v 1.6 2005/03/24 22:41:58 markd Exp $
  
  else
    echo "$as_me: failed program was:" >&5
-@@ -42231,8 +42278,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- 		#include <sys/types.h>
- 		typedef int16_t size16;
- 		typedef int32_t size32;
--                #include <cdda_interface.h>
--                #include <cdda_paranoia.h>
-+                #include <cdparanoia/cdda_interface.h>
-+                #include <cdparanoia/cdda_paranoia.h>
- 
- int
- main ()
-@@ -42283,7 +42330,7 @@ if test "${ac_cv_lib_cdda_paranoia_paran
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lcdda_paranoia -lcdda_paranoia -lcdda_interface $LIBS"
-+LIBS="-lcdda_paranoia -lm -lcdda_interface $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -42817,10 +42864,10 @@ _ACEOF
+@@ -40536,10 +40581,10 @@ _ACEOF
      ;;
  
    NetBSD)
diff --git a/multimedia/kdemultimedia3/patches/patch-ae b/multimedia/kdemultimedia3/patches/patch-ae
new file mode 100644
index 00000000000..4bbc2f9b8ae
--- /dev/null
+++ b/multimedia/kdemultimedia3/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.5 2005/12/11 11:20:51 markd Exp $
+
+--- kioslave/audiocd/plugins/wav/encodercda.cpp.orig	2005-12-02 23:53:51.000000000 +1300
++++ kioslave/audiocd/plugins/wav/encodercda.cpp
+@@ -42,7 +42,7 @@ const char * EncoderCda::mimeType() cons
+ // Remove this by calculating CD_FRAMESIZE_RAW from the frames
+ extern "C"
+ {
+-  #include <cdda_interface.h>
++  #include <cdparanoia/cdda_interface.h>
+ }
+ 
+ inline int16_t swap16 (int16_t i)
diff --git a/multimedia/kdemultimedia3/patches/patch-cu b/multimedia/kdemultimedia3/patches/patch-cu
index c31cf4bede6..86a6a5c8476 100644
--- a/multimedia/kdemultimedia3/patches/patch-cu
+++ b/multimedia/kdemultimedia3/patches/patch-cu
@@ -1,8 +1,19 @@
-$NetBSD: patch-cu,v 1.4 2004/10/14 11:10:00 markd Exp $
+$NetBSD: patch-cu,v 1.5 2005/12/11 11:20:51 markd Exp $
 
---- kioslave/audiocd/audiocd.cpp.orig	2004-08-05 19:25:33.000000000 +0000
-+++ kioslave/audiocd/audiocd.cpp	2004-10-10 19:38:46.000000000 +0000
-@@ -1092,7 +1092,7 @@
+--- kioslave/audiocd/audiocd.cpp.orig	2005-11-09 11:26:44.000000000 +1300
++++ kioslave/audiocd/audiocd.cpp
+@@ -26,8 +26,8 @@
+ 
+ extern "C"
+ {
+-	#include <cdda_interface.h>
+-	#include <cdda_paranoia.h>
++	#include <cdparanoia/cdda_interface.h>
++	#include <cdparanoia/cdda_paranoia.h>
+ 	void paranoiaCallback(long, int);
+ 	
+ 	#include <kdemacros.h>
+@@ -827,7 +827,7 @@ void AudioCDProtocol::paranoiaRead(
  		 * 2) Only increase in size unless the decrease is %5 of last estimate.
  		 * This prevents continues small changes which is just annoying.
  		 */