Update to 0.7.4.a

Approved by:	maintainer

8 files changed, 106 insertions, 20 deletions

diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index 930a7e2f7790..57bfe6f52c07 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	kmplayer
-PORTVERSION=	0.7.3
+PORTVERSION=	0.7.4.a
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://www.xs4all.nl/%7Ejjvrieze/
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.)$/\1/}
 
 MAINTAINER=	will@FreeBSD.org
 COMMENT=	KDE frontend to mplayer
diff --git a/multimedia/kmplayer-kde4/distinfo b/multimedia/kmplayer-kde4/distinfo
index 3186f74ee40d..6b140663059f 100644
--- a/multimedia/kmplayer-kde4/distinfo
+++ b/multimedia/kmplayer-kde4/distinfo
@@ -1 +1 @@
-MD5 (kmplayer-0.7.3.tar.bz2) = 5533bbbd2df768f4445ba72567cf178e
+MD5 (kmplayer-0.7.4a.tar.bz2) = 13cdf0373ae858b0f3a8a63ee67ab87d
diff --git a/multimedia/kmplayer-kde4/files/patch-kmplayer::kmplayer.desktop b/multimedia/kmplayer-kde4/files/patch-kmplayer::kmplayer.desktop
index 682e105c9f45..b73690ac2e26 100644
--- a/multimedia/kmplayer-kde4/files/patch-kmplayer::kmplayer.desktop
+++ b/multimedia/kmplayer-kde4/files/patch-kmplayer::kmplayer.desktop
@@ -1,10 +1,11 @@
---- kmplayer/kmplayer.desktop.orig	Mon Mar  3 09:33:01 2003
-+++ kmplayer/kmplayer.desktop	Mon Mar  3 09:40:25 2003
-@@ -10,6 +10,6 @@
+--- kmplayer/kmplayer.desktop.orig	Sun Apr 13 11:48:14 2003
++++ kmplayer/kmplayer.desktop	Thu May  1 15:04:46 2003
+@@ -14,6 +14,7 @@
  Terminal=0
  Name=KMPlayer
- Name[nl]=KMultiMediaSpeler
+ Name[sv]=Kmplayer
 -MimeType=audio/x-mp3;audio/x-vorbis;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-wmv;video/x-msvideo;video/quicktime;video/x-flic;
-+MimeType=audio/x-mp3;application/x-ogg;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;application/vnd.ms-asf;video/x-msvideo;video/quicktime;video/x-flic;
++MimeType=audio/x-mp3;application/x-ogg;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;application/vnd.ms-asf;video/x-msvi
++deo;video/quicktime;video/x-flic;
  Terminal=0
  InitialPreference=7
diff --git a/multimedia/kmplayer-kde4/pkg-plist b/multimedia/kmplayer-kde4/pkg-plist
index e1de9e26f147..4b8e3c1ed85b 100644
--- a/multimedia/kmplayer-kde4/pkg-plist
+++ b/multimedia/kmplayer-kde4/pkg-plist
@@ -3,7 +3,6 @@ lib/kde3/kparts_kmplayer.la
 lib/kde3/kparts_kmplayer.so
 lib/kdeinit_kmplayer.la
 lib/kdeinit_kmplayer.so
-share/applnk/Multimedia/More/kmplayer.desktop
 share/applnk/Multimedia/kmplayer.desktop
 share/apps/kmplayer/kmplayerpartui.rc
 share/apps/kmplayer/kmplayerui.rc
@@ -11,11 +10,53 @@ share/config/kmplayerrc
 share/doc/HTML/en/kmplayer/common
 share/doc/HTML/en/kmplayer/index.cache.bz2
 share/doc/HTML/en/kmplayer/index.docbook
+share/icons/crystalsvg/32x32/apps/kmplayer.png
 share/icons/locolor/16x16/apps/kmplayer.png
 share/icons/locolor/32x32/apps/kmplayer.png
+share/locale/da/LC_MESSAGES/kmplayer.mo
+share/locale/es/LC_MESSAGES/kmplayer.mo
+share/locale/fr/LC_MESSAGES/kmplayer.mo
 share/locale/hu/LC_MESSAGES/kmplayer.mo
+share/locale/lt/LC_MESSAGES/kmplayer.mo
+share/locale/nl/LC_MESSAGES/kmplayer.mo
+share/locale/pt/LC_MESSAGES/kmplayer.mo
+share/locale/ru/LC_MESSAGES/kmplayer.mo
+share/locale/sv/LC_MESSAGES/kmplayer.mo
 share/services/kmplayer_component.desktop
+@unexec rmdir %D/share/services 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/lt 2>/dev/null || true
 @unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@dirrm share/doc/HTML/en/kmplayer
