Update to KDE 3.5.8

11 files changed, 77 insertions, 15 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 777e26e74e18..1394b9973791 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	4
+PORTREVISION=	0
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index e5a3658d052d..205a5351d44e 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-3.5.7.tar.bz2) = 3d18574ca14258fb565160aa84bf217c
-SHA256 (KDE/kdemultimedia-3.5.7.tar.bz2) = 7fda798eed8ad5c2b3a2f729f9790aba24ff23f5e40c0fc4aca77c40d5d6f6a5
-SIZE (KDE/kdemultimedia-3.5.7.tar.bz2) = 6347766
+MD5 (KDE/kdemultimedia-3.5.8.tar.bz2) = 9f3c95231ea265b09f3010adb954ae30
+SHA256 (KDE/kdemultimedia-3.5.8.tar.bz2) = 07fc79e38bd7d50a8e2b9910a5d78ef565557b2a746b31d5d440829e9f05b0c1
+SIZE (KDE/kdemultimedia-3.5.8.tar.bz2) = 6316739
diff --git a/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp b/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp
new file mode 100644
index 000000000000..3d11f3160e7e
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp
@@ -0,0 +1,20 @@
+--- kioslave/audiocd/plugins/lame/encoderlame.cpp.orig	2007-10-25 14:58:32.000000000 +0200
++++ kioslave/audiocd/plugins/lame/encoderlame.cpp	2007-10-25 14:58:42.000000000 +0200
+@@ -17,7 +17,7 @@
+ */
+ 
+ #include <config.h>
+-#include <endian.h>
++#include <sys/endian.h>
+ #include "encoderlame.h"
+ #include "encoderlameconfig.h"
+ #include "audiocd_lame_encoder.h"
+@@ -221,7 +221,7 @@
+ 	// -x bitswap
+ 	// -r raw/pcm
+ 	// -s 44.1 (because it is raw you have to specify this)
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 	*(d->currentEncodeProcess)	<< "lame" << "--verbose" << "-x" << "-r" << "-s" << "44.1";
+ #else
+ 	*(d->currentEncodeProcess)      << "lame" << "--verbose" << "-r" << "-s" << "44.1";
diff --git a/multimedia/kdemultimedia3/files/patch-kscd_libwm_include-wm_config.h b/multimedia/kdemultimedia3/files/patch-kscd_libwm_include-wm_config.h
new file mode 100644
index 000000000000..036aa466000d
--- /dev/null
+++ b/multimedia/kdemultimedia3/files/patch-kscd_libwm_include-wm_config.h
@@ -0,0 +1,11 @@
+--- kscd/libwm/include/wm_config.h.orig	2007-10-25 15:02:40.000000000 +0200
++++ kscd/libwm/include/wm_config.h	2007-10-25 15:02:50.000000000 +0200
+@@ -131,6 +131,8 @@
+  ******************************************************************/
+ #if defined(__FreeBSD__) || defined(__FreeBSD)
+ 
++#include <osreldate.h>
++
+ #if __FreeBSD_version >= 500100
+ #define DEFAULT_CD_DEVICE	"/dev/acd0"
+ #else
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 777e26e74e18..1394b9973791 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	4
+PORTREVISION=	0
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index e5a3658d052d..205a5351d44e 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-3.5.7.tar.bz2) = 3d18574ca14258fb565160aa84bf217c
-SHA256 (KDE/kdemultimedia-3.5.7.tar.bz2) = 7fda798eed8ad5c2b3a2f729f9790aba24ff23f5e40c0fc4aca77c40d5d6f6a5
-SIZE (KDE/kdemultimedia-3.5.7.tar.bz2) = 6347766
+MD5 (KDE/kdemultimedia-3.5.8.tar.bz2) = 9f3c95231ea265b09f3010adb954ae30
+SHA256 (KDE/kdemultimedia-3.5.8.tar.bz2) = 07fc79e38bd7d50a8e2b9910a5d78ef565557b2a746b31d5d440829e9f05b0c1
+SIZE (KDE/kdemultimedia-3.5.8.tar.bz2) = 6316739
diff --git a/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp b/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp
new file mode 100644
index 000000000000..3d11f3160e7e
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/patch-kioslave_audiocd_plugins_lame-encoderlame.cpp
@@ -0,0 +1,20 @@
+--- kioslave/audiocd/plugins/lame/encoderlame.cpp.orig	2007-10-25 14:58:32.000000000 +0200
++++ kioslave/audiocd/plugins/lame/encoderlame.cpp	2007-10-25 14:58:42.000000000 +0200
+@@ -17,7 +17,7 @@
+ */
+ 
+ #include <config.h>
+-#include <endian.h>
++#include <sys/endian.h>
+ #include "encoderlame.h"
+ #include "encoderlameconfig.h"
+ #include "audiocd_lame_encoder.h"
+@@ -221,7 +221,7 @@
+ 	// -x bitswap
+ 	// -r raw/pcm
+ 	// -s 44.1 (because it is raw you have to specify this)
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 	*(d->currentEncodeProcess)	<< "lame" << "--verbose" << "-x" << "-r" << "-s" << "44.1";
+ #else
+ 	*(d->currentEncodeProcess)      << "lame" << "--verbose" << "-r" << "-s" << "44.1";
diff --git a/multimedia/kdemultimedia4/files/patch-kscd_libwm_include-wm_config.h b/multimedia/kdemultimedia4/files/patch-kscd_libwm_include-wm_config.h
new file mode 100644
index 000000000000..036aa466000d
--- /dev/null
+++ b/multimedia/kdemultimedia4/files/patch-kscd_libwm_include-wm_config.h
@@ -0,0 +1,11 @@
+--- kscd/libwm/include/wm_config.h.orig	2007-10-25 15:02:40.000000000 +0200
++++ kscd/libwm/include/wm_config.h	2007-10-25 15:02:50.000000000 +0200
+@@ -131,6 +131,8 @@
+  ******************************************************************/
+ #if defined(__FreeBSD__) || defined(__FreeBSD)
+ 
++#include <osreldate.h>
++
+ #if __FreeBSD_version >= 500100
+ #define DEFAULT_CD_DEVICE	"/dev/acd0"
+ #else
diff --git a/multimedia/noatun-plugins/distinfo b/multimedia/noatun-plugins/distinfo
index 26eff06f4e05..7eac88841e0f 100644
--- a/multimedia/noatun-plugins/distinfo
+++ b/multimedia/noatun-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeaddons-3.5.7.tar.bz2) = 7b50fa8e103bd722dfcdfc329126ff28
-SHA256 (KDE/kdeaddons-3.5.7.tar.bz2) = b95d00802b0e34147a3540518dcdf6d6532ff1acaaf7bb165e0aee2a95effbcd
-SIZE (KDE/kdeaddons-3.5.7.tar.bz2) = 1735896
+MD5 (KDE/kdeaddons-3.5.8.tar.bz2) = 4a338f14210ad920bb54624cd330dd89
+SHA256 (KDE/kdeaddons-3.5.8.tar.bz2) = e505a472ef2dd70e36992802fc33939a65be80bb8610a28bac6f639fa2ce2868
+SIZE (KDE/kdeaddons-3.5.8.tar.bz2) = 1726291
diff --git a/multimedia/noatun-plugins/pkg-plist b/multimedia/noatun-plugins/pkg-plist
index 066929450650..532cc91a2944 100644
--- a/multimedia/noatun-plugins/pkg-plist
+++ b/multimedia/noatun-plugins/pkg-plist
@@ -43,7 +43,7 @@ lib/kde3/noatunwakeup.so
 lib/kde3/noatunwavecapture.a
 lib/kde3/noatunwavecapture.la
 lib/kde3/noatunwavecapture.so
