Update to KDE 3.4

Highlights at a glance

* Text-to-speech system with support built into Konqueror, Kate, KPDF
  and the standalone application KSayIt
* Support for text to speech synthesis is integrated with the desktop
* Completely redesigned, more flexible trash system
* Kicker with improved look and feel
* KPDF now enables you to select, copy & paste text and images from
  PDFs, along with many other improvements
* Kontact supports now various groupware servers, including eGroupware,
  GroupWise, Kolab, OpenGroupware.org and SLOX
* Kopete supports Novell Groupwise and Lotus Sametime and gets
  integrated into Kontact
* DBUS/HAL support allows to keep dynamic device icons in media:/ and
  on the desktop in sync with the state of all devices
* KHTML has improved standard support and now close to full support for
  CSS 2.1 and the CSS 3 Selectors module
* Better synchronization between 2 PCs
* A new high contrast style and a complete monochrome icon set
* An icon effect to paint all icons in two chosen colors, converting
  third party application icons into high contrast monochrome icons
* Akregator allows you to read news from your favourite RSS-enabled
  websites in one application
* Juk has now an album cover management via Google Image Search
* KMail now stores passwords securely with KWallet
* SVG files can now be used as wallpapers
* KHTML plug-ins are now configurable, so the user can selectively
  disable ones that are not used. This does not include Netscape-style
  plug-ins. Netscape plug-in in CPU usage can be manually lowered, and
  plug-ins are more stable.
* more than 6,500 bugs have been fixed
* more than 1,700 wishes have been fullfilled
* more than 80,000 contributions with several million lines of code and
  documentation added or changed

7 files changed, 27 insertions, 60 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index d2ae0f051ff..3a8902f274e 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2005/03/06 13:02:59 markd Exp $
+# $NetBSD: Makefile,v 1.22 2005/03/23 21:59:47 markd Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
-PKGREVISION=	2
 CATEGORIES=	multimedia
 COMMENT=	Multimedia tools for the KDE integrated X11 desktop
 
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
index 20b93fea0c5..37eca62e8ec 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/03/06 13:02:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/03/23 21:59:47 markd Exp $
 bin/artsbuilder
 bin/artscontrol
 bin/juk
@@ -23,6 +23,8 @@ 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
@@ -31,12 +33,15 @@ 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
@@ -221,6 +226,7 @@ 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
@@ -307,6 +313,7 @@ lib/mcop/Arts/Synth_COMPRESSOR.mcopclass
 lib/mcop/Arts/Synth_DATA.mcopclass
 lib/mcop/Arts/Synth_DEBUG.mcopclass
 lib/mcop/Arts/Synth_DELAY.mcopclass
+lib/mcop/Arts/Synth_DIV.mcopclass
 lib/mcop/Arts/Synth_ENVELOPE_ADSR.mcopclass
 lib/mcop/Arts/Synth_FM_SOURCE.mcopclass
 lib/mcop/Arts/Synth_FREEVERB.mcopclass
@@ -440,6 +447,7 @@ share/doc/kde/HTML/en/artsbuilder/images/Synth_CDELAY.png
 share/doc/kde/HTML/en/artsbuilder/images/Synth_COMPRESSOR.png
 share/doc/kde/HTML/en/artsbuilder/images/Synth_DEBUG.png
 share/doc/kde/HTML/en/artsbuilder/images/Synth_DELAY.png
+share/doc/kde/HTML/en/artsbuilder/images/Synth_DIV.png
 share/doc/kde/HTML/en/artsbuilder/images/Synth_ENVELOPE_ADSR.png
 share/doc/kde/HTML/en/artsbuilder/images/Synth_FILEPLAY.png
 share/doc/kde/HTML/en/artsbuilder/images/Synth_FM_SOURCE.png
@@ -493,12 +501,16 @@ 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/kmid/common
 share/doc/kde/HTML/en/kmid/index.cache.bz2
 share/doc/kde/HTML/en/kmid/index.docbook
 share/doc/kde/HTML/en/kmix/common
 share/doc/kde/HTML/en/kmix/index.cache.bz2
 share/doc/kde/HTML/en/kmix/index.docbook
