Update kmplayer to 0.8.3rc4

pkgsrc changes: dont install some files that kdelibs already has versions
of.

Changes since version 0.8.3-rc3a
- Downloading of .m3u/.pls also eats .asx, so try to read this one too. This
  fixes also MPlayer-1.0pre not been able to read .asx files.
- Make sure if we're downloading a playlist file, it isn't bigger than 50k
- More or less revert the alsa5/alsa9 change to just alsa. Seems latest
  MPlayer doesn't work with alsa5/alsa9. Although they are still available.
Changes since version 0.8.3-rc3
- add AM_MAINTAINER_MODE in configure.in.in, no recheck/automake/autoconf
  version mismatch
Changes since version 0.8.3-rc2
- All QtoolTips to QWhatsThis and help from Xine for whatsthis by xine options
- Store xine settings in ~/.kde/share/apps/kmplayer/xine_config and not in
  ~/.xine/config2. Save the first time if file does not exist (Automaticly
  sets the misc.memcpy_method).
- Added a debian build directory, builds a kmplayer-lib, kmplayer-plugin and a
  kmplayer-app package. Eg. install only kmplayer-lib and kmplayer-plugin if
  you prefer another player but do want the plugin for konqueror.
- Added protocol files for mms://, rtsp:// and pnm://
- Position slider now also shows progress of the cache fill
Changes since version 0.8.3-rc1
- Remove configure options for control buttons. Simply always autohide for
  fullscreen and embedded part and show them otherwise
- Fix another case of video widget stays black cause in kxineplayer
- If position slider is hidden, make buttons small again (like <= 0.8.2)
- Support for AUTOSTART attribute
- Support for FULLSCREENMODE attribute
- Seeking while sliding :-)
- Local .pls and .m3u playlist files support. Works too if autodownloaded, eg
  pls' on http://www.shoutcast.com should work now
Changes since version 0.8.2
- fix for the "video window stays (sometimes/often) black" bug, which seems to
  occur more with the latest Qt versions. KMPlayer uses a XSimpleWindow now
  that is managed by QXEmbed
- Support for Real's CONTROLS/CONSOLE attributes. This makes it possible
  multible plugins cooperate with imagewindow/controlpanel
- Combine control buttons and position slider to one control panel

7 files changed, 60 insertions, 49 deletions

diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index cc7ce0d6964..2eb2b71d6fe 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/04/24 19:11:39 snj Exp $
+# $NetBSD: Makefile,v 1.11 2004/08/22 01:01:52 markd Exp $
 #
 
-DISTNAME=	kmplayer-0.8.2
-PKGREVISION=	4
+DISTNAME=	kmplayer-0.8.3rc4
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://www.xs4all.nl/~jjvrieze/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,10 +15,10 @@ DEPENDS=		mplayer>=1.0rc3:../../multimedia/mplayer
 DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
 DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
 
-WRKSRC=			${WRKDIR}/kmplayer
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PERL5=		build
 
diff --git a/multimedia/kmplayer/PLIST b/multimedia/kmplayer/PLIST
index a9ac9929d51..0436bb346f6 100644
--- a/multimedia/kmplayer/PLIST
+++ b/multimedia/kmplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/03/11 21:02:56 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/08/22 01:01:52 markd Exp $
 bin/kmplayer
 bin/kxineplayer
 lib/kde3/kmplayer.la
@@ -9,34 +9,32 @@ lib/libkdeinit_kmplayer.la
 lib/libkdeinit_kmplayer.so
 lib/libkmplayercommon.la
 lib/libkmplayercommon.so
-share/doc/kde/HTML/en/kmplayer/common
-share/doc/kde/HTML/en/kmplayer/index.cache.bz2
-share/doc/kde/HTML/en/kmplayer/index.docbook
-share/kde/applnk/Multimedia/kmplayer.desktop
+share/applications/kde/kmplayer.desktop
+share/kde/apps/kmplayer/bookmarks.xml
 share/kde/apps/kmplayer/kmplayerpartui.rc
 share/kde/apps/kmplayer/kmplayerui.rc
+share/kde/apps/kmplayer/pluginsinfo
 share/kde/config/kmplayerrc
 share/kde/icons/crystalsvg/32x32/apps/kmplayer.png
 share/kde/icons/locolor/16x16/apps/kmplayer.png
 share/kde/icons/locolor/32x32/apps/kmplayer.png
 share/kde/mimelnk/application/x-kmplayer.desktop
 share/kde/mimelnk/application/x-mplayer2.desktop
-share/kde/mimelnk/audio/x-ms-wma.desktop
+@comment in kdelibs share/kde/mimelnk/audio/x-ms-wma.desktop
 share/kde/mimelnk/video/x-ms-wmp.desktop
-share/kde/services/kmplayer_component.desktop
-@comment in kdelibs3: @dirrm share/kde/services
-@comment in kdelibs3: @dirrm share/kde/mimelnk/video
-@comment in kdelibs3: @dirrm share/kde/mimelnk/audio
-@comment in kdelibs3: @dirrm share/kde/mimelnk/application
-@comment in kdelibs3: @dirrm share/kde/icons/locolor/32x32/apps
-@comment in kdelibs3: @dirrm share/kde/icons/locolor/16x16/apps
-@comment in kdelibs3: @dirrm share/kde/icons/crystalsvg/32x32/apps
-@comment in kdelibs3: @dirrm share/kde/config
+@comment in kdelibs share/kde/mimelnk/video/x-ms-wmv.desktop
+share/kde/services/kmplayer_part.desktop
+@comment in kdelibs share/kde/services/mms.protocol
+share/kde/services/pnm.protocol
+@comment in kdelibs share/kde/services/rtsp.protocol
+@comment dirrm share/kde/services
+@comment dirrm share/kde/mimelnk/video
+@comment dirrm share/kde/mimelnk/audio
+@comment dirrm share/kde/mimelnk/application
+@comment dirrm share/kde/icons/locolor/32x32/apps
+@comment dirrm share/kde/icons/locolor/16x16/apps
+@comment dirrm share/kde/icons/crystalsvg/32x32/apps
+@comment dirrm share/kde/config
 @dirrm share/kde/apps/kmplayer
