o Update to 0.8.3rc2

o Take over maintainership

5 files changed, 44 insertions, 128 deletions

diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 61b85ef153b7..08734ccaf6d1 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	kmplayer
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.3.r2
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://www.xs4all.nl/%7Ejjvrieze/
+DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.r/rc/}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	KDE frontend to mplayer
 
 RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
@@ -25,6 +26,12 @@ CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=
 CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug
 
+OPTIONS=	XINE "Enable support for video playback using libxine" off
+
+.if exists(${X11BASE}/lib/libxine.so)
+WITH_XINE=yes
+.endif
+
 post-patch:
 # remove -pedantic where possible to fix build errors on -CURRENT
 # remove optimizations
@@ -36,4 +43,12 @@ post-patch:
 		's|^(SUBDIRS.*)mimetypes|\1|' \
 		${WRKSRC}/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_XINE)
+LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
+
+PLIST_FILES=	bin/kxineplayer
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
index 8310880ec166..d2b0e6d0a384 100644
--- a/multimedia/kmplayer/distinfo
+++ b/multimedia/kmplayer/distinfo
@@ -1,2 +1,2 @@
-MD5 (kmplayer-0.8.2.tar.bz2) = 725f80c9b2dbbec65311be40e1a7c5ff
-SIZE (kmplayer-0.8.2.tar.bz2) = 578369
+MD5 (kmplayer-0.8.3rc2.tar.bz2) = 0c82c38d2f23f521edc4bcb2006b78d3
+SIZE (kmplayer-0.8.3rc2.tar.bz2) = 515989
diff --git a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop b/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
index cc7ab7398623..dd5941b87872 100644
--- a/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
+++ b/multimedia/kmplayer/files/patch-kmplayer::kmplayer.desktop
@@ -1,11 +1,11 @@
---- src/kmplayer.desktop.orig	Sun Jan 18 18:28:05 2004
-+++ src/kmplayer.desktop	Thu Feb  5 20:53:34 2004
-@@ -35,7 +35,7 @@
+--- 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 @@
  Name[sv]=Kmplayer
- Name[ta]=KM Å¡º¢ôÀÅ÷
+ Name[ta]=கேஎம்இயக்கி
  Name[xx]=xxKMPlayerxx
--MimeType=audio/x-mp3;audio/x-pn-realaudio;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-wmp;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;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;
  InitialPreference=7
  Categories=Qt;KDE;AudioVideo
  GenericName=Media Player
diff --git a/multimedia/kmplayer/files/patch-src-kmplayerrc b/multimedia/kmplayer/files/patch-src-kmplayerrc
deleted file mode 100644
index 7bc62684ae66..000000000000
--- a/multimedia/kmplayer/files/patch-src-kmplayerrc
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/kmplayerrc.orig	Thu Feb  5 21:12:54 2004
-+++ src/kmplayerrc	Thu Feb  5 21:13:03 2004
-@@ -6,7 +6,7 @@
- [KFileDialog Speedbar]
- 
- [MPlayer]
--Post MPlayer 0.90=true
-+Post MPlayer 0.90=false
- Add Configure Button=true
- Additional Arguments=
- Mencoder Arguments=-oac mp3lame -ovc lavc
diff --git a/multimedia/kmplayer/pkg-plist b/multimedia/kmplayer/pkg-plist
index a9d19c9f0bdb..adb0610a0f0c 100644
--- a/multimedia/kmplayer/pkg-plist
+++ b/multimedia/kmplayer/pkg-plist
@@ -1,126 +1,38 @@
 bin/kmplayer
-lib/libkmplayercommon.so
-lib/libkmplayercommon.la
-lib/libkdeinit_kmplayer.so
-lib/libkdeinit_kmplayer.la
-lib/kde3/libkmplayerpart.so
-lib/kde3/libkmplayerpart.la
-lib/kde3/kmplayer.so
 lib/kde3/kmplayer.la
-share/locale/ca/LC_MESSAGES/kmplayer.mo
-share/locale/de/LC_MESSAGES/kmplayer.mo
-share/locale/cs/LC_MESSAGES/kmplayer.mo
-share/locale/da/LC_MESSAGES/kmplayer.mo
-share/locale/es/LC_MESSAGES/kmplayer.mo
-share/locale/fr/LC_MESSAGES/kmplayer.mo
-share/locale/it/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/locale/tr/LC_MESSAGES/kmplayer.mo
-share/locale/pt_BR/LC_MESSAGES/kmplayer.mo
-share/locale/et/LC_MESSAGES/kmplayer.mo
-share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
-share/locale/ro/LC_MESSAGES/kmplayer.mo
-share/locale/fi/LC_MESSAGES/kmplayer.mo
-share/locale/sr/LC_MESSAGES/kmplayer.mo
-share/locale/bs/LC_MESSAGES/kmplayer.mo
-share/locale/xx/LC_MESSAGES/kmplayer.mo
-share/locale/hu/LC_MESSAGES/kmplayer.mo
-share/locale/ta/LC_MESSAGES/kmplayer.mo
-share/locale/en_GB/LC_MESSAGES/kmplayer.mo
-share/locale/ar/LC_MESSAGES/kmplayer.mo
-share/locale/lt/LC_MESSAGES/kmplayer.mo
-share/doc/HTML/en/kmplayer/index.docbook
-share/doc/HTML/en/kmplayer/index.cache.bz2
-share/doc/HTML/en/kmplayer/common
-share/doc/HTML/et/et/index.docbook
-share/doc/HTML/et/et/index.cache.bz2
-share/doc/HTML/et/et/common
-share/doc/HTML/it/it/index.docbook
-share/doc/HTML/it/it/index.cache.bz2
-share/doc/HTML/it/it/common
-share/doc/HTML/sv/sv/index.docbook
-share/doc/HTML/sv/sv/index.cache.bz2
-share/doc/HTML/sv/sv/common
-share/nls/en_US.US-ASCII
-share/nls/POSIX
-share/apps/kmplayer/kmplayerui.rc
+lib/kde3/kmplayer.so
+lib/kde3/libkmplayerpart.la
+lib/kde3/libkmplayerpart.so
+lib/libkdeinit_kmplayer.la
+lib/libkdeinit_kmplayer.so
+lib/libkmplayercommon.la
+lib/libkmplayercommon.so
+share/applications/kde/kmplayer.desktop
+share/apps/kmplayer/bookmarks.xml
 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/32x32/apps/kmplayer.png
-share/services/kmplayer_component.desktop
-share/applications/kde/kmplayer.desktop
+share/services/kmplayer_part.desktop
 @unexec rmdir %D/share/services 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_CN 2>/dev/null || true
-@unexec rmdir %D/share/locale/xx/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/xx 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/share/locale/ta/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ta 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/sr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sr 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/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 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/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 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
-@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/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/et 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/en_GB/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en_GB 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 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/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/locale/bs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ar/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ar 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/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
+@dirrm share/apps/kmplayer
 @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/share/applications/kde 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true
 @unexec rmdir %D/lib/kde3 2>/dev/null || true