+share/doc/kde/HTML/en/kmix/kmix-channel-playback.png
+share/doc/kde/HTML/en/kmix/kmix-channel-record.png
+share/doc/kde/HTML/en/kmix/kmix-window.png
 share/doc/kde/HTML/en/krec/common
 share/doc/kde/HTML/en/krec/index.cache.bz2
 share/doc/kde/HTML/en/krec/index.docbook
@@ -596,6 +608,7 @@ share/kde/apps/artsbuilder/pics/Synth_ATAN_SATURATE.xpm
 share/kde/apps/artsbuilder/pics/Synth_BUS_DOWNLINK.xpm
 share/kde/apps/artsbuilder/pics/Synth_BUS_UPLINK.xpm
 share/kde/apps/artsbuilder/pics/Synth_DEBUG.xpm
+share/kde/apps/artsbuilder/pics/Synth_DIV.xpm
 share/kde/apps/artsbuilder/pics/Synth_ENVELOPE_ADSR.xpm
 share/kde/apps/artsbuilder/pics/Synth_FILEPLAY.xpm
 share/kde/apps/artsbuilder/pics/Synth_MIDI_DEBUG.xpm
@@ -647,6 +660,7 @@ share/kde/apps/kaudiocreator/pics/check.png
 share/kde/apps/kconf_update/audiocd.upd
 share/kde/apps/kconf_update/kaudiocreator-libkcddb.upd
 share/kde/apps/kconf_update/kaudiocreator-meta.upd
+share/kde/apps/kconf_update/kcmcddb-emailsettings.upd
 share/kde/apps/kconf_update/noatun.upd
 share/kde/apps/kconf_update/noatun20update
 share/kde/apps/kconf_update/upgrade-kaudiocreator-metadata.sh
@@ -701,6 +715,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_play.desktop
 share/kde/apps/konqueror/servicemenus/jukservicemenu.desktop
 share/kde/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
 share/kde/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
@@ -766,6 +781,7 @@ share/kde/apps/noatun/monoscope.plugin
 share/kde/apps/noatun/net.plugin
 share/kde/apps/noatun/noatunui.plugin
 share/kde/apps/noatun/simple.plugin
+share/kde/apps/noatun/simpleui.rc
 share/kde/apps/noatun/skins/kaiman/car-preset/btn_exit.png
 share/kde/apps/noatun/skins/kaiman/car-preset/btn_iconify.png
 share/kde/apps/noatun/skins/kaiman/car-preset/btn_list.png
@@ -950,6 +966,7 @@ share/kde/apps/noatun/systray.plugin
 share/kde/apps/noatun/systrayui.rc
 share/kde/apps/noatun/voiceprint.plugin
 share/kde/apps/noatun/winskin.plugin
+share/kde/apps/noatun/yhconfig.kcfg
 share/kde/apps/profiles/kscd.profile.xml
 share/kde/apps/videothumbnail/sprocket-large.png
 share/kde/apps/videothumbnail/sprocket-medium.png
@@ -1044,6 +1061,7 @@ 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/locolor/16x16/apps/kaudiocreator.png
 share/kde/icons/locolor/32x32/apps/kaudiocreator.png
@@ -1182,6 +1200,7 @@ 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
 @comment in kde: @dirrm share/doc/kde/HTML/en/kcontrol
 @dirrm share/doc/kde/HTML/en/kaboodle
diff --git a/multimedia/kdemultimedia3/buildlink3.mk b/multimedia/kdemultimedia3/buildlink3.mk
index 10e64e1cb0b..11f5fb0a108 100644
--- a/multimedia/kdemultimedia3/buildlink3.mk
+++ b/multimedia/kdemultimedia3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:13:02 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/03/23 21:59:47 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.3.0nb1
+BUILDLINK_RECOMMENDED.kdemultimedia+=	kdemultimedia>=3.4.0
 BUILDLINK_PKGSRCDIR.kdemultimedia?=	../../multimedia/kdemultimedia3
 .endif	# KDEMULTIMEDIA_BUILDLINK3_MK
 
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 01f43b04c24..af7ff646850 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,19 +1,16 @@
-$NetBSD: distinfo,v 1.15 2005/03/19 01:03:38 markd Exp $
+$NetBSD: distinfo,v 1.16 2005/03/23 21:59:47 markd Exp $
 