-@comment in kdelibs3: @dirrm share/kde/apps
-@comment in kdelibs3: @dirrm share/kde/applnk/Multimedia
-@comment in kdelibs3: @dirrm share/kde/applnk
-@comment in kdelibs3: @dirrm share/kde
-@dirrm share/doc/kde/HTML/en/kmplayer
-@comment in kdelibs3: @dirrm share/doc/kde/HTML/en
-@comment in kdelibs3: @dirrm lib/kde3
+@comment dirrm share/kde/apps
+@comment dirrm share/applications/kde
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
index 3d760b5f9f7..b4f79b368f8 100644
--- a/multimedia/kmplayer/distinfo
+++ b/multimedia/kmplayer/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2004/03/11 21:02:56 markd Exp $
+$NetBSD: distinfo,v 1.5 2004/08/22 01:01:52 markd Exp $
 
-SHA1 (kmplayer-0.8.2.tar.bz2) = 8065064dedefcb77270fcd06ee3fe526fa3abd4c
-Size (kmplayer-0.8.2.tar.bz2) = 578369 bytes
-SHA1 (patch-aa) = 5e690e05c83610f3c7726d8229d72a8c877b4fa9
+SHA1 (kmplayer-0.8.3rc4.tar.bz2) = 09b7e88b7bbe437472370206f933df48abdaae85
+Size (kmplayer-0.8.3rc4.tar.bz2) = 495090 bytes
 SHA1 (patch-ab) = 333935386b0b465092ad42651d1078563da082b0
-SHA1 (patch-ac) = f172d8e60b8e672e595ae60322a05836fe11fb9e
+SHA1 (patch-ac) = 3304ab8136fc02a1c64e23d9cabedc1e20fc700e
+SHA1 (patch-ad) = 5068abafda4b5cfdb45f207666ba7dbda1e2025c
+SHA1 (patch-ae) = bf9389b1e7aa1401fc8bccbdb6a58be03c1cd473
diff --git a/multimedia/kmplayer/patches/patch-aa b/multimedia/kmplayer/patches/patch-aa
deleted file mode 100644
index 508363ddf9f..00000000000
--- a/multimedia/kmplayer/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/02/08 13:11:27 markd Exp $
-
---- src/Makefile.in.orig	2004-01-02 22:10:41.000000000 +0100
-+++ src/Makefile.in
-@@ -257,7 +257,7 @@ qt_includes = @qt_includes@
- qt_libraries = @qt_libraries@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
--xdg_appsdir = @xdg_appsdir@
-+xdg_appsdir = @kde_appsdir@/Multimedia
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- INCLUDES = -I$(kde_includes)/kio $(all_includes)
diff --git a/multimedia/kmplayer/patches/patch-ac b/multimedia/kmplayer/patches/patch-ac
index fc393f6a0de..2b1d0980f02 100644
--- a/multimedia/kmplayer/patches/patch-ac
+++ b/multimedia/kmplayer/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2004/03/11 21:02:56 markd Exp $
+$NetBSD: patch-ac,v 1.2 2004/08/22 01:01:52 markd Exp $
 
---- mimetypes/video/Makefile.in.orig	2004-01-30 22:56:24.000000000 +1300
+--- mimetypes/video/Makefile.in.orig	2004-07-16 09:41:24.000000000 +1200
 +++ mimetypes/video/Makefile.in
-@@ -260,7 +260,7 @@ x_libraries = @x_libraries@
+@@ -287,7 +287,7 @@ x_libraries = @x_libraries@
  xdg_appsdir = @xdg_appsdir@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
 -mime_DATA = x-ms-wmv.desktop x-ms-wmp.desktop
 +mime_DATA = x-ms-wmp.desktop
  mimedir = $(kde_mimedir)/video
- subdir = mimetypes/video
- mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
+ #>- all: all-am
+ #>+ 1
diff --git a/multimedia/kmplayer/patches/patch-ad b/multimedia/kmplayer/patches/patch-ad
new file mode 100644
index 00000000000..cc16716bf49
--- /dev/null
+++ b/multimedia/kmplayer/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/08/22 01:01:52 markd Exp $
+
+--- mimetypes/audio/Makefile.in.orig	2004-07-16 09:41:24.000000000 +1200
++++ mimetypes/audio/Makefile.in
+@@ -287,7 +287,7 @@ x_libraries = @x_libraries@
+ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+-mime_DATA = x-ms-wma.desktop
++mime_DATA = 
+ mimedir = $(kde_mimedir)/audio
+ #>- all: all-am
+ #>+ 1
diff --git a/multimedia/kmplayer/patches/patch-ae b/multimedia/kmplayer/patches/patch-ae
new file mode 100644
index 00000000000..37efdff3df3
--- /dev/null
+++ b/multimedia/kmplayer/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2004/08/22 01:01:52 markd Exp $
+
+--- protocols/Makefile.in.orig	2004-07-16 09:41:24.000000000 +1200
++++ protocols/Makefile.in
+@@ -288,7 +288,7 @@ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ protocoldir = $(kde_servicesdir)
+-protocol_DATA = mms.protocol rtsp.protocol pnm.protocol
++protocol_DATA = pnm.protocol
+ #>- all: all-am
+ #>+ 1
+ all: docs-am  all-am