-@dirrm share/apps/kmplayer
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da 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 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 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/doc/HTML/en/kmplayer 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@unexec rmdir %D/share/config 2>/dev/null || true
+@unexec rmdir %D/share/apps/kmplayer 2>/dev/null || true
+@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true
+@unexec rmdir %D/lib/kde3 2>/dev/null || true
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 930a7e2f7790..57bfe6f52c07 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	kmplayer
-PORTVERSION=	0.7.3
+PORTVERSION=	0.7.4.a
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://www.xs4all.nl/%7Ejjvrieze/
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/.(.)$/\1/}
 
 MAINTAINER=	will@FreeBSD.org
 COMMENT=	KDE frontend to mplayer
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
index 3186f74ee40d..6b140663059f 100644
--- a/multimedia/kmplayer/distinfo
+++ b/multimedia/kmplayer/distinfo
@@ -1 +1 @@
-MD5 (kmplayer-0.7.3.tar.bz2) = 5533bbbd2df768f4445ba72567cf178e
+MD5 (kmplayer-0.7.4a.tar.bz2) = 13cdf0373ae858b0f3a8a63ee67ab87d
diff --git a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop b/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
index 682e105c9f45..b73690ac2e26 100644
--- a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
+++ b/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
@@ -1,10 +1,11 @@
---- kmplayer/kmplayer.desktop.orig	Mon Mar  3 09:33:01 2003
-+++ kmplayer/kmplayer.desktop	Mon Mar  3 09:40:25 2003
-@@ -10,6 +10,6 @@
+--- kmplayer/kmplayer.desktop.orig	Sun Apr 13 11:48:14 2003
++++ kmplayer/kmplayer.desktop	Thu May  1 15:04:46 2003
+@@ -14,6 +14,7 @@
  Terminal=0
  Name=KMPlayer
- Name[nl]=KMultiMediaSpeler
+ Name[sv]=Kmplayer
 -MimeType=audio/x-mp3;audio/x-vorbis;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-wmv;video/x-msvideo;video/quicktime;video/x-flic;
-+MimeType=audio/x-mp3;application/x-ogg;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;application/vnd.ms-asf;video/x-msvideo;video/quicktime;video/x-flic;
++MimeType=audio/x-mp3;application/x-ogg;video/mpeg;audio/x-mpegurl;audio/x-wav;audio/x-mod;application/vnd.ms-asf;video/x-msvi
++deo;video/quicktime;video/x-flic;
  Terminal=0
  InitialPreference=7
diff --git a/multimedia/kmplayer/pkg-plist b/multimedia/kmplayer/pkg-plist
index e1de9e26f147..4b8e3c1ed85b 100644
--- a/multimedia/kmplayer/pkg-plist
+++ b/multimedia/kmplayer/pkg-plist
@@ -3,7 +3,6 @@ lib/kde3/kparts_kmplayer.la
 lib/kde3/kparts_kmplayer.so
 lib/kdeinit_kmplayer.la
 lib/kdeinit_kmplayer.so
-share/applnk/Multimedia/More/kmplayer.desktop
 share/applnk/Multimedia/kmplayer.desktop
 share/apps/kmplayer/kmplayerpartui.rc
 share/apps/kmplayer/kmplayerui.rc
@@ -11,11 +10,53 @@ share/config/kmplayerrc
 share/doc/HTML/en/kmplayer/common
 share/doc/HTML/en/kmplayer/index.cache.bz2
 share/doc/HTML/en/kmplayer/index.docbook
+share/icons/crystalsvg/32x32/apps/kmplayer.png
 share/icons/locolor/16x16/apps/kmplayer.png
 share/icons/locolor/32x32/apps/kmplayer.png
+share/locale/da/LC_MESSAGES/kmplayer.mo
+share/locale/es/LC_MESSAGES/kmplayer.mo
+share/locale/fr/LC_MESSAGES/kmplayer.mo
 share/locale/hu/LC_MESSAGES/kmplayer.mo
+share/locale/lt/LC_MESSAGES/kmplayer.mo
+share/locale/nl/LC_MESSAGES/kmplayer.mo
+share/locale/pt/LC_MESSAGES/kmplayer.mo
+share/locale/ru/LC_MESSAGES/kmplayer.mo
+share/locale/sv/LC_MESSAGES/kmplayer.mo
 share/services/kmplayer_component.desktop
+@unexec rmdir %D/share/services 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/lt 2>/dev/null || true
 @unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@dirrm share/doc/HTML/en/kmplayer
-@dirrm share/apps/kmplayer
+@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/da 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 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 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/doc/HTML/en/kmplayer 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@unexec rmdir %D/share/config 2>/dev/null || true
+@unexec rmdir %D/share/apps/kmplayer 2>/dev/null || true
+@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Multimedia 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true
+@unexec rmdir %D/lib/kde3 2>/dev/null || true