5 files changed, 192 insertions, 69 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 55a50fb09ab4..5a4f6326e705 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -4,11 +4,9 @@
 # Whom:					Alan Eldridge <alane@freebsd.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -20,6 +18,7 @@ COMMENT=	Multimedia utilities for the KDE integrated X11 desktop
 CONFLICTS=	juk-1*
 
 LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
+		akode:${PORTSDIR}/audio/akode \
 		FLAC:${PORTSDIR}/audio/flac \
 		cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
 		ogg:${PORTSDIR}/audio/libogg \
@@ -38,6 +37,7 @@ GNU_CONFIGURE=	yes
 MAKE_ENV=	${CONFIGURE_ENV}
 
 CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}" --disable-xinetest
+CONFIGURE_ENV+=	AKODE_CONFIG=${LOCALBASE}/bin/akode-config
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 87b7455e0327..121084bfd270 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,2 +1,3 @@
-MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
-SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757
+MD5 (KDE/kdemultimedia-3.5.0.tar.bz2) = dd0ba9ccb2f522508c6543cd24e54c98
+SHA256 (KDE/kdemultimedia-3.5.0.tar.bz2) = 85112c1e36ffcbc95266b0dd7d6b78e003607580de522ae49ef527c35e2ae35a
+SIZE (KDE/kdemultimedia-3.5.0.tar.bz2) = 5519386
diff --git a/multimedia/kdemultimedia3/files/patch-configure b/multimedia/kdemultimedia3/files/patch-configure
deleted file mode 100644
index 32db97a1e6d3..000000000000
--- a/multimedia/kdemultimedia3/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sun Jul  3 02:53:19 2005
-+++ configure	Sun Jul  3 02:54:03 2005
-@@ -33404,7 +33404,7 @@
- 
- echo "$as_me:$LINENO: result: $ac_cv_x86_sse" >&5
- echo "${ECHO_T}$ac_cv_x86_sse" >&6
--if eval "test \"`echo `$ac_cv_x86_sse\" = yes"; then
-+if eval "test \" `echo `$ac_cv_x86_sse\" = yes"; then
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_X86_SSE 1
diff --git a/multimedia/kdemultimedia3/files/patch-post-3.5.0-audiocd b/multimedia/kdemultimedia3/files/patch-post-3.5.0-audiocd
new file mode 100644
index 000000000000..b1989c1d697e
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-post-3.5.0-audiocd
@@ -0,0 +1,118 @@
+--- kioslave/audiocd/audiocd.cpp	2005/11/09 09:19:18	479118
++++ kioslave/audiocd/audiocd.cpp	2006/01/04 13:15:18	494259
+@@ -219,7 +219,40 @@
+ #if defined(Q_OS_LINUX)
+ 	cd.setDevice(drive->cdda_device_name, 50, false);
+ #elif defined(Q_OS_FREEBSD)
+-	cd.setDevice(drive->dev->device_path);
++        // FreeBSD's cdparanoia as of january 5th 2006 has rather broken
++        // support for non-SCSI devices. Although it finds ATA cdroms just
++        // fine, there is no straightforward way to discover the device
++        // name associated with the device, which throws the rest of audiocd
++        // for a loop.
++        //
++        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.
++                //
++                kdWarning(7117) << "Found an ATAPI device, assuming it is the one specified by the user." << endl;
++                cd.setDevice( d->device );
++        }
++        else
++        {
++                kdDebug(7117) << "Found a SCSI or ATAPICAM device." << endl;
++                if ( strlen(drive->dev->device_path) > 0 )
++                {
++                        cd.setDevice( drive->dev->device_path );
++                }
++                else
++                {
++                        // But the device_path can be empty under some
++                        // circumstances, so build a representation from
++                        // the unit number and SCSI device name.
++                        //
++                        QString devname = QString::fromLatin1( "/dev/%1%2" )
++                               .arg( drive->dev->given_dev_name )
++                               .arg( drive->dev->given_unit_number ) ;
++                        kdDebug(7117) << "  Using derived name " << devname << endl;
++                        cd.setDevice( devname );
++                 }
++        }
+ #endif
+ 	
+ 	if (cd.discId() != d->discid && cd.discId() != cd.missingDisc){
+
+
+--- kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp	2005/12/17 19:47:34	489232
++++ kioslave/audiocd/kcmaudiocd/kcmaudiocd.cpp	2006/01/05 22:39:27	494647
+@@ -64,7 +64,7 @@
+     }
+    
+     //CDDA Options
+-    connect(cd_autosearch_check,SIGNAL(clicked()),this,SLOT(slotConfigChanged()));
++    connect(cd_specify_device,SIGNAL(clicked()),this,SLOT(slotConfigChanged()));
+     connect(ec_enable_check,SIGNAL(clicked()),this,SLOT(slotEcEnable()));
+     connect(ec_skip_check,SIGNAL(clicked()),SLOT(slotConfigChanged()));
+     connect(cd_device_string,SIGNAL(textChanged(const QString &)),SLOT(slotConfigChanged()));
+@@ -99,7 +99,7 @@
+ }
+ 
+ void KAudiocdModule::defaults() {
+-	cd_autosearch_check->setChecked(true);
++	cd_specify_device->setChecked(false);
+ 	cd_device_string->setText("/dev/cdrom");
+ 
+ 	ec_enable_check->setChecked(true);
+@@ -124,7 +124,11 @@
+   {
+     KConfigGroupSaver saver(config, "CDDA");
+ 
+-    config->writeEntry("autosearch",cd_autosearch_check->isChecked());
++    // autosearch is the name of the config option, which has the
++    // reverse sense of the current text of the configuration option,
++    // which is specify the device. Therefore, invert the value on write.
++    //
++    config->writeEntry("autosearch", !(cd_specify_device->isChecked()) );
+     config->writeEntry("device",cd_device_string->text());
+     config->writeEntry("disable_paranoia",!(ec_enable_check->isChecked()));
+     config->writeEntry("never_skip",!(ec_skip_check->isChecked()));
+@@ -156,7 +160,8 @@
+   {
+     KConfigGroupSaver saver(config, "CDDA");
+ 
+-    cd_autosearch_check->setChecked(config->readBoolEntry("autosearch",true));
++    // Specify <=> not autosearch, as explained above in ::save()
++    cd_specify_device->setChecked( !(config->readBoolEntry("autosearch",true)) );
+     cd_device_string->setText(config->readEntry("device","/dev/cdrom"));
+     ec_enable_check->setChecked(!(config->readBoolEntry("disable_paranoia",false)));
+     ec_skip_check->setChecked(!(config->readBoolEntry("never_skip",true)));
+
+--- kioslave/audiocd/kcmaudiocd/audiocdconfig.ui	2005/10/02 06:23:59	466277
++++ kioslave/audiocd/kcmaudiocd/audiocdconfig.ui	2006/01/05 22:39:27	494647
+@@ -149,13 +149,13 @@
+                     </widget>
+                     <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
+                         <property name="name">
+-                            <cstring>cd_autosearch_check</cstring>
++                            <cstring>cd_specify_device</cstring>
+                         </property>
+                         <property name="text">
+                             <string>&amp;Specify CD device:</string>
+                         </property>
+                         <property name="whatsThis" stdset="0">
+-                            <string>Uncheck this if you want to specify a CD device different from the one autoprobed</string>
++                            <string>Check this to specify a CD device different from the one which is detected automatically</string>
+                         </property>
+                     </widget>
+                     <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3">
+@@ -597,7 +597,7 @@
+         <slot>setEnabled(bool)</slot>
+     </connection>
+     <connection>
+-        <sender>cd_autosearch_check</sender>
++        <sender>cd_specify_device</sender>
+         <signal>toggled(bool)</signal>
+         <receiver>cd_device_string</receiver>
+         <slot>setEnabled(bool)</slot>
+
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index b6b0113e5732..5ae631783579 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -86,6 +86,8 @@ lib/kde3/kfile_mp3.la
 lib/kde3/kfile_mp3.so
 lib/kde3/kfile_mpc.la
 lib/kde3/kfile_mpc.so
+lib/kde3/kfile_mpeg.la
+lib/kde3/kfile_mpeg.so
 lib/kde3/kfile_ogg.la
 lib/kde3/kfile_ogg.so
 lib/kde3/kfile_sid.la
@@ -156,6 +158,8 @@ lib/kde3/noatun_winskin.la
 lib/kde3/noatun_winskin.so
 lib/kde3/noatunsimple.la
 lib/kde3/noatunsimple.so
+lib/libarts_akode.la
+lib/libarts_akode.so
 lib/libartsbuilder.la
 lib/libartsbuilder.so
 lib/libartsbuilder.so.0
@@ -331,6 +335,14 @@ lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass
 lib/mcop/Noatun/WinSkinFFT.mcopclass
 lib/mcop/RawWriter.mcopclass
 lib/mcop/VoiceRemoval.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
@@ -540,6 +552,7 @@ share/apps/kmix/pics/mix_treble.png
 share/apps/kmix/pics/mix_unknown.png
 share/apps/kmix/pics/mix_video.png
 share/apps/kmix/pics/mix_volume.png
+share/apps/konqueror/servicemenus/audiocd_extract.desktop
 share/apps/konqueror/servicemenus/audiocd_play.desktop
 share/apps/krec/icons/crystalsvg/16x16/actions/krec_record.png
 share/apps/krec/icons/crystalsvg/22x22/actions/krec_record.png
@@ -881,10 +894,7 @@ share/doc/HTML/en/juk/toolbar.png
 share/doc/HTML/en/kaboodle/common
 share/doc/HTML/en/kaboodle/index.cache.bz2
 share/doc/HTML/en/kaboodle/index.docbook
-share/doc/HTML/en/kcontrol/kmixcfg/common
-share/doc/HTML/en/kcontrol/kmixcfg/index.cache.bz2
-share/doc/HTML/en/kcontrol/kmixcfg/index.docbook
-share/doc/HTML/en/kio_audiocd/audiocd.docbook
+share/doc/HTML/en/kioslave/audiocd.docbook
 share/doc/HTML/en/kmid/common
 share/doc/HTML/en/kmid/index.cache.bz2
 share/doc/HTML/en/kmid/index.docbook
@@ -917,7 +927,6 @@ share/doc/HTML/en/kscd/kscd3.png
 share/doc/HTML/en/kscd/kscd5.png
 share/doc/HTML/en/kscd/kscd6.png
 share/doc/HTML/en/kscd/kscd9.png
-share/doc/HTML/en/kscd/kscdannounc.png
 share/doc/HTML/en/noatun/common
 share/doc/HTML/en/noatun/index.cache.bz2
 share/doc/HTML/en/noatun/index.docbook
@@ -926,80 +935,80 @@ share/icons/crystalsvg/128x128/actions/artsenvironment.png
 share/icons/crystalsvg/128x128/actions/artsfftscope.png
 share/icons/crystalsvg/128x128/actions/artsmediatypes.png
 share/icons/crystalsvg/128x128/actions/artsmidimanager.png
-share/icons/crystalsvg/128x128/apps/artscontrol.png
-share/icons/crystalsvg/128x128/apps/kaboodle.png
-share/icons/crystalsvg/128x128/apps/kmix.png
-share/icons/crystalsvg/128x128/apps/krec.png
-share/icons/crystalsvg/128x128/apps/kscd.png
-share/icons/crystalsvg/128x128/apps/noatun.png
 share/icons/crystalsvg/16x16/actions/artsaudiomanager.png
 share/icons/crystalsvg/16x16/actions/artsbuilderexecute.png
 share/icons/crystalsvg/16x16/actions/artsenvironment.png
 share/icons/crystalsvg/16x16/actions/artsfftscope.png
 share/icons/crystalsvg/16x16/actions/artsmediatypes.png
 share/icons/crystalsvg/16x16/actions/artsmidimanager.png
-share/icons/crystalsvg/16x16/apps/artsbuilder.png
-share/icons/crystalsvg/16x16/apps/artscontrol.png
-share/icons/crystalsvg/16x16/apps/kaboodle.png
-share/icons/crystalsvg/16x16/apps/kaudiocreator.png
-share/icons/crystalsvg/16x16/apps/kmid.png
-share/icons/crystalsvg/16x16/apps/kmix.png
-share/icons/crystalsvg/16x16/apps/krec.png
-share/icons/crystalsvg/16x16/apps/kscd.png
-share/icons/crystalsvg/16x16/apps/noatun.png
 share/icons/crystalsvg/22x22/actions/artsaudiomanager.png
 share/icons/crystalsvg/22x22/actions/artsbuilderexecute.png
 share/icons/crystalsvg/22x22/actions/artsenvironment.png
 share/icons/crystalsvg/22x22/actions/artsfftscope.png
 share/icons/crystalsvg/22x22/actions/artsmediatypes.png
 share/icons/crystalsvg/22x22/actions/artsmidimanager.png
-share/icons/crystalsvg/22x22/apps/artscontrol.png
-share/icons/crystalsvg/22x22/apps/kaboodle.png
-share/icons/crystalsvg/22x22/apps/krec.png
-share/icons/crystalsvg/22x22/apps/noatun.png
 share/icons/crystalsvg/32x32/actions/artsaudiomanager.png
 share/icons/crystalsvg/32x32/actions/artsenvironment.png
 share/icons/crystalsvg/32x32/actions/artsfftscope.png
 share/icons/crystalsvg/32x32/actions/artsmediatypes.png
 share/icons/crystalsvg/32x32/actions/artsmidimanager.png
-share/icons/crystalsvg/32x32/apps/artscontrol.png
-share/icons/crystalsvg/32x32/apps/kaboodle.png
-share/icons/crystalsvg/32x32/apps/kaudiocreator.png
-share/icons/crystalsvg/32x32/apps/kmid.png
-share/icons/crystalsvg/32x32/apps/kmix.png
-share/icons/crystalsvg/32x32/apps/krec.png
-share/icons/crystalsvg/32x32/apps/kscd.png
-share/icons/crystalsvg/32x32/apps/noatun.png
 share/icons/crystalsvg/48x48/actions/artsaudiomanager.png
 share/icons/crystalsvg/48x48/actions/artsenvironment.png
 share/icons/crystalsvg/48x48/actions/artsfftscope.png
 share/icons/crystalsvg/48x48/actions/artsmediatypes.png
 share/icons/crystalsvg/48x48/actions/artsmidimanager.png
-share/icons/crystalsvg/48x48/apps/artscontrol.png
-share/icons/crystalsvg/48x48/apps/kaboodle.png
-share/icons/crystalsvg/48x48/apps/kmid.png
-share/icons/crystalsvg/48x48/apps/kmix.png
-share/icons/crystalsvg/48x48/apps/krec.png
-share/icons/crystalsvg/48x48/apps/kscd.png
-share/icons/crystalsvg/48x48/apps/noatun.png
 share/icons/crystalsvg/64x64/actions/artsaudiomanager.png
 share/icons/crystalsvg/64x64/actions/artsenvironment.png
 share/icons/crystalsvg/64x64/actions/artsfftscope.png
 share/icons/crystalsvg/64x64/actions/artsmediatypes.png
 share/icons/crystalsvg/64x64/actions/artsmidimanager.png
-share/icons/crystalsvg/64x64/apps/artscontrol.png
-share/icons/crystalsvg/64x64/apps/kaboodle.png
-share/icons/crystalsvg/64x64/apps/kmix.png
-share/icons/crystalsvg/64x64/apps/krec.png
-share/icons/crystalsvg/64x64/apps/kscd.png
-share/icons/crystalsvg/64x64/apps/noatun.png
-share/icons/crystalsvg/scalable/actions/artsaudiomanager.svg
-share/icons/crystalsvg/scalable/actions/artsenvironment.svg
-share/icons/crystalsvg/scalable/actions/artsfftscope.svg
-share/icons/crystalsvg/scalable/actions/artsmediatypes.svg
-share/icons/crystalsvg/scalable/actions/artsmidimanager.svg
-share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/icons/crystalsvg/scalable/apps/artscontrol.svg
+share/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz
+share/icons/crystalsvg/scalable/actions/artsenvironment.svgz
+share/icons/crystalsvg/scalable/actions/artsfftscope.svgz
+share/icons/crystalsvg/scalable/actions/artsmediatypes.svgz
+share/icons/crystalsvg/scalable/actions/artsmidimanager.svgz
+share/icons/hicolor/128x128/apps/artscontrol.png
+share/icons/hicolor/128x128/apps/kaboodle.png
+share/icons/hicolor/128x128/apps/kmix.png
+share/icons/hicolor/128x128/apps/krec.png
+share/icons/hicolor/128x128/apps/kscd.png
+share/icons/hicolor/128x128/apps/noatun.png
+share/icons/hicolor/16x16/apps/artsbuilder.png
+share/icons/hicolor/16x16/apps/artscontrol.png
+share/icons/hicolor/16x16/apps/kaboodle.png
+share/icons/hicolor/16x16/apps/kaudiocreator.png
+share/icons/hicolor/16x16/apps/kmid.png
+share/icons/hicolor/16x16/apps/kmix.png
+share/icons/hicolor/16x16/apps/krec.png
+share/icons/hicolor/16x16/apps/kscd.png
+share/icons/hicolor/16x16/apps/noatun.png
+share/icons/hicolor/22x22/apps/artscontrol.png
+share/icons/hicolor/22x22/apps/kaboodle.png
+share/icons/hicolor/22x22/apps/krec.png
+share/icons/hicolor/22x22/apps/noatun.png
+share/icons/hicolor/32x32/apps/artscontrol.png
+share/icons/hicolor/32x32/apps/kaboodle.png
+share/icons/hicolor/32x32/apps/kaudiocreator.png
+share/icons/hicolor/32x32/apps/kmid.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/32x32/apps/krec.png
+share/icons/hicolor/32x32/apps/kscd.png
+share/icons/hicolor/32x32/apps/noatun.png
+share/icons/hicolor/48x48/apps/artscontrol.png
+share/icons/hicolor/48x48/apps/kaboodle.png
+share/icons/hicolor/48x48/apps/kmid.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/hicolor/48x48/apps/krec.png
+share/icons/hicolor/48x48/apps/kscd.png
+share/icons/hicolor/48x48/apps/noatun.png
+share/icons/hicolor/64x64/apps/artscontrol.png
+share/icons/hicolor/64x64/apps/kaboodle.png
+share/icons/hicolor/64x64/apps/kmix.png
+share/icons/hicolor/64x64/apps/krec.png
+share/icons/hicolor/64x64/apps/kscd.png
+share/icons/hicolor/64x64/apps/noatun.png
+share/icons/hicolor/scalable/apps/artsbuilder.svgz
+share/icons/hicolor/scalable/apps/artscontrol.svgz
 share/icons/locolor/16x16/apps/kaudiocreator.png
 share/icons/locolor/32x32/apps/kaudiocreator.png
 share/mimelnk/application/x-artsbuilder.desktop
@@ -1017,6 +1026,7 @@ share/services/kfile_flac.desktop
 share/services/kfile_m3u.desktop
 share/services/kfile_mp3.desktop
 share/services/kfile_mpc.desktop
+share/services/kfile_mpeg.desktop
 share/services/kfile_ogg.desktop
 share/services/kfile_sid.desktop
 share/services/kfile_theora.desktop
@@ -1026,14 +1036,19 @@ share/services/krec_exportogg.desktop
 share/services/krec_exportwave.desktop
 share/servicetypes/audiomidi.desktop
 share/servicetypes/krec_exportitem.desktop
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdemultimedia-apidocs/libkcddb/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdemultimedia-apidocs/libkcddb/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdemultimedia-apidocs/libkcddb/html
 @dirrm share/mimelnk/interface
 @dirrm share/doc/HTML/en/noatun
 @dirrm share/doc/HTML/en/kscd
 @dirrm share/doc/HTML/en/krec
 @dirrm share/doc/HTML/en/kmix
 @dirrm share/doc/HTML/en/kmid
-@dirrm share/doc/HTML/en/kio_audiocd
-@dirrm share/doc/HTML/en/kcontrol/kmixcfg
+@dirrm share/doc/HTML/en/kioslave
+@dirrm share/doc/HTML/en/kdemultimedia-apidocs/libkcddb/html
+@dirrm share/doc/HTML/en/kdemultimedia-apidocs/libkcddb
+@dirrm share/doc/HTML/en/kdemultimedia-apidocs
 @dirrm share/doc/HTML/en/kaboodle
 @dirrm share/doc/HTML/en/juk
 @dirrm share/doc/HTML/en/artsbuilder/images