Update KDE to 3.5.4

Changes unknown

4 files changed, 9 insertions, 22 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 2395a01a71e..de7b68ecea8 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2006/07/12 13:10:56 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2006/08/02 13:57:23 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 87b19057036..308609154a2 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2006/03/30 02:48:36 markd Exp $
+@comment $NetBSD: PLIST,v 1.23 2006/08/02 13:57:23 markd Exp $
 bin/artsbuilder
 bin/artscontrol
 bin/juk
@@ -201,6 +201,7 @@ lib/kde3/noatun_voiceprint.la
 lib/kde3/noatun_winskin.la
 lib/kde3/noatunsimple.la
 lib/kde3/videothumbnail.la
+lib/libarts_audiofile.la
 lib/libarts_mpeglib.la
 lib/libarts_splay.la
 lib/libarts_xine.la
@@ -219,7 +220,6 @@ lib/libartsmoduleseffects.la
 lib/libartsmodulesmixers.la
 lib/libartsmodulessynth.la
 lib/libaudiocdplugins.la
-lib/libaudiofilearts.la
 lib/libkcddb.la
 lib/libkdeinit_kmix.la
 lib/libkdeinit_kmixctrl.la
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 9bbbaced76d..a9cd4b0d489 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2006/06/27 14:53:42 wiz Exp $
+$NetBSD: distinfo,v 1.32 2006/08/02 13:57:23 markd Exp $
 
-SHA1 (kdemultimedia-3.5.3.tar.bz2) = 2a75ba49bbc513b4ab5cb0d039949984742f94f5
-RMD160 (kdemultimedia-3.5.3.tar.bz2) = 2ae4ba9266b84b972e3bcd106896b6ea0124aa32
-Size (kdemultimedia-3.5.3.tar.bz2) = 6276838 bytes
+SHA1 (kdemultimedia-3.5.4.tar.bz2) = a435563cc45fb8f26090471792956c03d50c51c2
+RMD160 (kdemultimedia-3.5.4.tar.bz2) = 43cb463eb609fc7d8104b069e64d8e6550440fff
+Size (kdemultimedia-3.5.4.tar.bz2) = 6276789 bytes
 SHA1 (patch-aa) = 6decff5d7eb5a306f90e5d7cbbae039f4995641f
 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
@@ -21,4 +21,4 @@ SHA1 (patch-ao) = 1c849de2e1696c4f4e81b660a42b26e2a1c5440e
 SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
 SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5
 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e
-SHA1 (patch-cu) = a1f6dc932f51251b278d995115ae2c316e861daa
+SHA1 (patch-cu) = 778e1d00bf485c55ddec7cebb47406f87b9e4ec8
diff --git a/multimedia/kdemultimedia3/patches/patch-cu b/multimedia/kdemultimedia3/patches/patch-cu
index 890f022db26..7636873220c 100644
--- a/multimedia/kdemultimedia3/patches/patch-cu
+++ b/multimedia/kdemultimedia3/patches/patch-cu
@@ -1,4 +1,4 @@
-$NetBSD: patch-cu,v 1.7 2006/06/21 19:19:36 joerg Exp $
+$NetBSD: patch-cu,v 1.8 2006/08/02 13:57:23 markd Exp $
 
 --- kioslave/audiocd/audiocd.cpp.orig	2006-05-22 18:06:24.000000000 +0000
 +++ kioslave/audiocd/audiocd.cpp
@@ -13,18 +13,6 @@ $NetBSD: patch-cu,v 1.7 2006/06/21 19:19:36 joerg Exp $
  	void paranoiaCallback(long, int);
  
  	#include <kdemacros.h>
-@@ -213,7 +213,11 @@ struct cdrom_drive * AudioCDProtocol::in
- 		return 0;
- 
- 	// Update our knowledge of the disc
-+#if defined(Q_OS_FREEBSD)
-+	d->cd.setDevice(drive->cdda_device_name, 50, false);
-+#else
- 	d->cd.setDevice(drive->ioctl_device_name, 50, false);
-+#endif
- #if 0
- 	// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
- 	// support for non-SCSI devices. Although it finds ATA cdroms just
 @@ -857,7 +861,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.