5 files changed, 33 insertions, 34 deletions

diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index cb4d2b393983..2f513198ca2d 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	kmplayer
-PORTVERSION=	0.8.3a
-PORTREVISION=	1
+PORTVERSION=	0.8.4.r2
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://www.xs4all.nl/%7Ejjvrieze/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.r/rc/}
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.r/-rc/}
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	KDE frontend to mplayer
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
index 4d988e5bf0cb..af0cd62afc03 100644
--- a/multimedia/kmplayer/distinfo
+++ b/multimedia/kmplayer/distinfo
@@ -1,2 +1,2 @@
-MD5 (kmplayer-0.8.3a.tar.bz2) = 61bc23921bb69094d12e308b15e7e365
-SIZE (kmplayer-0.8.3a.tar.bz2) = 628073
+MD5 (kmplayer-0.8.4-rc2.tar.bz2) = 9df8b3dcd6a2e8525658716e480067d6
+SIZE (kmplayer-0.8.4-rc2.tar.bz2) = 577049
diff --git a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop b/multimedia/kmplayer/files/patch-src::kmplayer.desktop
index f7ac08e69811..d511ad2df3d3 100644
--- a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
+++ b/multimedia/kmplayer/files/patch-src::kmplayer.desktop
@@ -1,12 +1,11 @@
---- 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 @@
+--- src/kmplayer.desktop.orig	Wed Nov 10 23:22:35 2004
++++ src/kmplayer.desktop	Wed Nov 10 23:24:51 2004
+@@ -35,7 +35,7 @@
  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
deleted file mode 100644
index 80ee5567a937..000000000000
--- a/multimedia/kmplayer/files/patch-src::kmplayerpartbase.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 6f06f5283089..293a8d9643c7 100644
--- a/multimedia/kmplayer/pkg-plist
+++ b/multimedia/kmplayer/pkg-plist
@@ -13,24 +13,36 @@ share/apps/kmplayer/kmplayerpartui.rc
 share/apps/kmplayer/kmplayerui.rc
 share/apps/kmplayer/pluginsinfo
 share/config/kmplayerrc
-share/icons/crystalsvg/32x32/apps/kmplayer.png
-share/icons/locolor/16x16/apps/kmplayer.png
-share/icons/locolor/32x32/apps/kmplayer.png
+share/icons/crystalsvg/scalable/apps/kmplayer.svgz
+share/icons/hicolor/128x128/apps/kmplayer.png
+share/icons/hicolor/16x16/apps/kmplayer.png
+share/icons/hicolor/22x22/apps/kmplayer.png
+share/icons/hicolor/32x32/apps/kmplayer.png
+share/icons/hicolor/48x48/apps/kmplayer.png
+share/icons/hicolor/64x64/apps/kmplayer.png
+share/icons/hicolor/scalable/apps/kmplayer.svgz
 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
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/scalable/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/scalable 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/scalable/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/scalable 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
 @unexec rmdir %D/share/config 2>/dev/null || true