5 files changed, 22 insertions, 8 deletions

diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 08734ccaf6d1..15159e0c2c7d 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kmplayer
-PORTVERSION=	0.8.3.r2
+PORTVERSION=	0.8.3.r4
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://www.xs4all.nl/%7Ejjvrieze/
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.r/rc/}
@@ -17,7 +17,6 @@ COMMENT=	KDE frontend to mplayer
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
 
 USE_BZIP2=	yes
-WRKSRC=		${WRKDIR}/kmplayer
 USE_KDEBASE_VER=3
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
index d2b0e6d0a384..a09a373f560e 100644
--- a/multimedia/kmplayer/distinfo
+++ b/multimedia/kmplayer/distinfo
@@ -1,2 +1,2 @@
-MD5 (kmplayer-0.8.3rc2.tar.bz2) = 0c82c38d2f23f521edc4bcb2006b78d3
-SIZE (kmplayer-0.8.3rc2.tar.bz2) = 515989
+MD5 (kmplayer-0.8.3rc4.tar.bz2) = b3cda09a7e414efef3851e3540c89957
+SIZE (kmplayer-0.8.3rc4.tar.bz2) = 495090
diff --git a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop b/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
index dd5941b87872..f7ac08e69811 100644
--- a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
+++ b/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
@@ -1,11 +1,12 @@
---- src/kmplayer.desktop.orig	Wed Jun 23 13:30:00 2004
-+++ src/kmplayer.desktop	Wed Jun 23 13:31:37 2004
-@@ -36,7 +36,7 @@
+--- src/kmplayer.desktop.orig	Mon Jul 19 23:08:46 2004
++++ src/kmplayer.desktop	Mon Jul 19 23:10:31 2004
+@@ -38,7 +38,8 @@
  Name[sv]=Kmplayer
  Name[ta]=கேஎம்இயக்கி
  Name[xx]=xxKMPlayerxx
 -MimeType=audio/x-mp3;audio/mpegurl;audio/x-pn-realaudio;audio/x-scpls;audio/x-vorbis;application/x-kmplayer;application/x-mplayer2;application/x-ogg;audio/x-mp2;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;video/x-avi;video/x-ms-asf;video/x-ms-wmp;video/x-ms-wmv;video/x-msvideo;video/quicktime;video/x-flic;
-+MimeType=audio/x-mp3;audio/x-pn-realaudio;audio/x-scpls;audio/x-vorbis;application/x-kmplayer;application/x-mplayer2;application/x-ogg;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;video/x-ms-wmp;video/x-ms-wmv;video/x-msvideo;video/quicktime;video/x-flic;application/vnd.ms-asf;application/vnd.rn-realmedia;audio/ac3;audio/vorbis;audio/x-matroska;video/x-matroska;video/x-ogm;
++MimeType=audio/x-mp3;audio/x-pn-realaudio;audio/x-scpls;audio/x-vorbis;application/x-kmplayer;application/x-mplayer2;application/x-ogg;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;video/x-ms-wmp;video/x-ms-wmv;video/x-msvideo;video/quicktime;video/x-flic;application/vnd.ms-asf;application/vnd.rn-realmedia;audio/ac3;audio/vorbis;audio/x-matroska;video/x-matroska;video/x
++-ogm;
  InitialPreference=7
  Categories=Qt;KDE;AudioVideo
  GenericName=Media Player
diff --git a/multimedia/kmplayer/files/patch-src::kmplayerpartbase.cpp b/multimedia/kmplayer/files/patch-src::kmplayerpartbase.cpp
new file mode 100644
index 000000000000..80ee5567a937
--- /dev/null
+++ b/multimedia/kmplayer/files/patch-src::kmplayerpartbase.cpp
@@ -0,0 +1,11 @@
+--- src/kmplayerpartbase.cpp.orig	Mon Jul 19 23:52:11 2004
++++ src/kmplayerpartbase.cpp	Tue Jul 20 00:01:41 2004
+@@ -716,7 +716,7 @@
+ }
+ 
+ QString KMPlayerSource::mime () const {
+-    return m_currenturl == m_refurls.end () ? QString () : m_currenturl->mime;
++    return (m_refurls.end () == m_currenturl) ? QString () : m_currenturl->mime;
+ }
+ 
+ void KMPlayerSource::setMime (const QString & m) {
diff --git a/multimedia/kmplayer/pkg-plist b/multimedia/kmplayer/pkg-plist
index adb0610a0f0c..6f06f5283089 100644
--- a/multimedia/kmplayer/pkg-plist
+++ b/multimedia/kmplayer/pkg-plist
@@ -17,6 +17,9 @@ share/icons/crystalsvg/32x32/apps/kmplayer.png
 share/icons/locolor/16x16/apps/kmplayer.png
 share/icons/locolor/32x32/apps/kmplayer.png
 share/services/kmplayer_part.desktop
+share/services/mms.protocol
+share/services/pnm.protocol
+share/services/rtsp.protocol
 @unexec rmdir %D/share/services 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true