-SHA1 (kdemultimedia-3.3.2.tar.bz2) = 383515292f8c02df9a960a2e9c511aebacf13b78
-RMD160 (kdemultimedia-3.3.2.tar.bz2) = b41cfeb8b410e1da1fb128e928c8aecaf66c8b00
-Size (kdemultimedia-3.3.2.tar.bz2) = 5384470 bytes
+SHA1 (kdemultimedia-3.4.0.tar.bz2) = 7095f197bbe949620ed5f8e9ab14d483f9e0b94c
+RMD160 (kdemultimedia-3.4.0.tar.bz2) = 45ea82a38bb770a7fdd8b36d0697d18735d8347c
+Size (kdemultimedia-3.4.0.tar.bz2) = 5581865 bytes
 SHA1 (patch-aa) = 1e0694a956357d759a73a010e9a4700d5072ebf7
 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
 SHA1 (patch-ad) = 272548cfda5b9d8ea2fd16d7d490ef74a5c349e6
-SHA1 (patch-ae) = 3bede7137841708b43e63500972f4c4e84fcfedb
 SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2
 SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1
 SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
-SHA1 (patch-as) = d38a8d2769b4d65fb3e8d7ffc738380f5dbc4867
-SHA1 (patch-at) = f985efe71df1cfb21e10b02dc23c8d5e8b1651d4
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
 SHA1 (patch-cu) = 5a93444eee0f7aabbdc2879debc56eac28e1deed
diff --git a/multimedia/kdemultimedia3/patches/patch-ae b/multimedia/kdemultimedia3/patches/patch-ae
deleted file mode 100644
index 752e10c795b..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2004/12/10 06:13:03 markd Exp $
-
---- akode/lib/localfile.h.orig	2004-08-06 07:25:17.000000000 +1200
-+++ akode/lib/localfile.h
-@@ -63,6 +63,8 @@ public:
- 
-     void fadvise();
- 
-+#undef fileno
-+
-     int fileno() const;
- };
- 
diff --git a/multimedia/kdemultimedia3/patches/patch-as b/multimedia/kdemultimedia3/patches/patch-as
deleted file mode 100644
index 9eed58ef63b..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-as
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-as,v 1.1 2005/03/19 01:03:38 markd Exp $
-
---- kmix/mixer_sun.cpp.orig	2004-11-29 06:06:35.000000000 +1300
-+++ kmix/mixer_sun.cpp
-@@ -422,7 +422,7 @@ bool Mixer_SUN::isRecsrcHW( int devnum )
- //======================================================================
- void Mixer_SUN::VolumeToGainBalance( Volume& volume, uint_t& gain, uchar_t& balance )
- {
--   if ( ( volume.channels() == 1 ) ||
-+   if ( ( volume.count() == 1 ) ||
-         ( volume[Volume::LEFT] == volume[Volume::RIGHT] ) )
-    {
-       gain = volume[Volume::LEFT];
-@@ -454,7 +454,7 @@ void Mixer_SUN::VolumeToGainBalance( Vol
- //======================================================================
- void Mixer_SUN::GainBalanceToVolume( uint_t& gain, uchar_t& balance, Volume& volume )
- {
--   if ( volume.channels() == 1 )
-+   if ( volume.count() == 1 )
-    {
-       volume.setVolume( Volume::LEFT, gain );
-    }
diff --git a/multimedia/kdemultimedia3/patches/patch-at b/multimedia/kdemultimedia3/patches/patch-at
deleted file mode 100644
index 4546f664868..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-at
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-at,v 1.1 2005/03/19 01:03:38 markd Exp $
-
---- mpeglib_artsplug/decoderBaseObject_impl.h.orig	2005-03-18 09:31:02.544121000 +1300
-+++ mpeglib_artsplug/decoderBaseObject_impl.h
-@@ -64,7 +64,7 @@ class DecoderBaseObject_impl :
- 
-   bool m_streaming;
- 
--  queue<DataPacket<mcopbyte>*> *m_packetQueue;
-+  std::queue<DataPacket<mcopbyte>*> *m_packetQueue;
- 
- public:
-