-share/applications/kdeaddons-noatun-plugins-3.5.7
+share/applications/kdeaddons-noatun-plugins-3.5.8
 share/apps/noatun/alsaplayerui.plugin
 share/apps/noatun/blurscope.plugin
 share/apps/noatun/charlatanui.plugin
diff --git a/multimedia/xine_artsplugin/distinfo b/multimedia/xine_artsplugin/distinfo
index e5a3658d052d..205a5351d44e 100644
--- a/multimedia/xine_artsplugin/distinfo
+++ b/multimedia/xine_artsplugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-3.5.7.tar.bz2) = 3d18574ca14258fb565160aa84bf217c
-SHA256 (KDE/kdemultimedia-3.5.7.tar.bz2) = 7fda798eed8ad5c2b3a2f729f9790aba24ff23f5e40c0fc4aca77c40d5d6f6a5
-SIZE (KDE/kdemultimedia-3.5.7.tar.bz2) = 6347766
+MD5 (KDE/kdemultimedia-3.5.8.tar.bz2) = 9f3c95231ea265b09f3010adb954ae30
+SHA256 (KDE/kdemultimedia-3.5.8.tar.bz2) = 07fc79e38bd7d50a8e2b9910a5d78ef565557b2a746b31d5d440829e9f05b0c1
+SIZE (KDE/kdemultimedia-3.5.8.tar.bz2) = 6316739