From d67b5fc9d7589f399134e2e40fe4003ab3aa9b2b Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 31 Oct 2006 22:33:28 +0000
Subject: Update mplayer-share, mplayer, mencoder, and gmplayer to 1.0rc9
 (which is upstream 1.0rc1, but we already used rc for the previous versions).

With valuable help from drochner, thanks!

ChangeLog:
MPlayer 1.0rc1: "Codename intentionally left blank"

DOCS:

    * German documentation translation finished
    * Russian documentation translation synced and almost finished

Drivers:

    * IVTV hardware MPEG audio/video decoder output
    * ALSA audio output: AC3 passthrough now works even when the device name of the digital output port has been set by the user
    * bicubic OpenGL scaling works with ATI cards
    * md5sum switched to the libavutil MD5 implementation
    * support for libcaca 1.0 via compatibility layer

Decoders:

    * liba52 updated to 0.7.4 (slightly faster)
    * SSE optimizations for mp3lib
    * removed support for obsolete and non-free divx4 libraries

Demuxers:

    * audio stream switching in MPEG-TS/PS, Matroska and streams supported by libavformat
    * audio stream switching between streams with different codecs
    * libavformat demuxer now honors -alang
    * chapter seeking in Matroska files
    * fixed seeking to absolute and percent position for libavformat demuxer
    * NUT demuxer using libnut
    * Matroska SimpleBlock support

Inputs:

    * split of stream layer from libmpdemux to new stream library
    * PVR input for hardware MPEG encoder based cards, such as Hauppauge WinTV PVR-150/250/350/500 AKA IVTV but also pvrusb2 and cx88 (requires Linux >= 2.6.18 kernel, featuring native V4L2 MPEG API)
    * native RTSP input (handles MPEG-TS over RTP) for generic RTSP servers
    * support for seeking to chapters in dvd:// and dvdnav:// streams
    * radio support (radio://)

FFmpeg/libavcodec:

    * VC-1/WMV3/WMV9 video decoder
    * Vorbis decoding speedup, now default Vorbis decoder
    * VMware Video decoder
    * On2 VP50 and VP62 decoder
    * lossless audio decoders: WavPack, TTA, Shorten
    * CAVS decoder
    * GXF muxer/demuxer
    * MXF demuxer
    * much improved FLAC encoder
    * more H.264 decoding speed improvements, plus support for -lavdopts fast
    * Theora decoder fixes
    * preliminary Vorbis encoder
    * MTV demuxer

GUI:

    * Windows version added
    * drag-and-drop ignored last file
    * save and load cache setting correctly
    * working audio stream selection for Ogg and Matroska files
    * executable names like gmplayer_old etc. will now start GUI as well
    * -gui/-nogui options
    * xinerama fixes, now behaves similar to MPlayer without GUI

Filters:

    * MMX-optimizations for -vf yadif
    * MMX-optimizations for -vf zrmjpeg

MEncoder:

    * support of x264 encoding via libavcodec
    * rewrite -x264encopts option parser to use the 264 option parser; likely breaks 3rd party tools as the syntax of some options has changed
    * removed support for obsolete and non-free divx4 libraries

Ports:

    * partial Intel Mac support, --disable-win32 --disable-mp3lib is needed
    * OpenGL can now create windows > screen size under Windows
    * allow filenames starting with \\ for remote paths on Windows

Others:

    * SSA/ASS subtitle renderer
    * -endpos option for MPlayer
    * -correct-pts option
    * UTF-8 used for OSD and subtitles, some bitmap fonts will no longer work correctly and -subcp must be set for all non-UTF-8 subtitles
    * more audio-truncation fixes
    * libavutil mandatory for MPlayer compilation
    * more intuitive -edlout behaviour
    * -nortc is now default since -rtc has disadvantages with recent kernels
---
 multimedia/gmplayer/Makefile              |   4 +-
 multimedia/gmplayer/distinfo              | 135 ++++++++++----------
 multimedia/mencoder/Makefile              |   4 +-
 multimedia/mplayer-share/Makefile.common  |   9 +-
 multimedia/mplayer-share/Makefile.depends |   3 +-
 multimedia/mplayer-share/PLIST            | 204 ++++++++++++++----------------
 multimedia/mplayer-share/distinfo         |  16 +--
 multimedia/mplayer-share/options.mk       |  17 ++-
 multimedia/mplayer-share/patches/patch-aa |  62 +++------
 multimedia/mplayer-share/patches/patch-ad | 143 ---------------------
 multimedia/mplayer-share/patches/patch-ah |   8 +-
 multimedia/mplayer-share/patches/patch-ak |  15 ---
 multimedia/mplayer-share/patches/patch-ta |  89 -------------
 multimedia/mplayer-share/patches/patch-tb |  13 --
 multimedia/mplayer/Makefile               |   4 +-
 15 files changed, 209 insertions(+), 517 deletions(-)
 delete mode 100644 multimedia/mplayer-share/patches/patch-ad
 delete mode 100644 multimedia/mplayer-share/patches/patch-ak
 delete mode 100644 multimedia/mplayer-share/patches/patch-ta
 delete mode 100644 multimedia/mplayer-share/patches/patch-tb

diff --git a/multimedia/gmplayer/Makefile b/multimedia/gmplayer/Makefile
index 1957fe9ceae..46697babefd 100644
--- a/multimedia/gmplayer/Makefile
+++ b/multimedia/gmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/08/23 18:11:48 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2006/10/31 22:33:28 wiz Exp $
 
 #
 # NOTE: if you are updating both mplayer and gmplayer, you must ensure
@@ -21,8 +21,6 @@ SKIN_SITES=	http://www1.mplayerhq.hu/MPlayer/skins/		\
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-PKGREVISION=	3
-
 COMMENT=	Software only MPEG-1/2/4 video decoder with a GTK+ interface
 
 SKINS +=	AlienMind-1.2${EXTRACT_SUFX}			\
diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 5c43e8bab8d..1344145cb72 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,71 +1,70 @@
-$NetBSD: distinfo,v 1.41 2006/10/03 14:32:24 tron Exp $
+$NetBSD: distinfo,v 1.42 2006/10/31 22:33:28 wiz Exp $
 
-SHA1 (gmplayer-1.0rc8-20060123/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921
-RMD160 (gmplayer-1.0rc8-20060123/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
-Size (gmplayer-1.0rc8-20060123/MPlayer-1.0pre8.tar.bz2) = 8166628 bytes
-SHA1 (gmplayer-1.0rc8-20060123/AlienMind-1.2.tar.bz2) = 0d612f7fc92332783e3a8fd42b9f957a1c6ecaee
-RMD160 (gmplayer-1.0rc8-20060123/AlienMind-1.2.tar.bz2) = 5e7f5fcade401af16c1614dcfc5c6f673fe4cd49
-Size (gmplayer-1.0rc8-20060123/AlienMind-1.2.tar.bz2) = 131295 bytes
-SHA1 (gmplayer-1.0rc8-20060123/Blue-1.6.tar.bz2) = 2a082bdef2f5eebc403c234a036949f38683da06
-RMD160 (gmplayer-1.0rc8-20060123/Blue-1.6.tar.bz2) = c16342d3131f01fbd294ff109b8ab31cef555d13
-Size (gmplayer-1.0rc8-20060123/Blue-1.6.tar.bz2) = 281056 bytes
-SHA1 (gmplayer-1.0rc8-20060123/BlueHeart-1.5.tar.bz2) = c5da3b035492e8e9c44c2540223c2ab9790c5795
-RMD160 (gmplayer-1.0rc8-20060123/BlueHeart-1.5.tar.bz2) = 8edd715fc70d5226b5769c87290c40268ce6ce82
-Size (gmplayer-1.0rc8-20060123/BlueHeart-1.5.tar.bz2) = 281110 bytes
-SHA1 (gmplayer-1.0rc8-20060123/CornerMP-1.2.tar.bz2) = 5687ac894548b69d112dcc74c519d9c752d21ea8
-RMD160 (gmplayer-1.0rc8-20060123/CornerMP-1.2.tar.bz2) = c47f41bdbeba690c18896d51e3d7696b89711a1d
-Size (gmplayer-1.0rc8-20060123/CornerMP-1.2.tar.bz2) = 232726 bytes
-SHA1 (gmplayer-1.0rc8-20060123/CornerMP-aqua-1.4.tar.bz2) = 8217cf467a3d588a0831d79c86bf6c718f74a31c
-RMD160 (gmplayer-1.0rc8-20060123/CornerMP-aqua-1.4.tar.bz2) = 3af6e18f52c585aa5f8399bb01179e6ac96af7cb
-Size (gmplayer-1.0rc8-20060123/CornerMP-aqua-1.4.tar.bz2) = 243275 bytes
-SHA1 (gmplayer-1.0rc8-20060123/Cyrus-1.2.tar.bz2) = 04bea3ecc4f3f14592b06bfea2f66cdbba28eebb
-RMD160 (gmplayer-1.0rc8-20060123/Cyrus-1.2.tar.bz2) = 46090cada81d1304aabbf07d20e358c52c0923b0
-Size (gmplayer-1.0rc8-20060123/Cyrus-1.2.tar.bz2) = 228477 bytes
-SHA1 (gmplayer-1.0rc8-20060123/MidnightLove-1.6.tar.bz2) = cb3e4e5f6ea8ff427acfe133367a0d05702d77fb
-RMD160 (gmplayer-1.0rc8-20060123/MidnightLove-1.6.tar.bz2) = 678848e8971615369eddfcdfc9a404e5b978004f
-Size (gmplayer-1.0rc8-20060123/MidnightLove-1.6.tar.bz2) = 539609 bytes
-SHA1 (gmplayer-1.0rc8-20060123/WMP6-2.2.tar.bz2) = 17118c9074ba568d032aa70c947c9bce31a162a2
-RMD160 (gmplayer-1.0rc8-20060123/WMP6-2.2.tar.bz2) = 8ffcdd4f01a30b9921f3262266dec83cd3f59acd
-Size (gmplayer-1.0rc8-20060123/WMP6-2.2.tar.bz2) = 39316 bytes
-SHA1 (gmplayer-1.0rc8-20060123/avifile-1.6.tar.bz2) = 9c9da5e3332692815f7ca0796a64d0e25dab7bb2
-RMD160 (gmplayer-1.0rc8-20060123/avifile-1.6.tar.bz2) = fc170f5e71c0ebc6750adeeac526997e70980a56
-Size (gmplayer-1.0rc8-20060123/avifile-1.6.tar.bz2) = 42454 bytes
-SHA1 (gmplayer-1.0rc8-20060123/gnome-1.1.tar.bz2) = b91d0d5baf6f7f4d383fa35b748c15c8258a6832
-RMD160 (gmplayer-1.0rc8-20060123/gnome-1.1.tar.bz2) = 33080c3eb5f7a5e307ff824f2ba237462e6d4d55
-Size (gmplayer-1.0rc8-20060123/gnome-1.1.tar.bz2) = 368734 bytes
-SHA1 (gmplayer-1.0rc8-20060123/hayraphon-1.0.tar.bz2) = cd5c8384e9d16b7b390f764c01126cdd6d8c84fb
-RMD160 (gmplayer-1.0rc8-20060123/hayraphon-1.0.tar.bz2) = f8e3428582074e6663add8d1d80112a2b683ef09
-Size (gmplayer-1.0rc8-20060123/hayraphon-1.0.tar.bz2) = 77630 bytes
-SHA1 (gmplayer-1.0rc8-20060123/hwswskin-1.1.tar.bz2) = d738b76163cb955b73c99390c23f64d882f2eeb6
-RMD160 (gmplayer-1.0rc8-20060123/hwswskin-1.1.tar.bz2) = d6080186f372aba95ebb645dd799d9600fa44793
-Size (gmplayer-1.0rc8-20060123/hwswskin-1.1.tar.bz2) = 20384 bytes
-SHA1 (gmplayer-1.0rc8-20060123/mentalic-1.2.tar.bz2) = 2be87ff3f2866d365a7e66514cc0292156c03ed4
-RMD160 (gmplayer-1.0rc8-20060123/mentalic-1.2.tar.bz2) = 3daed2b780978bedfa52cbfb3089ba2773376464
-Size (gmplayer-1.0rc8-20060123/mentalic-1.2.tar.bz2) = 166595 bytes
-SHA1 (gmplayer-1.0rc8-20060123/neutron-1.5.tar.bz2) = b1473d07c6fc22b6c7b8c875d2f064dcdbd21eca
-RMD160 (gmplayer-1.0rc8-20060123/neutron-1.5.tar.bz2) = 11be97a7c2accb1b5e8c1df6f66e038769786c13
-Size (gmplayer-1.0rc8-20060123/neutron-1.5.tar.bz2) = 369333 bytes
-SHA1 (gmplayer-1.0rc8-20060123/phony-1.1.tar.bz2) = 7be9e0fe2c0e7dee0c315fe542edb894b06b11d8
-RMD160 (gmplayer-1.0rc8-20060123/phony-1.1.tar.bz2) = 4e5070fdddddb523eada26113463ac41afd845ad
-Size (gmplayer-1.0rc8-20060123/phony-1.1.tar.bz2) = 386433 bytes
-SHA1 (gmplayer-1.0rc8-20060123/plastic-1.2.tar.bz2) = a80a746d5164017b4bf593ee3e99e61f651ad574
-RMD160 (gmplayer-1.0rc8-20060123/plastic-1.2.tar.bz2) = 04d44afa6aa4b9114a682a945d3f6cc0e46e7b35
-Size (gmplayer-1.0rc8-20060123/plastic-1.2.tar.bz2) = 454107 bytes
-SHA1 (gmplayer-1.0rc8-20060123/proton-1.2.tar.bz2) = 9a1a9932824185d033fbc1043f32e8fb38cd198b
-RMD160 (gmplayer-1.0rc8-20060123/proton-1.2.tar.bz2) = 97d7d57b27b5206d369b45f8f8e294f1b1c1cdcb
-Size (gmplayer-1.0rc8-20060123/proton-1.2.tar.bz2) = 322600 bytes
-SHA1 (gmplayer-1.0rc8-20060123/slim-1.2.tar.bz2) = 23d842ca03ec91c589ee4123adb85137d6809549
-RMD160 (gmplayer-1.0rc8-20060123/slim-1.2.tar.bz2) = 765097ec829b9d43ae1b3a81120e488bd41de631
-Size (gmplayer-1.0rc8-20060123/slim-1.2.tar.bz2) = 398982 bytes
-SHA1 (gmplayer-1.0rc8-20060123/xanim-1.6.tar.bz2) = 23bd27aadc76557ec754823d44c11af0608acc6e
-RMD160 (gmplayer-1.0rc8-20060123/xanim-1.6.tar.bz2) = 636372db426734407235291ad1d7497080c5ff80
-Size (gmplayer-1.0rc8-20060123/xanim-1.6.tar.bz2) = 94555 bytes
-SHA1 (gmplayer-1.0rc8-20060123/xine-lcd-1.2.tar.bz2) = e3f9deade893dc750e9e1b9d824109db9d88c84e
-RMD160 (gmplayer-1.0rc8-20060123/xine-lcd-1.2.tar.bz2) = c4394a2e409d9d24cd9b73eb2f15e39ddd010bf9
-Size (gmplayer-1.0rc8-20060123/xine-lcd-1.2.tar.bz2) = 172363 bytes
-SHA1 (patch-aa) = 9963d959da515d318fe794104acaa4b6ac504643
+SHA1 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = 34370da1e003e4accceae194a63483aa6eebc4dc
+RMD160 (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = f3fda7d44a59f98097162f76d0a0d58840974998
+Size (gmplayer-1.0rc9-20060123/AlienMind-1.2.tar.bz2) = 131295 bytes
+SHA1 (gmplayer-1.0rc9-20060123/Blue-1.6.tar.bz2) = d894cbd44ffb7bde14a8f9bbdac53525a51e1e08
+RMD160 (gmplayer-1.0rc9-20060123/Blue-1.6.tar.bz2) = 33fcd3812bd12e0369614e0c1c5d4c571784df3e
+Size (gmplayer-1.0rc9-20060123/Blue-1.6.tar.bz2) = 225883 bytes
+SHA1 (gmplayer-1.0rc9-20060123/BlueHeart-1.5.tar.bz2) = 157aca7420e8003ced2f4f1cb38a33c1bfd0db13
+RMD160 (gmplayer-1.0rc9-20060123/BlueHeart-1.5.tar.bz2) = 39e139b5428a695e5eb56e72e0e626cb3a5a2eea
+Size (gmplayer-1.0rc9-20060123/BlueHeart-1.5.tar.bz2) = 281051 bytes
+SHA1 (gmplayer-1.0rc9-20060123/CornerMP-1.2.tar.bz2) = 4de70d5232dd44d9366cb8b876e89db8e48b2d8c
+RMD160 (gmplayer-1.0rc9-20060123/CornerMP-1.2.tar.bz2) = eb563c083111923b4fddd30df074ba08bb78feec
+Size (gmplayer-1.0rc9-20060123/CornerMP-1.2.tar.bz2) = 232731 bytes
+SHA1 (gmplayer-1.0rc9-20060123/CornerMP-aqua-1.4.tar.bz2) = 165d1f30b0c5135a3481d394042a4faea70d3976
+RMD160 (gmplayer-1.0rc9-20060123/CornerMP-aqua-1.4.tar.bz2) = 67d78a19e2362b6c9658f699421fe4228cb8e96a
+Size (gmplayer-1.0rc9-20060123/CornerMP-aqua-1.4.tar.bz2) = 243154 bytes
+SHA1 (gmplayer-1.0rc9-20060123/Cyrus-1.2.tar.bz2) = 20bbb63114e8c0438770c1d1682296f37833968c
+RMD160 (gmplayer-1.0rc9-20060123/Cyrus-1.2.tar.bz2) = c4d4593a358456d98a1d94e14e263a902add6828
+Size (gmplayer-1.0rc9-20060123/Cyrus-1.2.tar.bz2) = 228461 bytes
+SHA1 (gmplayer-1.0rc9-20060123/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
+RMD160 (gmplayer-1.0rc9-20060123/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
+Size (gmplayer-1.0rc9-20060123/MPlayer-1.0rc1.tar.bz2) = 8414213 bytes
+SHA1 (gmplayer-1.0rc9-20060123/MidnightLove-1.6.tar.bz2) = 27d1105777c1195adbe33f04741bf4be939d3a7f
+RMD160 (gmplayer-1.0rc9-20060123/MidnightLove-1.6.tar.bz2) = 44886ffed5e6167324727fab42251866c6f1ca2c
+Size (gmplayer-1.0rc9-20060123/MidnightLove-1.6.tar.bz2) = 539665 bytes
+SHA1 (gmplayer-1.0rc9-20060123/WMP6-2.2.tar.bz2) = 6cf2062ddf41423edfa35a9a159614ef7996deb3
+RMD160 (gmplayer-1.0rc9-20060123/WMP6-2.2.tar.bz2) = 1cf366456372027d738359f6611b4b95891ade5a
+Size (gmplayer-1.0rc9-20060123/WMP6-2.2.tar.bz2) = 39267 bytes
+SHA1 (gmplayer-1.0rc9-20060123/avifile-1.6.tar.bz2) = 061f3e7a2b92e3e41d43f706c93e5f249c5c989a
+RMD160 (gmplayer-1.0rc9-20060123/avifile-1.6.tar.bz2) = 684f7e9259f4333aca285d2d8356b7c6cbbbfc16
+Size (gmplayer-1.0rc9-20060123/avifile-1.6.tar.bz2) = 42409 bytes
+SHA1 (gmplayer-1.0rc9-20060123/gnome-1.1.tar.bz2) = 0852aaab4336d37bef439a6d11aaab1422df6caa
+RMD160 (gmplayer-1.0rc9-20060123/gnome-1.1.tar.bz2) = 5850b3e5ce508ec40b82032125ee0c83a3ca9f49
+Size (gmplayer-1.0rc9-20060123/gnome-1.1.tar.bz2) = 368649 bytes
+SHA1 (gmplayer-1.0rc9-20060123/hayraphon-1.0.tar.bz2) = c16b379a202e477e68f18003cd868a760daa0605
+RMD160 (gmplayer-1.0rc9-20060123/hayraphon-1.0.tar.bz2) = 2104981d6abdb89436e1f6ccd9ca9260a4cb4394
+Size (gmplayer-1.0rc9-20060123/hayraphon-1.0.tar.bz2) = 77577 bytes
+SHA1 (gmplayer-1.0rc9-20060123/hwswskin-1.1.tar.bz2) = 1637293c9b9b8f8ab1055f838ddd6409d035e3de
+RMD160 (gmplayer-1.0rc9-20060123/hwswskin-1.1.tar.bz2) = ca8d39bfc03dc18c927ff8d6592bd95974a9b354
+Size (gmplayer-1.0rc9-20060123/hwswskin-1.1.tar.bz2) = 20331 bytes
+SHA1 (gmplayer-1.0rc9-20060123/mentalic-1.2.tar.bz2) = 47a0c7f8cebba83b50b381ff923d91904cc5b514
+RMD160 (gmplayer-1.0rc9-20060123/mentalic-1.2.tar.bz2) = d561f0c1c3396c2776175f58f0d69b39623e9fee
+Size (gmplayer-1.0rc9-20060123/mentalic-1.2.tar.bz2) = 166570 bytes
+SHA1 (gmplayer-1.0rc9-20060123/neutron-1.5.tar.bz2) = 757a2aef5a6eb6873024d8cafa5f862377af9239
+RMD160 (gmplayer-1.0rc9-20060123/neutron-1.5.tar.bz2) = 9434c545386357c540a43c5cb37f70a6308b1ed7
+Size (gmplayer-1.0rc9-20060123/neutron-1.5.tar.bz2) = 369303 bytes
+SHA1 (gmplayer-1.0rc9-20060123/phony-1.1.tar.bz2) = 68189ce1ffca26694edf5440769a1d61b84b70bc
+RMD160 (gmplayer-1.0rc9-20060123/phony-1.1.tar.bz2) = 5fd2b0befc46a995579b3722952a73f2c1b062e5
+Size (gmplayer-1.0rc9-20060123/phony-1.1.tar.bz2) = 386399 bytes
+SHA1 (gmplayer-1.0rc9-20060123/plastic-1.2.tar.bz2) = 414560bfdd660a3b44d1f75adda8c36c437ad2d3
+RMD160 (gmplayer-1.0rc9-20060123/plastic-1.2.tar.bz2) = 3e2bed634d2f7a55313e9d6332c57f48f6b0f761
+Size (gmplayer-1.0rc9-20060123/plastic-1.2.tar.bz2) = 454167 bytes
+SHA1 (gmplayer-1.0rc9-20060123/proton-1.2.tar.bz2) = a5178bc09a75464183abc78c380b5b661a3aaf68
+RMD160 (gmplayer-1.0rc9-20060123/proton-1.2.tar.bz2) = 276e93b2c7cf695fdfa5a723fc6074bfa6405172
+Size (gmplayer-1.0rc9-20060123/proton-1.2.tar.bz2) = 322612 bytes
+SHA1 (gmplayer-1.0rc9-20060123/slim-1.2.tar.bz2) = 3913748d9bfb126ec677e84b068c54fb7111196f
+RMD160 (gmplayer-1.0rc9-20060123/slim-1.2.tar.bz2) = 2ec2b2362c4b89ffbe79421b14f3f5f4341996f1
+Size (gmplayer-1.0rc9-20060123/slim-1.2.tar.bz2) = 398873 bytes
+SHA1 (gmplayer-1.0rc9-20060123/xanim-1.6.tar.bz2) = 1b63395d12bfe6eb63c6aa6ea3b870ddbdd26658
+RMD160 (gmplayer-1.0rc9-20060123/xanim-1.6.tar.bz2) = 5c0f34bb4cd722469402cd69de3c4d75e10611f9
+Size (gmplayer-1.0rc9-20060123/xanim-1.6.tar.bz2) = 94564 bytes
+SHA1 (gmplayer-1.0rc9-20060123/xine-lcd-1.2.tar.bz2) = 2fa7811e0dc7316d0c996b0a5bc37f5c97d1dd18
+RMD160 (gmplayer-1.0rc9-20060123/xine-lcd-1.2.tar.bz2) = 785f6826d49eddabd7ebc431db77139771f208f5
+Size (gmplayer-1.0rc9-20060123/xine-lcd-1.2.tar.bz2) = 172270 bytes
+SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
-SHA1 (patch-ad) = 4744bdb2ea6ffa1a18abaef5a9cf5756f3b8a645
-SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307
-SHA1 (patch-ak) = 376bd5bd7a96e64d80d9272c336a2e0447e8232a
+SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
+SHA1 (patch-tc) = e67443cec273d7aa168fb160e2409d2ce352a8bf
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index b16845a56dc..16caef49cf4 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2006/06/14 10:30:06 drochner Exp $
+# $NetBSD: Makefile,v 1.28 2006/10/31 22:33:29 wiz Exp $
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
 
@@ -6,8 +6,6 @@ COMMENT=	Simple movie encoder for MPlayer-playable movies
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-PKGREVISION=	1
-
 CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
 BUILD_TARGET=	mencoder
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 575154677b2..fa0e4bed43e 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.32 2006/10/10 23:58:49 grant Exp $
+# $NetBSD: Makefile.common,v 1.33 2006/10/31 22:33:28 wiz Exp $
 
-MPLAYER_DIST_VERSION=	1.0pre8
+MPLAYER_DIST_VERSION=	1.0rc1
 
 # This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION=	1.0rc8
+MPLAYER_PKG_VERSION=	1.0rc9
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
 CATEGORIES?=		multimedia
@@ -39,9 +39,8 @@ HAS_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q} \
-			--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2" \
+			--with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2:${LOCALBASE}/include/cdparanoia:${LOCALBASE}/include/freetype2" \
 			--with-extralibdir="${LOCALBASE}/lib" \
-			--with-x11incdir="${X11BASE}/include" \
 			--with-x11libdir="${X11BASE}/lib" \
 			--disable-mpdvdkit \
 			--disable-smb
diff --git a/multimedia/mplayer-share/Makefile.depends b/multimedia/mplayer-share/Makefile.depends
index 7feea1cc1a6..405be9d1836 100644
--- a/multimedia/mplayer-share/Makefile.depends
+++ b/multimedia/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.14 2005/06/01 18:45:46 jmmv Exp $
+# $NetBSD: Makefile.depends,v 1.15 2006/10/31 22:33:28 wiz Exp $
 #
 
 DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../multimedia/mplayer-share
@@ -9,4 +9,5 @@ GCC_REQD+=	2.95.3
 .  include "../../devel/binutils/buildlink3.mk"
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST
index 6e688a48df7..05b92631f75 100644
--- a/multimedia/mplayer-share/PLIST
+++ b/multimedia/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/06/13 17:25:00 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/10/31 22:33:28 wiz Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/HTML/cs/advaudio.html
 share/mplayer/DOCS/HTML/cs/aspect.html
@@ -31,22 +31,20 @@ share/mplayer/DOCS/HTML/cs/encoding-guide.html
 share/mplayer/DOCS/HTML/cs/exotic_platforms.html
 share/mplayer/DOCS/HTML/cs/faq.html
 share/mplayer/DOCS/HTML/cs/features.html
-share/mplayer/DOCS/HTML/cs/gcc-296.html
+share/mplayer/DOCS/HTML/cs/fonts-osd.html
 share/mplayer/DOCS/HTML/cs/gui.html
 share/mplayer/DOCS/HTML/cs/history.html
 share/mplayer/DOCS/HTML/cs/howtoread.html
 share/mplayer/DOCS/HTML/cs/index.html
 share/mplayer/DOCS/HTML/cs/install.html
-share/mplayer/DOCS/HTML/cs/installation_codecs.html
 share/mplayer/DOCS/HTML/cs/intro.html
-share/mplayer/DOCS/HTML/cs/joe-barr.html
 share/mplayer/DOCS/HTML/cs/linux.html
 share/mplayer/DOCS/HTML/cs/macos.html
-share/mplayer/DOCS/HTML/cs/mailinglists.html
 share/mplayer/DOCS/HTML/cs/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/cs/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/cs/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/cs/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/cs/menc-feat-handheld-psp.html
 share/mplayer/DOCS/HTML/cs/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/cs/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/cs/menc-feat-rescale.html
@@ -55,17 +53,18 @@ share/mplayer/DOCS/HTML/cs/menc-feat-selecting-input.html
 share/mplayer/DOCS/HTML/cs/menc-feat-streamcopy.html
 share/mplayer/DOCS/HTML/cs/menc-feat-telecine.html
 share/mplayer/DOCS/HTML/cs/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/cs/menc-feat-video-for-windows.html
 share/mplayer/DOCS/HTML/cs/menc-feat-x264.html
 share/mplayer/DOCS/HTML/cs/menc-feat-xvid.html
 share/mplayer/DOCS/HTML/cs/mencoder.html
 share/mplayer/DOCS/HTML/cs/mpeg_decoders.html
-share/mplayer/DOCS/HTML/cs/mplayer-binary.html
 share/mplayer/DOCS/HTML/cs/mpst.html
 share/mplayer/DOCS/HTML/cs/mtrr.html
-share/mplayer/DOCS/HTML/cs/nvidia-opinions.html
 share/mplayer/DOCS/HTML/cs/other.html
 share/mplayer/DOCS/HTML/cs/output-trad.html
 share/mplayer/DOCS/HTML/cs/ports.html
+share/mplayer/DOCS/HTML/cs/radio-input.html
+share/mplayer/DOCS/HTML/cs/radio.html
 share/mplayer/DOCS/HTML/cs/rtc.html
 share/mplayer/DOCS/HTML/cs/skin-file.html
 share/mplayer/DOCS/HTML/cs/skin-fonts.html
@@ -84,7 +83,6 @@ share/mplayer/DOCS/HTML/cs/tv.html
 share/mplayer/DOCS/HTML/cs/tvout.html
 share/mplayer/DOCS/HTML/cs/unix.html
 share/mplayer/DOCS/HTML/cs/usage.html
-share/mplayer/DOCS/HTML/cs/users-vs-dev.html
 share/mplayer/DOCS/HTML/cs/vcd.html
 share/mplayer/DOCS/HTML/cs/video-cards.html
 share/mplayer/DOCS/HTML/cs/video-codecs.html
@@ -122,22 +120,20 @@ share/mplayer/DOCS/HTML/de/encoding-guide.html
 share/mplayer/DOCS/HTML/de/exotic_platforms.html
 share/mplayer/DOCS/HTML/de/faq.html
 share/mplayer/DOCS/HTML/de/features.html
-share/mplayer/DOCS/HTML/de/gcc-296.html
+share/mplayer/DOCS/HTML/de/fonts-osd.html
 share/mplayer/DOCS/HTML/de/gui.html
 share/mplayer/DOCS/HTML/de/history.html
 share/mplayer/DOCS/HTML/de/howtoread.html
 share/mplayer/DOCS/HTML/de/index.html
 share/mplayer/DOCS/HTML/de/install.html
-share/mplayer/DOCS/HTML/de/installation_codecs.html
 share/mplayer/DOCS/HTML/de/intro.html
-share/mplayer/DOCS/HTML/de/joe-barr.html
 share/mplayer/DOCS/HTML/de/linux.html
 share/mplayer/DOCS/HTML/de/macos.html
-share/mplayer/DOCS/HTML/de/mailinglists.html
 share/mplayer/DOCS/HTML/de/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/de/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/de/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/de/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/de/menc-feat-handheld-psp.html
 share/mplayer/DOCS/HTML/de/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/de/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/de/menc-feat-rescale.html
@@ -151,13 +147,13 @@ share/mplayer/DOCS/HTML/de/menc-feat-x264.html
 share/mplayer/DOCS/HTML/de/menc-feat-xvid.html
 share/mplayer/DOCS/HTML/de/mencoder.html
 share/mplayer/DOCS/HTML/de/mpeg_decoders.html
-share/mplayer/DOCS/HTML/de/mplayer-binary.html
 share/mplayer/DOCS/HTML/de/mpst.html
 share/mplayer/DOCS/HTML/de/mtrr.html
-share/mplayer/DOCS/HTML/de/nvidia-opinions.html
 share/mplayer/DOCS/HTML/de/other.html
 share/mplayer/DOCS/HTML/de/output-trad.html
 share/mplayer/DOCS/HTML/de/ports.html
+share/mplayer/DOCS/HTML/de/radio-input.html
+share/mplayer/DOCS/HTML/de/radio.html
 share/mplayer/DOCS/HTML/de/rtc.html
 share/mplayer/DOCS/HTML/de/skin-file.html
 share/mplayer/DOCS/HTML/de/skin-fonts.html
@@ -176,7 +172,6 @@ share/mplayer/DOCS/HTML/de/tv.html
 share/mplayer/DOCS/HTML/de/tvout.html
 share/mplayer/DOCS/HTML/de/unix.html
 share/mplayer/DOCS/HTML/de/usage.html
-share/mplayer/DOCS/HTML/de/users-vs-dev.html
 share/mplayer/DOCS/HTML/de/vcd.html
 share/mplayer/DOCS/HTML/de/video-cards.html
 share/mplayer/DOCS/HTML/de/video-codecs.html
@@ -214,22 +209,20 @@ share/mplayer/DOCS/HTML/en/encoding-guide.html
 share/mplayer/DOCS/HTML/en/exotic_platforms.html
 share/mplayer/DOCS/HTML/en/faq.html
 share/mplayer/DOCS/HTML/en/features.html
-share/mplayer/DOCS/HTML/en/gcc-296.html
+share/mplayer/DOCS/HTML/en/fonts-osd.html
 share/mplayer/DOCS/HTML/en/gui.html
 share/mplayer/DOCS/HTML/en/history.html
 share/mplayer/DOCS/HTML/en/howtoread.html
 share/mplayer/DOCS/HTML/en/index.html
 share/mplayer/DOCS/HTML/en/install.html
-share/mplayer/DOCS/HTML/en/installation_codecs.html
 share/mplayer/DOCS/HTML/en/intro.html
-share/mplayer/DOCS/HTML/en/joe-barr.html
 share/mplayer/DOCS/HTML/en/linux.html
 share/mplayer/DOCS/HTML/en/macos.html
-share/mplayer/DOCS/HTML/en/mailinglists.html
 share/mplayer/DOCS/HTML/en/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/en/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/en/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/en/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/en/menc-feat-handheld-psp.html
 share/mplayer/DOCS/HTML/en/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/en/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/en/menc-feat-rescale.html
@@ -243,13 +236,13 @@ share/mplayer/DOCS/HTML/en/menc-feat-x264.html
 share/mplayer/DOCS/HTML/en/menc-feat-xvid.html
 share/mplayer/DOCS/HTML/en/mencoder.html
 share/mplayer/DOCS/HTML/en/mpeg_decoders.html
-share/mplayer/DOCS/HTML/en/mplayer-binary.html
 share/mplayer/DOCS/HTML/en/mpst.html
 share/mplayer/DOCS/HTML/en/mtrr.html
-share/mplayer/DOCS/HTML/en/nvidia-opinions.html
 share/mplayer/DOCS/HTML/en/other.html
 share/mplayer/DOCS/HTML/en/output-trad.html
 share/mplayer/DOCS/HTML/en/ports.html
+share/mplayer/DOCS/HTML/en/radio-input.html
+share/mplayer/DOCS/HTML/en/radio.html
 share/mplayer/DOCS/HTML/en/rtc.html
 share/mplayer/DOCS/HTML/en/skin-file.html
 share/mplayer/DOCS/HTML/en/skin-fonts.html
@@ -268,7 +261,6 @@ share/mplayer/DOCS/HTML/en/tv.html
 share/mplayer/DOCS/HTML/en/tvout.html
 share/mplayer/DOCS/HTML/en/unix.html
 share/mplayer/DOCS/HTML/en/usage.html
-share/mplayer/DOCS/HTML/en/users-vs-dev.html
 share/mplayer/DOCS/HTML/en/vcd.html
 share/mplayer/DOCS/HTML/en/video-cards.html
 share/mplayer/DOCS/HTML/en/video-codecs.html
@@ -300,7 +292,6 @@ share/mplayer/DOCS/HTML/es/edl.html
 share/mplayer/DOCS/HTML/es/faq.html
 share/mplayer/DOCS/HTML/es/features.html
 share/mplayer/DOCS/HTML/es/formats.html
-share/mplayer/DOCS/HTML/es/gcc-296.html
 share/mplayer/DOCS/HTML/es/gui.html
 share/mplayer/DOCS/HTML/es/history.html
 share/mplayer/DOCS/HTML/es/howtoread.html
@@ -309,10 +300,8 @@ share/mplayer/DOCS/HTML/es/index.html
 share/mplayer/DOCS/HTML/es/install.html
 share/mplayer/DOCS/HTML/es/intro.html
 share/mplayer/DOCS/HTML/es/irix.html
-share/mplayer/DOCS/HTML/es/joe-barr.html
 share/mplayer/DOCS/HTML/es/linux.html
 share/mplayer/DOCS/HTML/es/macos.html
-share/mplayer/DOCS/HTML/es/mailinglists.html
 share/mplayer/DOCS/HTML/es/menc-feat-divx4.html
 share/mplayer/DOCS/HTML/es/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/es/menc-feat-enc-images.html
@@ -324,9 +313,7 @@ share/mplayer/DOCS/HTML/es/menc-feat-rescale.html
 share/mplayer/DOCS/HTML/es/menc-feat-streamcopy.html
 share/mplayer/DOCS/HTML/es/menc-feat-telecine.html
 share/mplayer/DOCS/HTML/es/mencoder.html
-share/mplayer/DOCS/HTML/es/mplayer-binary.html
 share/mplayer/DOCS/HTML/es/mpst.html
-share/mplayer/DOCS/HTML/es/nvidia-opinions.html
 share/mplayer/DOCS/HTML/es/ports.html
 share/mplayer/DOCS/HTML/es/qnx.html
 share/mplayer/DOCS/HTML/es/rtc.html
@@ -340,7 +327,6 @@ share/mplayer/DOCS/HTML/es/streaming.html
 share/mplayer/DOCS/HTML/es/subosd.html
 share/mplayer/DOCS/HTML/es/tv-input.html
 share/mplayer/DOCS/HTML/es/usage.html
-share/mplayer/DOCS/HTML/es/users-vs-dev.html
 share/mplayer/DOCS/HTML/es/vcd.html
 share/mplayer/DOCS/HTML/es/windows.html
 share/mplayer/DOCS/HTML/fr/advaudio.html
@@ -374,22 +360,20 @@ share/mplayer/DOCS/HTML/fr/encoding-guide.html
 share/mplayer/DOCS/HTML/fr/exotic_platforms.html
 share/mplayer/DOCS/HTML/fr/faq.html
 share/mplayer/DOCS/HTML/fr/features.html
-share/mplayer/DOCS/HTML/fr/gcc-296.html
+share/mplayer/DOCS/HTML/fr/fonts-osd.html
 share/mplayer/DOCS/HTML/fr/gui.html
 share/mplayer/DOCS/HTML/fr/history.html
 share/mplayer/DOCS/HTML/fr/howtoread.html
 share/mplayer/DOCS/HTML/fr/index.html
 share/mplayer/DOCS/HTML/fr/install.html
-share/mplayer/DOCS/HTML/fr/installation_codecs.html
 share/mplayer/DOCS/HTML/fr/intro.html
-share/mplayer/DOCS/HTML/fr/joe-barr.html
 share/mplayer/DOCS/HTML/fr/linux.html
 share/mplayer/DOCS/HTML/fr/macos.html
-share/mplayer/DOCS/HTML/fr/mailinglists.html
 share/mplayer/DOCS/HTML/fr/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/fr/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/fr/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/fr/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/fr/menc-feat-handheld-psp.html
 share/mplayer/DOCS/HTML/fr/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/fr/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/fr/menc-feat-rescale.html
@@ -398,17 +382,18 @@ share/mplayer/DOCS/HTML/fr/menc-feat-selecting-input.html
 share/mplayer/DOCS/HTML/fr/menc-feat-streamcopy.html
 share/mplayer/DOCS/HTML/fr/menc-feat-telecine.html
 share/mplayer/DOCS/HTML/fr/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/fr/menc-feat-video-for-windows.html
 share/mplayer/DOCS/HTML/fr/menc-feat-x264.html
 share/mplayer/DOCS/HTML/fr/menc-feat-xvid.html
 share/mplayer/DOCS/HTML/fr/mencoder.html
 share/mplayer/DOCS/HTML/fr/mpeg_decoders.html
-share/mplayer/DOCS/HTML/fr/mplayer-binary.html
 share/mplayer/DOCS/HTML/fr/mpst.html
 share/mplayer/DOCS/HTML/fr/mtrr.html
-share/mplayer/DOCS/HTML/fr/nvidia-opinions.html
 share/mplayer/DOCS/HTML/fr/other.html
 share/mplayer/DOCS/HTML/fr/output-trad.html
 share/mplayer/DOCS/HTML/fr/ports.html
+share/mplayer/DOCS/HTML/fr/radio-input.html
+share/mplayer/DOCS/HTML/fr/radio.html
 share/mplayer/DOCS/HTML/fr/rtc.html
 share/mplayer/DOCS/HTML/fr/skin-file.html
 share/mplayer/DOCS/HTML/fr/skin-fonts.html
@@ -427,7 +412,6 @@ share/mplayer/DOCS/HTML/fr/tv.html
 share/mplayer/DOCS/HTML/fr/tvout.html
 share/mplayer/DOCS/HTML/fr/unix.html
 share/mplayer/DOCS/HTML/fr/usage.html
-share/mplayer/DOCS/HTML/fr/users-vs-dev.html
 share/mplayer/DOCS/HTML/fr/vcd.html
 share/mplayer/DOCS/HTML/fr/video-cards.html
 share/mplayer/DOCS/HTML/fr/video-codecs.html
@@ -465,22 +449,20 @@ share/mplayer/DOCS/HTML/hu/encoding-guide.html
 share/mplayer/DOCS/HTML/hu/exotic_platforms.html
 share/mplayer/DOCS/HTML/hu/faq.html
 share/mplayer/DOCS/HTML/hu/features.html
-share/mplayer/DOCS/HTML/hu/gcc-296.html
+share/mplayer/DOCS/HTML/hu/fonts-osd.html
 share/mplayer/DOCS/HTML/hu/gui.html
 share/mplayer/DOCS/HTML/hu/history.html
 share/mplayer/DOCS/HTML/hu/howtoread.html
 share/mplayer/DOCS/HTML/hu/index.html
 share/mplayer/DOCS/HTML/hu/install.html
-share/mplayer/DOCS/HTML/hu/installation_codecs.html
 share/mplayer/DOCS/HTML/hu/intro.html
-share/mplayer/DOCS/HTML/hu/joe-barr.html
 share/mplayer/DOCS/HTML/hu/linux.html
 share/mplayer/DOCS/HTML/hu/macos.html
-share/mplayer/DOCS/HTML/hu/mailinglists.html
 share/mplayer/DOCS/HTML/hu/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/hu/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/hu/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/hu/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/hu/menc-feat-handheld-psp.html
 share/mplayer/DOCS/HTML/hu/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/hu/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/hu/menc-feat-rescale.html
@@ -494,13 +476,13 @@ share/mplayer/DOCS/HTML/hu/menc-feat-x264.html
 share/mplayer/DOCS/HTML/hu/menc-feat-xvid.html
 share/mplayer/DOCS/HTML/hu/mencoder.html
 share/mplayer/DOCS/HTML/hu/mpeg_decoders.html
-share/mplayer/DOCS/HTML/hu/mplayer-binary.html
 share/mplayer/DOCS/HTML/hu/mpst.html
 share/mplayer/DOCS/HTML/hu/mtrr.html
-share/mplayer/DOCS/HTML/hu/nvidia-opinions.html
 share/mplayer/DOCS/HTML/hu/other.html
 share/mplayer/DOCS/HTML/hu/output-trad.html
 share/mplayer/DOCS/HTML/hu/ports.html
+share/mplayer/DOCS/HTML/hu/radio-input.html
+share/mplayer/DOCS/HTML/hu/radio.html
 share/mplayer/DOCS/HTML/hu/rtc.html
 share/mplayer/DOCS/HTML/hu/skin-file.html
 share/mplayer/DOCS/HTML/hu/skin-fonts.html
@@ -519,123 +501,144 @@ share/mplayer/DOCS/HTML/hu/tv.html
 share/mplayer/DOCS/HTML/hu/tvout.html
 share/mplayer/DOCS/HTML/hu/unix.html
 share/mplayer/DOCS/HTML/hu/usage.html
-share/mplayer/DOCS/HTML/hu/users-vs-dev.html
 share/mplayer/DOCS/HTML/hu/vcd.html
 share/mplayer/DOCS/HTML/hu/video-cards.html
 share/mplayer/DOCS/HTML/hu/video-codecs.html
 share/mplayer/DOCS/HTML/hu/video-formats.html
 share/mplayer/DOCS/HTML/hu/video.html
 share/mplayer/DOCS/HTML/hu/windows.html
-share/mplayer/DOCS/HTML/pl/amiga.html
+share/mplayer/DOCS/HTML/pl/advaudio.html
 share/mplayer/DOCS/HTML/pl/aspect.html
+share/mplayer/DOCS/HTML/pl/audio-codecs.html
+share/mplayer/DOCS/HTML/pl/audio-formats.html
 share/mplayer/DOCS/HTML/pl/audio.html
 share/mplayer/DOCS/HTML/pl/bsd.html
 share/mplayer/DOCS/HTML/pl/bugreports.html
 share/mplayer/DOCS/HTML/pl/bugreports_advusers.html
 share/mplayer/DOCS/HTML/pl/bugreports_fix.html
+share/mplayer/DOCS/HTML/pl/bugreports_regression_test.html
 share/mplayer/DOCS/HTML/pl/bugreports_report.html
+share/mplayer/DOCS/HTML/pl/bugreports_security.html
 share/mplayer/DOCS/HTML/pl/bugreports_what.html
 share/mplayer/DOCS/HTML/pl/bugreports_where.html
 share/mplayer/DOCS/HTML/pl/bugs-audio.html
 share/mplayer/DOCS/HTML/pl/bugs-special.html
 share/mplayer/DOCS/HTML/pl/bugs.html
 share/mplayer/DOCS/HTML/pl/cd-dvd.html
+share/mplayer/DOCS/HTML/pl/codec-importing.html
 share/mplayer/DOCS/HTML/pl/codecs.html
 share/mplayer/DOCS/HTML/pl/commandline.html
 share/mplayer/DOCS/HTML/pl/control.html
-share/mplayer/DOCS/HTML/pl/custommatrices.html
 share/mplayer/DOCS/HTML/pl/default.css
 share/mplayer/DOCS/HTML/pl/drives.html
 share/mplayer/DOCS/HTML/pl/dvd.html
 share/mplayer/DOCS/HTML/pl/edl.html
+share/mplayer/DOCS/HTML/pl/encoding-guide.html
+share/mplayer/DOCS/HTML/pl/exotic_platforms.html
 share/mplayer/DOCS/HTML/pl/faq.html
 share/mplayer/DOCS/HTML/pl/features.html
 share/mplayer/DOCS/HTML/pl/formats.html
-share/mplayer/DOCS/HTML/pl/gcc-296.html
 share/mplayer/DOCS/HTML/pl/gui.html
 share/mplayer/DOCS/HTML/pl/history.html
 share/mplayer/DOCS/HTML/pl/howtoread.html
-share/mplayer/DOCS/HTML/pl/hp-ux.html
 share/mplayer/DOCS/HTML/pl/index.html
 share/mplayer/DOCS/HTML/pl/install.html
+share/mplayer/DOCS/HTML/pl/installation_codecs.html
 share/mplayer/DOCS/HTML/pl/intro.html
-share/mplayer/DOCS/HTML/pl/irix.html
-share/mplayer/DOCS/HTML/pl/joe-barr.html
 share/mplayer/DOCS/HTML/pl/linux.html
 share/mplayer/DOCS/HTML/pl/macos.html
-share/mplayer/DOCS/HTML/pl/mailinglists.html
 share/mplayer/DOCS/HTML/pl/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/pl/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/pl/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/pl/menc-feat-extractsub.html
-share/mplayer/DOCS/HTML/pl/menc-feat-fix-avi.html
 share/mplayer/DOCS/HTML/pl/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/pl/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/pl/menc-feat-rescale.html
+share/mplayer/DOCS/HTML/pl/menc-feat-selecting-codec.html
+share/mplayer/DOCS/HTML/pl/menc-feat-selecting-input.html
 share/mplayer/DOCS/HTML/pl/menc-feat-streamcopy.html
 share/mplayer/DOCS/HTML/pl/menc-feat-telecine.html
+share/mplayer/DOCS/HTML/pl/menc-feat-vcd-dvd.html
+share/mplayer/DOCS/HTML/pl/menc-feat-x264.html
+share/mplayer/DOCS/HTML/pl/menc-feat-xvid.html
 share/mplayer/DOCS/HTML/pl/mencoder.html
-share/mplayer/DOCS/HTML/pl/mplayer-binary.html
+share/mplayer/DOCS/HTML/pl/mpeg_decoders.html
 share/mplayer/DOCS/HTML/pl/mpst.html
-share/mplayer/DOCS/HTML/pl/nvidia-opinions.html
+share/mplayer/DOCS/HTML/pl/mtrr.html
+share/mplayer/DOCS/HTML/pl/other.html
+share/mplayer/DOCS/HTML/pl/output-trad.html
 share/mplayer/DOCS/HTML/pl/ports.html
-share/mplayer/DOCS/HTML/pl/qnx.html
+share/mplayer/DOCS/HTML/pl/radio-input.html
+share/mplayer/DOCS/HTML/pl/radio.html
 share/mplayer/DOCS/HTML/pl/rtc.html
 share/mplayer/DOCS/HTML/pl/skin-file.html
 share/mplayer/DOCS/HTML/pl/skin-fonts.html
 share/mplayer/DOCS/HTML/pl/skin-gui.html
 share/mplayer/DOCS/HTML/pl/skin-overview.html
+share/mplayer/DOCS/HTML/pl/skin-quality.html
 share/mplayer/DOCS/HTML/pl/skin.html
-share/mplayer/DOCS/HTML/pl/solaris.html
+share/mplayer/DOCS/HTML/pl/softreq.html
+share/mplayer/DOCS/HTML/pl/sound-cards.html
 share/mplayer/DOCS/HTML/pl/streaming.html
 share/mplayer/DOCS/HTML/pl/subosd.html
+share/mplayer/DOCS/HTML/pl/sync.html
+share/mplayer/DOCS/HTML/pl/troubleshooting.html
 share/mplayer/DOCS/HTML/pl/tv-input.html
+share/mplayer/DOCS/HTML/pl/tv.html
+share/mplayer/DOCS/HTML/pl/tvout.html
+share/mplayer/DOCS/HTML/pl/unix.html
 share/mplayer/DOCS/HTML/pl/usage.html
-share/mplayer/DOCS/HTML/pl/users-vs-dev.html
 share/mplayer/DOCS/HTML/pl/vcd.html
+share/mplayer/DOCS/HTML/pl/video-cards.html
+share/mplayer/DOCS/HTML/pl/video-codecs.html
+share/mplayer/DOCS/HTML/pl/video-formats.html
 share/mplayer/DOCS/HTML/pl/video.html
 share/mplayer/DOCS/HTML/pl/windows.html
-share/mplayer/DOCS/HTML/ru/amiga.html
+share/mplayer/DOCS/HTML/ru/advaudio.html
 share/mplayer/DOCS/HTML/ru/aspect.html
+share/mplayer/DOCS/HTML/ru/audio-codecs.html
+share/mplayer/DOCS/HTML/ru/audio-formats.html
 share/mplayer/DOCS/HTML/ru/audio.html
 share/mplayer/DOCS/HTML/ru/bsd.html
 share/mplayer/DOCS/HTML/ru/bugreports.html
 share/mplayer/DOCS/HTML/ru/bugreports_advusers.html
 share/mplayer/DOCS/HTML/ru/bugreports_fix.html
+share/mplayer/DOCS/HTML/ru/bugreports_regression_test.html
 share/mplayer/DOCS/HTML/ru/bugreports_report.html
+share/mplayer/DOCS/HTML/ru/bugreports_security.html
 share/mplayer/DOCS/HTML/ru/bugreports_what.html
 share/mplayer/DOCS/HTML/ru/bugreports_where.html
 share/mplayer/DOCS/HTML/ru/bugs-audio.html
 share/mplayer/DOCS/HTML/ru/bugs-special.html
 share/mplayer/DOCS/HTML/ru/bugs.html
 share/mplayer/DOCS/HTML/ru/cd-dvd.html
+share/mplayer/DOCS/HTML/ru/codec-importing.html
 share/mplayer/DOCS/HTML/ru/codecs.html
 share/mplayer/DOCS/HTML/ru/commandline.html
+share/mplayer/DOCS/HTML/ru/containers.html
 share/mplayer/DOCS/HTML/ru/control.html
 share/mplayer/DOCS/HTML/ru/default.css
 share/mplayer/DOCS/HTML/ru/drives.html
 share/mplayer/DOCS/HTML/ru/dvd.html
 share/mplayer/DOCS/HTML/ru/edl.html
 share/mplayer/DOCS/HTML/ru/encoding-guide.html
+share/mplayer/DOCS/HTML/ru/exotic_platforms.html
 share/mplayer/DOCS/HTML/ru/faq.html
 share/mplayer/DOCS/HTML/ru/features.html
-share/mplayer/DOCS/HTML/ru/formats.html
-share/mplayer/DOCS/HTML/ru/gcc-296.html
+share/mplayer/DOCS/HTML/ru/fonts-osd.html
 share/mplayer/DOCS/HTML/ru/gui.html
 share/mplayer/DOCS/HTML/ru/history.html
 share/mplayer/DOCS/HTML/ru/howtoread.html
-share/mplayer/DOCS/HTML/ru/hp-ux.html
 share/mplayer/DOCS/HTML/ru/index.html
 share/mplayer/DOCS/HTML/ru/install.html
 share/mplayer/DOCS/HTML/ru/intro.html
-share/mplayer/DOCS/HTML/ru/joe-barr.html
 share/mplayer/DOCS/HTML/ru/linux.html
 share/mplayer/DOCS/HTML/ru/macos.html
-share/mplayer/DOCS/HTML/ru/mailinglists.html
 share/mplayer/DOCS/HTML/ru/menc-feat-dvd-mpeg4.html
 share/mplayer/DOCS/HTML/ru/menc-feat-enc-images.html
 share/mplayer/DOCS/HTML/ru/menc-feat-enc-libavcodec.html
 share/mplayer/DOCS/HTML/ru/menc-feat-extractsub.html
+share/mplayer/DOCS/HTML/ru/menc-feat-handheld-psp.html
 share/mplayer/DOCS/HTML/ru/menc-feat-mpeg.html
 share/mplayer/DOCS/HTML/ru/menc-feat-mpeg4.html
 share/mplayer/DOCS/HTML/ru/menc-feat-rescale.html
@@ -649,47 +652,39 @@ share/mplayer/DOCS/HTML/ru/menc-feat-x264.html
 share/mplayer/DOCS/HTML/ru/menc-feat-xvid.html
 share/mplayer/DOCS/HTML/ru/mencoder.html
 share/mplayer/DOCS/HTML/ru/mpeg_decoders.html
-share/mplayer/DOCS/HTML/ru/mplayer-binary.html
 share/mplayer/DOCS/HTML/ru/mpst.html
 share/mplayer/DOCS/HTML/ru/mtrr.html
-share/mplayer/DOCS/HTML/ru/nvidia-opinions.html
 share/mplayer/DOCS/HTML/ru/other.html
 share/mplayer/DOCS/HTML/ru/output-trad.html
 share/mplayer/DOCS/HTML/ru/ports.html
-share/mplayer/DOCS/HTML/ru/qnx.html
+share/mplayer/DOCS/HTML/ru/radio-input.html
+share/mplayer/DOCS/HTML/ru/radio.html
 share/mplayer/DOCS/HTML/ru/rtc.html
-share/mplayer/DOCS/HTML/ru/sgi.html
 share/mplayer/DOCS/HTML/ru/skin-file.html
 share/mplayer/DOCS/HTML/ru/skin-fonts.html
 share/mplayer/DOCS/HTML/ru/skin-gui.html
 share/mplayer/DOCS/HTML/ru/skin-overview.html
 share/mplayer/DOCS/HTML/ru/skin-quality.html
 share/mplayer/DOCS/HTML/ru/skin.html
-share/mplayer/DOCS/HTML/ru/solaris.html
+share/mplayer/DOCS/HTML/ru/softreq.html
+share/mplayer/DOCS/HTML/ru/sound-cards.html
 share/mplayer/DOCS/HTML/ru/streaming.html
 share/mplayer/DOCS/HTML/ru/subosd.html
 share/mplayer/DOCS/HTML/ru/sync.html
 share/mplayer/DOCS/HTML/ru/troubleshooting.html
 share/mplayer/DOCS/HTML/ru/tv-input.html
+share/mplayer/DOCS/HTML/ru/tv.html
 share/mplayer/DOCS/HTML/ru/tvout.html
+share/mplayer/DOCS/HTML/ru/unix.html
 share/mplayer/DOCS/HTML/ru/usage.html
-share/mplayer/DOCS/HTML/ru/users-vs-dev.html
 share/mplayer/DOCS/HTML/ru/vcd.html
+share/mplayer/DOCS/HTML/ru/video-cards.html
+share/mplayer/DOCS/HTML/ru/video-codecs.html
+share/mplayer/DOCS/HTML/ru/video-formats.html
 share/mplayer/DOCS/HTML/ru/video.html
 share/mplayer/DOCS/HTML/ru/windows.html
 share/mplayer/DOCS/README
 share/mplayer/DOCS/default.css
-share/mplayer/DOCS/it/bugreports.html
-share/mplayer/DOCS/it/cd-dvd.html
-share/mplayer/DOCS/it/codecs.html
-share/mplayer/DOCS/it/documentation.html
-share/mplayer/DOCS/it/encoding.html
-share/mplayer/DOCS/it/faq.html
-share/mplayer/DOCS/it/formats.html
-share/mplayer/DOCS/it/skin.html
-share/mplayer/DOCS/it/sound.html
-share/mplayer/DOCS/it/users_against_developers.html
-share/mplayer/DOCS/it/video.html
 share/mplayer/DOCS/man/cs/mplayer.1
 share/mplayer/DOCS/man/de/mplayer.1
 share/mplayer/DOCS/man/en/mplayer.1
@@ -709,7 +704,6 @@ share/mplayer/DOCS/tech/codec-devel.txt
 share/mplayer/DOCS/tech/codecs-in.html
 share/mplayer/DOCS/tech/codecs.conf.txt
 share/mplayer/DOCS/tech/colorspaces.txt
-share/mplayer/DOCS/tech/cvs-howto.txt
 share/mplayer/DOCS/tech/dr-methods.txt
 share/mplayer/DOCS/tech/encoding-guide.txt
 share/mplayer/DOCS/tech/encoding-tips.txt
@@ -722,9 +716,10 @@ share/mplayer/DOCS/tech/libvo.txt
 share/mplayer/DOCS/tech/manpage.txt
 share/mplayer/DOCS/tech/mirrors/mirror_howto.txt
 share/mplayer/DOCS/tech/mirrors/update_mplayer_rsync
-share/mplayer/DOCS/tech/mpcf.txt
 share/mplayer/DOCS/tech/mpdsf.txt
 share/mplayer/DOCS/tech/mpsub.sub
+share/mplayer/DOCS/tech/nut.txt
+share/mplayer/DOCS/tech/oggless-xiph-codecs.txt
 share/mplayer/DOCS/tech/osd.txt
 share/mplayer/DOCS/tech/patches.txt
 share/mplayer/DOCS/tech/playtree
@@ -737,6 +732,7 @@ share/mplayer/DOCS/tech/release-howto.txt
 share/mplayer/DOCS/tech/slave.txt
 share/mplayer/DOCS/tech/snow.txt
 share/mplayer/DOCS/tech/subcp.txt
+share/mplayer/DOCS/tech/svn-howto.txt
 share/mplayer/DOCS/tech/swscaler_filters.txt
 share/mplayer/DOCS/tech/swscaler_methods.txt
 share/mplayer/DOCS/tech/translations.txt
@@ -753,37 +749,37 @@ share/mplayer/DOCS/xml/cs/bugreports.xml
 share/mplayer/DOCS/xml/cs/bugs.xml
 share/mplayer/DOCS/xml/cs/cd-dvd.xml
 share/mplayer/DOCS/xml/cs/codecs.xml
+share/mplayer/DOCS/xml/cs/containers.xml
 share/mplayer/DOCS/xml/cs/documentation.xml
 share/mplayer/DOCS/xml/cs/encoding-guide.xml
 share/mplayer/DOCS/xml/cs/faq.xml
-share/mplayer/DOCS/xml/cs/formats.xml
 share/mplayer/DOCS/xml/cs/history.xml
 share/mplayer/DOCS/xml/cs/install.xml
-share/mplayer/DOCS/xml/cs/mail-lists.xml
 share/mplayer/DOCS/xml/cs/mencoder.xml
 share/mplayer/DOCS/xml/cs/ports.xml
+share/mplayer/DOCS/xml/cs/radio.xml
 share/mplayer/DOCS/xml/cs/skin.xml
 share/mplayer/DOCS/xml/cs/tvinput.xml
 share/mplayer/DOCS/xml/cs/usage.xml
-share/mplayer/DOCS/xml/cs/users-vs-dev.xml
 share/mplayer/DOCS/xml/cs/video.xml
 share/mplayer/DOCS/xml/de/Makefile
 share/mplayer/DOCS/xml/de/audio.xml
 share/mplayer/DOCS/xml/de/bugreports.xml
 share/mplayer/DOCS/xml/de/bugs.xml
+share/mplayer/DOCS/xml/de/cd-dvd.xml
+share/mplayer/DOCS/xml/de/codecs.xml
+share/mplayer/DOCS/xml/de/containers.xml
 share/mplayer/DOCS/xml/de/documentation.xml
 share/mplayer/DOCS/xml/de/encoding-guide.xml
 share/mplayer/DOCS/xml/de/faq.xml
-share/mplayer/DOCS/xml/de/formats.xml
 share/mplayer/DOCS/xml/de/history.xml
 share/mplayer/DOCS/xml/de/install.xml
-share/mplayer/DOCS/xml/de/mail-lists.xml
 share/mplayer/DOCS/xml/de/mencoder.xml
 share/mplayer/DOCS/xml/de/ports.xml
+share/mplayer/DOCS/xml/de/radio.xml
 share/mplayer/DOCS/xml/de/skin.xml
 share/mplayer/DOCS/xml/de/tvinput.xml
 share/mplayer/DOCS/xml/de/usage.xml
-share/mplayer/DOCS/xml/de/users-vs-dev.xml
 share/mplayer/DOCS/xml/de/video.xml
 share/mplayer/DOCS/xml/default.css
 share/mplayer/DOCS/xml/en/Makefile
@@ -792,19 +788,18 @@ share/mplayer/DOCS/xml/en/bugreports.xml
 share/mplayer/DOCS/xml/en/bugs.xml
 share/mplayer/DOCS/xml/en/cd-dvd.xml
 share/mplayer/DOCS/xml/en/codecs.xml
+share/mplayer/DOCS/xml/en/containers.xml
 share/mplayer/DOCS/xml/en/documentation.xml
 share/mplayer/DOCS/xml/en/encoding-guide.xml
 share/mplayer/DOCS/xml/en/faq.xml
-share/mplayer/DOCS/xml/en/formats.xml
 share/mplayer/DOCS/xml/en/history.xml
 share/mplayer/DOCS/xml/en/install.xml
-share/mplayer/DOCS/xml/en/mail-lists.xml
 share/mplayer/DOCS/xml/en/mencoder.xml
 share/mplayer/DOCS/xml/en/ports.xml
+share/mplayer/DOCS/xml/en/radio.xml
 share/mplayer/DOCS/xml/en/skin.xml
 share/mplayer/DOCS/xml/en/tvinput.xml
 share/mplayer/DOCS/xml/en/usage.xml
-share/mplayer/DOCS/xml/en/users-vs-dev.xml
 share/mplayer/DOCS/xml/en/video.xml
 share/mplayer/DOCS/xml/es/Makefile
 share/mplayer/DOCS/xml/es/audio.xml
@@ -818,13 +813,11 @@ share/mplayer/DOCS/xml/es/features.xml
 share/mplayer/DOCS/xml/es/formats.xml
 share/mplayer/DOCS/xml/es/history.xml
 share/mplayer/DOCS/xml/es/install.xml
-share/mplayer/DOCS/xml/es/mail-lists.xml
 share/mplayer/DOCS/xml/es/mencoder.xml
 share/mplayer/DOCS/xml/es/ports.xml
 share/mplayer/DOCS/xml/es/skin.xml
 share/mplayer/DOCS/xml/es/tvinput.xml
 share/mplayer/DOCS/xml/es/usage.xml
-share/mplayer/DOCS/xml/es/users-vs-dev.xml
 share/mplayer/DOCS/xml/es/video.xml
 share/mplayer/DOCS/xml/fr/Makefile
 share/mplayer/DOCS/xml/fr/audio.xml
@@ -832,19 +825,18 @@ share/mplayer/DOCS/xml/fr/bugreports.xml
 share/mplayer/DOCS/xml/fr/bugs.xml
 share/mplayer/DOCS/xml/fr/cd-dvd.xml
 share/mplayer/DOCS/xml/fr/codecs.xml
+share/mplayer/DOCS/xml/fr/containers.xml
 share/mplayer/DOCS/xml/fr/documentation.xml
 share/mplayer/DOCS/xml/fr/encoding-guide.xml
 share/mplayer/DOCS/xml/fr/faq.xml
-share/mplayer/DOCS/xml/fr/formats.xml
 share/mplayer/DOCS/xml/fr/history.xml
 share/mplayer/DOCS/xml/fr/install.xml
-share/mplayer/DOCS/xml/fr/mail-lists.xml
 share/mplayer/DOCS/xml/fr/mencoder.xml
 share/mplayer/DOCS/xml/fr/ports.xml
+share/mplayer/DOCS/xml/fr/radio.xml
 share/mplayer/DOCS/xml/fr/skin.xml
 share/mplayer/DOCS/xml/fr/tvinput.xml
 share/mplayer/DOCS/xml/fr/usage.xml
-share/mplayer/DOCS/xml/fr/users-vs-dev.xml
 share/mplayer/DOCS/xml/fr/video.xml
 share/mplayer/DOCS/xml/html-common.xsl
 share/mplayer/DOCS/xml/hu/Makefile
@@ -853,19 +845,18 @@ share/mplayer/DOCS/xml/hu/bugreports.xml
 share/mplayer/DOCS/xml/hu/bugs.xml
 share/mplayer/DOCS/xml/hu/cd-dvd.xml
 share/mplayer/DOCS/xml/hu/codecs.xml
+share/mplayer/DOCS/xml/hu/containers.xml
 share/mplayer/DOCS/xml/hu/documentation.xml
 share/mplayer/DOCS/xml/hu/encoding-guide.xml
 share/mplayer/DOCS/xml/hu/faq.xml
-share/mplayer/DOCS/xml/hu/formats.xml
 share/mplayer/DOCS/xml/hu/history.xml
 share/mplayer/DOCS/xml/hu/install.xml
-share/mplayer/DOCS/xml/hu/mail-lists.xml
 share/mplayer/DOCS/xml/hu/mencoder.xml
 share/mplayer/DOCS/xml/hu/ports.xml
+share/mplayer/DOCS/xml/hu/radio.xml
 share/mplayer/DOCS/xml/hu/skin.xml
 share/mplayer/DOCS/xml/hu/tvinput.xml
 share/mplayer/DOCS/xml/hu/usage.xml
-share/mplayer/DOCS/xml/hu/users-vs-dev.xml
 share/mplayer/DOCS/xml/hu/video.xml
 share/mplayer/DOCS/xml/ldp.dsl
 share/mplayer/DOCS/xml/pl/Makefile
@@ -874,41 +865,43 @@ share/mplayer/DOCS/xml/pl/bugreports.xml
 share/mplayer/DOCS/xml/pl/bugs.xml
 share/mplayer/DOCS/xml/pl/cd-dvd.xml
 share/mplayer/DOCS/xml/pl/codecs.xml
+share/mplayer/DOCS/xml/pl/containers.xml
 share/mplayer/DOCS/xml/pl/documentation.xml
+share/mplayer/DOCS/xml/pl/encoding-guide.xml
 share/mplayer/DOCS/xml/pl/faq.xml
-share/mplayer/DOCS/xml/pl/features.xml
-share/mplayer/DOCS/xml/pl/formats.xml
 share/mplayer/DOCS/xml/pl/history.xml
 share/mplayer/DOCS/xml/pl/html-chunk.xsl
 share/mplayer/DOCS/xml/pl/html-common.xsl
 share/mplayer/DOCS/xml/pl/html-single.xsl
 share/mplayer/DOCS/xml/pl/install.xml
-share/mplayer/DOCS/xml/pl/mail-lists.xml
 share/mplayer/DOCS/xml/pl/mencoder.xml
 share/mplayer/DOCS/xml/pl/ports.xml
+share/mplayer/DOCS/xml/pl/radio.xml
 share/mplayer/DOCS/xml/pl/skin.xml
 share/mplayer/DOCS/xml/pl/tvinput.xml
 share/mplayer/DOCS/xml/pl/usage.xml
-share/mplayer/DOCS/xml/pl/users-vs-dev.xml
 share/mplayer/DOCS/xml/pl/video.xml
 share/mplayer/DOCS/xml/ru/Makefile
+share/mplayer/DOCS/xml/ru/audio.xml
 share/mplayer/DOCS/xml/ru/bugreports.xml
 share/mplayer/DOCS/xml/ru/bugs.xml
 share/mplayer/DOCS/xml/ru/cd-dvd.xml
 share/mplayer/DOCS/xml/ru/codecs.xml
+share/mplayer/DOCS/xml/ru/containers.xml
 share/mplayer/DOCS/xml/ru/documentation.xml
-share/mplayer/DOCS/xml/ru/features.xml
-share/mplayer/DOCS/xml/ru/formats.xml
+share/mplayer/DOCS/xml/ru/faq.xml
 share/mplayer/DOCS/xml/ru/history.xml
 share/mplayer/DOCS/xml/ru/html-chunk.xsl
 share/mplayer/DOCS/xml/ru/html-common.xsl
 share/mplayer/DOCS/xml/ru/html-single.xsl
 share/mplayer/DOCS/xml/ru/install.xml
-share/mplayer/DOCS/xml/ru/mail-lists.xml
+share/mplayer/DOCS/xml/ru/mencoder.xml
 share/mplayer/DOCS/xml/ru/ports.xml
+share/mplayer/DOCS/xml/ru/radio.xml
+share/mplayer/DOCS/xml/ru/skin.xml
 share/mplayer/DOCS/xml/ru/tvinput.xml
 share/mplayer/DOCS/xml/ru/usage.xml
-share/mplayer/DOCS/xml/ru/users-vs-dev.xml
+share/mplayer/DOCS/xml/ru/video.xml
 share/mplayer/DOCS/xml/xsl/ldp-html-chunk.xsl
 share/mplayer/DOCS/xml/xsl/ldp-html-common.xsl
 share/mplayer/DOCS/xml/xsl/ldp-html.xsl
@@ -951,7 +944,6 @@ share/mplayer/input.conf
 @dirrm share/mplayer/DOCS/man/de
 @dirrm share/mplayer/DOCS/man/cs
 @dirrm share/mplayer/DOCS/man
-@dirrm share/mplayer/DOCS/it
 @dirrm share/mplayer/DOCS/HTML/ru
 @dirrm share/mplayer/DOCS/HTML/pl
 @dirrm share/mplayer/DOCS/HTML/hu
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 03da5f92551..6a5ce771068 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.33 2006/10/11 18:32:40 rillig Exp $
+$NetBSD: distinfo,v 1.34 2006/10/31 22:33:28 wiz Exp $
 
-SHA1 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8a0929b84dcb37d47c062230ce693b64b3e30921
-RMD160 (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 23fd13fe75a5c4029ead043aa4b3b08fe5fe44f0
-Size (mplayer-1.0rc8/MPlayer-1.0pre8.tar.bz2) = 8166628 bytes
-SHA1 (patch-aa) = 9963d959da515d318fe794104acaa4b6ac504643
+SHA1 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = a450c0b0749c343a8496ba7810363c9d46dfa73c
+RMD160 (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8cea02e832aec5d9e090829d61d0f131dcc177a2
+Size (mplayer-1.0rc9/MPlayer-1.0rc1.tar.bz2) = 8414213 bytes
+SHA1 (patch-aa) = ec50dd83f781fbac260ff469846c8c91b6471642
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
-SHA1 (patch-ad) = 4744bdb2ea6ffa1a18abaef5a9cf5756f3b8a645
-SHA1 (patch-ah) = 2960a9f44b9173cd9e7a82c0dbc2379a13ed6307
-SHA1 (patch-ak) = 376bd5bd7a96e64d80d9272c336a2e0447e8232a
-SHA1 (patch-ta) = 81f8e0890cf879eec06b8cdb81facb434e80263e
-SHA1 (patch-tb) = 57980b57e1a46cb86e72311741aa05270e064dce
+SHA1 (patch-ah) = 7aeb9f04d622fcad8c40dc9edbb0a58277fc622b
 SHA1 (patch-tc) = e67443cec273d7aa168fb160e2409d2ce352a8bf
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index f77e3945918..73e7626f914 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2006/10/13 20:13:14 wiz Exp $
+# $NetBSD: options.mk,v 1.19 2006/10/31 22:33:28 wiz Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -24,7 +24,7 @@ PKG_SUPPORTED_OPTIONS=	gif jpeg mad dts dv dvdread png theora vorbis
 .if !empty(PKGNAME:M*mplayer*)
 PKG_OPTIONS_OPTIONAL_GROUPS=	faadgroup
 PKG_OPTIONS_GROUP.faadgroup=	faad mplayer-internal-faad
-PKG_SUGGESTED_OPTIONS+=		faad
+PKG_SUGGESTED_OPTIONS+=		mplayer-internal-faad
 
 PKG_SUPPORTED_OPTIONS+=	aalib esound ggi mplayer-menu nas sdl
 
@@ -86,7 +86,6 @@ CONFIGURE_ARGS+=	--disable-arts
 
 .if !empty(PKG_OPTIONS:Mcdparanoia)
 CONFIGURE_ARGS+=	--enable-cdparanoia
-CONFIGURE_ARGS+=	--with-cdparanoiaincdir="${BUILDLINK_PREFIX.cdparanoia}/include/cdparanoia"
 .  include "../../audio/cdparanoia/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cdparanoia
@@ -122,13 +121,13 @@ CONFIGURE_ARGS+=	--disable-esd
 
 
 .if empty(PKG_OPTIONS:Mfaad) && empty(PKG_OPTIONS:Mmplayer-internal-faad)
-CONFIGURE_ARGS+=	--disable-external-faad
-CONFIGURE_ARGS+=	--disable-internal-faad
+CONFIGURE_ARGS+=	--disable-faad-external
+CONFIGURE_ARGS+=	--disable-faad-internal
 .elif !empty(PKG_OPTIONS:Mfaad)
-CONFIGURE_ARGS+=	--enable-external-faad
+CONFIGURE_ARGS+=	--enable-faad-external
 .  include "../../audio/faad2/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--enable-internal-faad
+CONFIGURE_ARGS+=	--enable-faad-internal
 .endif
 
 .if !empty(PKG_OPTIONS:Mggi)
@@ -239,10 +238,10 @@ CONFIGURE_ARGS+=	--disable-theora
 .endif
 
 .if !empty(PKG_OPTIONS:Mvorbis)
-CONFIGURE_ARGS+=	--enable-vorbis
+CONFIGURE_ARGS+=	--enable-libvorbis
 .  include "../../audio/libvorbis/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=	--disable-vorbis
+CONFIGURE_ARGS+=	--disable-libvorbis
 .endif
 
 .if !empty(PKG_OPTIONS:Mxvid)
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 94d2a2c3f05..900de4bd07e 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.16 2006/10/03 14:32:24 tron Exp $
+$NetBSD: patch-aa,v 1.17 2006/10/31 22:33:28 wiz Exp $
 
---- configure.orig	2006-06-11 19:35:47.000000000 +0100
-+++ configure	2006-10-03 14:25:36.000000000 +0100
-@@ -493,7 +493,7 @@
+--- configure.orig	2006-10-22 22:32:31.000000000 +0000
++++ configure
+@@ -515,7 +515,7 @@ for ac_option do
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
 -    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
 +    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
      ;;
-   --enable-runtime-cpudetection)
-     _runtime_cpudetection=yes
-@@ -694,11 +694,11 @@
+   --extra-libs=*)
+     _extra_libs=`echo $ac_option | cut -d '=' -f 2`
+@@ -719,11 +719,11 @@ if test "$_gcc_check" = yes ; then
    esac
    echores "$cc_version"
   else
@@ -25,16 +25,7 @@ $NetBSD: patch-aa,v 1.16 2006/10/03 14:32:24 tron Exp $
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -819,7 +819,7 @@
- elif aix; then
-   # use 'lsattr' on AIX
-   _cpuinfo="lsattr -E -l proc0 -a type"
--elif x86; then
-+elif x86 || x86_64; then
-   # all other OSes try to extract CPU information from a small helper
-   # program TOOLS/cpuinfo instead
-   $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
-@@ -830,7 +830,7 @@
+@@ -855,7 +855,7 @@ if x86 || x86_64 ; then
    # gather more CPU information
    pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
    pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | _head 1`
@@ -43,7 +34,15 @@ $NetBSD: patch-aa,v 1.16 2006/10/03 14:32:24 tron Exp $
    pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
    pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
  
-@@ -4136,7 +4136,7 @@
+@@ -3034,7 +3034,6 @@ fi
+ echores "$_pthreads"
+ 
+ echocheck "rpath"
+-netbsd &&_rpath=yes
+ if test "$_rpath" = yes ; then
+   for I in `echo $_ld_extra | sed 's/-L//g'` ; do
+     tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`"
+@@ -4192,7 +4191,7 @@ fi
  if test "$_aa" = yes ; then
    _def_aa='#define HAVE_AA 1'
    if cygwin ; then
@@ -52,30 +51,3 @@ $NetBSD: patch-aa,v 1.16 2006/10/03 14:32:24 tron Exp $
    fi
    _vosrc="$_vosrc vo_aa.c"
    _vomodules="aa $_vomodules"
-@@ -6190,7 +6190,7 @@
-   elif cc_check -lavutil $_ld_lm ; then
-     _libavutil_so=yes
-   fi
--  if test "$_libavutil_so" == yes ; then
-+  if test "$_libavutil_so" = yes ; then
-     _res_comment="using libavutil.so, but static libavutil is recommended"
-   fi
- fi
-@@ -6217,7 +6217,7 @@
-   elif cc_check -lavcodec $_ld_lm ; then
-     _libavcodec_so=yes
-   fi
--  if test "$_libavcodec_so" == yes ; then
-+  if test "$_libavcodec_so" = yes ; then
-     _res_comment="using libavcodec.so, but static libavcodec is recommended"
-   fi
- fi
-@@ -6239,7 +6239,7 @@
-   elif cc_check $_ld_lm -lavformat ; then
-     _libavformat_so=yes  
-   fi
--  if test "$_libavformat_so" == yes ; then
-+  if test "$_libavformat_so" = yes ; then
-     _res_comment="using libavformat.so, but static libavformat is recommended"
-   fi
- fi
diff --git a/multimedia/mplayer-share/patches/patch-ad b/multimedia/mplayer-share/patches/patch-ad
deleted file mode 100644
index 614bce7884b..00000000000
--- a/multimedia/mplayer-share/patches/patch-ad
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2006/06/15 21:58:55 dogcow Exp $
---- libmpdemux/tvi_bsdbt848.c.orig	2006-06-15 14:41:49.000000000 -0700
-+++ libmpdemux/tvi_bsdbt848.c	2006-06-15 14:42:51.000000000 -0700
-@@ -178,6 +178,7 @@ tvi_handle_t *tvi_init_bsdbt848(char *de
- 
- static int control(priv_t *priv, int cmd, void *arg)
- {
-+    int *bogus = (int *) arg;
-     switch(cmd)
-     {
- 
-@@ -195,13 +196,13 @@ static int control(priv_t *priv, int cmd
-             return(TVI_CONTROL_FALSE);
-             }
- 
--        (int)*(void **)arg = priv->tunerfreq;
-+        *bogus = priv->tunerfreq;
-         return(TVI_CONTROL_TRUE);
-         }
-     
-     case TVI_CONTROL_TUN_SET_FREQ:
-         {
--        priv->tunerfreq = (int)*(void **)arg;
-+        priv->tunerfreq = *bogus;
- 
-         if(ioctl(priv->tunerfd, TVTUNER_SETFREQ, &priv->tunerfreq) < 0) 
-             {
-@@ -225,13 +226,13 @@ static int control(priv_t *priv, int cmd
-             return(TVI_CONTROL_FALSE);
-             }
- 
--        (int)*(void **)arg = priv->input;
-+        *bogus = priv->input;
-         return(TVI_CONTROL_TRUE);
-         }
-     
-     case TVI_CONTROL_SPC_SET_INPUT:
-         {
--        priv->input = getinput((int)*(void **)arg);
-+        priv->input = getinput(*bogus);
- 
-         if(ioctl(priv->btfd, METEORSINPUT, &priv->input) < 0) 
-             {
-@@ -250,17 +251,17 @@ static int control(priv_t *priv, int cmd
- 
-     case TVI_CONTROL_AUD_GET_FORMAT:
-         {
--        (int)*(void **)arg = AF_FORMAT_S16_LE;
-+        *bogus = AF_FORMAT_S16_LE;
-         return(TVI_CONTROL_TRUE);
-         }
-     case TVI_CONTROL_AUD_GET_CHANNELS:
-         {
--        (int)*(void **)arg = 2;
-+        *bogus = 2;
-         return(TVI_CONTROL_TRUE);
-         }
-     case TVI_CONTROL_AUD_SET_SAMPLERATE:
-         {
--        int dspspeed = (int)*(void **)arg;
-+        int dspspeed = *bogus;
- 
-            if(ioctl(priv->dspfd, SNDCTL_DSP_SPEED, &dspspeed) == -1) 
-             {
-@@ -279,12 +280,12 @@ static int control(priv_t *priv, int cmd
-         }
-     case TVI_CONTROL_AUD_GET_SAMPLERATE:
-         {
--        (int)*(void **)arg = priv->dspspeed;
-+        *bogus = priv->dspspeed;
-         return(TVI_CONTROL_TRUE);
-         }
-     case TVI_CONTROL_AUD_GET_SAMPLESIZE:
-         {
--        (int)*(void **)arg = priv->dspsamplesize/8;
-+        *bogus = priv->dspsamplesize/8;
-         return(TVI_CONTROL_TRUE);
-         }
- 
-@@ -296,7 +297,7 @@ static int control(priv_t *priv, int cmd
- 
-     case TVI_CONTROL_TUN_SET_NORM:
-         {
--        int req_mode = (int)*(void **)arg;
-+        int req_mode = *bogus;
- 	u_short tmp_fps;
- 
-         priv->iformat = METEOR_FMT_AUTOMODE;
-@@ -381,19 +382,19 @@ static int control(priv_t *priv, int cmd
-         }
-     
-     case TVI_CONTROL_VID_GET_FORMAT:
--        (int)*(void **)arg = IMGFMT_UYVY;
-+        *bogus = IMGFMT_UYVY;
-         return(TVI_CONTROL_TRUE);
- 
-     case TVI_CONTROL_VID_SET_FORMAT:
-         {
--        int req_fmt = (int)*(void **)arg;
-+        int req_fmt = *bogus;
- 
-         if(req_fmt != IMGFMT_UYVY) return(TVI_CONTROL_FALSE);
- 
-         return(TVI_CONTROL_TRUE);
-         }
-     case TVI_CONTROL_VID_SET_WIDTH:
--        priv->geom.columns = (int)*(void **)arg;
-+        priv->geom.columns = *bogus;
- 
-         if(priv->geom.columns > priv->maxwidth) 
-             {
-@@ -409,11 +410,11 @@ static int control(priv_t *priv, int cmd
-         return(TVI_CONTROL_TRUE);
- 
-     case TVI_CONTROL_VID_GET_WIDTH:
--        (int)*(void **)arg = priv->geom.columns;
-+        *bogus = priv->geom.columns;
-         return(TVI_CONTROL_TRUE);
- 
-     case TVI_CONTROL_VID_SET_HEIGHT:
--        priv->geom.rows = (int)*(void **)arg;
-+        priv->geom.rows = *bogus;
- 
-         if(priv->geom.rows > priv->maxheight) 
-             {
-@@ -434,7 +435,7 @@ static int control(priv_t *priv, int cmd
-         return(TVI_CONTROL_TRUE);        
- 
-     case TVI_CONTROL_VID_GET_HEIGHT:
--        (int)*(void **)arg = priv->geom.rows;
-+        *bogus = priv->geom.rows;
-         return(TVI_CONTROL_TRUE);        
- 
-     case TVI_CONTROL_VID_GET_FPS:
-@@ -443,7 +444,7 @@ static int control(priv_t *priv, int cmd
- 
- /*
-     case TVI_CONTROL_VID_SET_FPS:
--        priv->fps = (int)*(void **)arg;
-+        priv->fps = *bogus;
- 
-         if(priv->fps > priv->maxfps) priv->fps = priv->maxfps;
- 
diff --git a/multimedia/mplayer-share/patches/patch-ah b/multimedia/mplayer-share/patches/patch-ah
index 1797d7a9b01..4799dca43da 100644
--- a/multimedia/mplayer-share/patches/patch-ah
+++ b/multimedia/mplayer-share/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.2 2006/06/13 17:25:00 drochner Exp $
+$NetBSD: patch-ah,v 1.3 2006/10/31 22:33:28 wiz Exp $
 
---- subreader.c.orig	2006-06-11 20:35:47.000000000 +0200
+--- subreader.c.orig	2006-10-22 22:32:31.000000000 +0000
 +++ subreader.c
 @@ -74,10 +74,10 @@ static int eol(char p) {
  /* Remove leading and trailing space */
@@ -15,7 +15,7 @@ $NetBSD: patch-ah,v 1.2 2006/06/13 17:25:00 drochner Exp $
  }
  
  static char *stristr(const char *haystack, const char *needle) {
-@@ -628,7 +628,7 @@ subtitle *sub_read_line_pjs(stream_t *st
+@@ -628,7 +628,7 @@ static subtitle *sub_read_line_pjs(strea
      if (!stream_read_line (st, line, LINE_LEN))
  	return NULL;
      /* skip spaces */
@@ -24,7 +24,7 @@ $NetBSD: patch-ah,v 1.2 2006/06/13 17:25:00 drochner Exp $
      /* allow empty lines at the end of the file */
      if (*s==0)
  	return NULL;
-@@ -681,7 +681,7 @@ subtitle *sub_read_line_mpsub(stream_t *
+@@ -681,7 +681,7 @@ static subtitle *sub_read_line_mpsub(str
  			else return current;
  		}
  		p=line;
diff --git a/multimedia/mplayer-share/patches/patch-ak b/multimedia/mplayer-share/patches/patch-ak
deleted file mode 100644
index b7843ce5ed0..00000000000
--- a/multimedia/mplayer-share/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2006/06/14 10:30:06 drochner Exp $
-
---- libmpdemux/rtp.c.orig	2006-06-14 10:41:54.000000000 +0200
-+++ libmpdemux/rtp.c
-@@ -137,8 +137,8 @@ static int rtp_open_socket( URL_t *url )
- 		}
- 	}
- 
--	tv.tv_sec = 0;
--	tv.tv_usec = (1 * 1000000);	// 1 second timeout
-+	tv.tv_sec = 1;
-+	tv.tv_usec = 0;	// 1 second timeout
- 	FD_ZERO( &set );
- 	FD_SET( socket_server_fd, &set );
- 	err = select(socket_server_fd+1, &set, NULL, NULL, &tv);
diff --git a/multimedia/mplayer-share/patches/patch-ta b/multimedia/mplayer-share/patches/patch-ta
deleted file mode 100644
index 48b259d598d..00000000000
--- a/multimedia/mplayer-share/patches/patch-ta
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-ta,v 1.1 2006/10/11 18:32:40 rillig Exp $
-
---- TOOLS/checktree.sh.orig	2006-06-11 20:35:46.000000000 +0200
-+++ TOOLS/checktree.sh	2006-10-11 20:28:37.000000000 +0200
-@@ -71,7 +71,7 @@ printhead() {
- all_filenames() {
-     test "$_files" != "" && echo "$_files" && return
- 
--    if [ "$_cvs" == "no" ]; then
-+    if [ "$_cvs" = "no" ]; then
-         find . -type f \
-         | grep -v "\.\#\|\~$\|\.depend\|\/CVS\/\|config.mak\|^\./config\.h" \
-         | grep -v "^\./version\.h\|\.o$\|\.a$"
-@@ -208,7 +208,7 @@ done
- 
- # Set heading color
- 
--if [ "$_color" == "yes" ]; then
-+if [ "$_color" = "yes" ]; then
-     COLB="\e[36m"
-     COLE="\e[m"
- else
-@@ -220,7 +220,7 @@ fi
- 
- filelist=`all_filenames`
- 
--if [ "$_showcont" == "yes" ]; then
-+if [ "$_showcont" = "yes" ]; then
-   _diffopts="-u"
-   _grepopts="-n -I"
- else
-@@ -234,21 +234,21 @@ fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_spaces" == "yes" ]; then
-+if [ "$_spaces" = "yes" ]; then
-     printhead "checking for spaces in filenames ..."
-     find . | grep " "
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_extensions" == "yes" ]; then
-+if [ "$_extensions" = "yes" ]; then
-     printhead "checking for uppercase extensions ..."
-     echo $filelist | grep "\.[[:upper:]]\+$" | grep -v "\.S$"
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_crlf" == "yes" ]; then
-+if [ "$_crlf" = "yes" ]; then
-     printhead "checking for MSDOS line endings ..."
-     grep $_grepopts "
- " $filelist
-@@ -256,28 +256,28 @@ fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_trailws" == "yes" ]; then
-+if [ "$_trailws" = "yes" ]; then
-     printhead "checking for trailing whitespace ..."
-     grep $_grepopts "[[:space:]]\+$" $filelist
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_rcsid" == "yes" ]; then
-+if [ "$_rcsid" = "yes" ]; then
-     printhead "checking for missing RCS \$Id\$ or \$Revision\$ tags ..."
-     grep -L -I "\$\(Id\|Revision\)[[:print:]]\+\$" $filelist
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_oll" == "yes" ]; then
-+if [ "$_oll" = "yes" ]; then
-     printhead "checking for overly long lines (over 79 characters) ..."
-     grep $_grepopts "^[[:print:]]\{80,\}$" $filelist
- fi
- 
- # -----------------------------------------------------------------------------
- 
--if [ "$_charset" == "yes" ]; then
-+if [ "$_charset" = "yes" ]; then
-     printhead "checking bad charsets ..."
-     for I in $filelist ; do
-       case "$I" in
diff --git a/multimedia/mplayer-share/patches/patch-tb b/multimedia/mplayer-share/patches/patch-tb
deleted file mode 100644
index 5ffe05413ef..00000000000
--- a/multimedia/mplayer-share/patches/patch-tb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-tb,v 1.1 2006/10/11 18:32:40 rillig Exp $
-
---- TOOLS/mencvcd.orig	2006-06-11 20:35:46.000000000 +0200
-+++ TOOLS/mencvcd	2006-10-11 20:29:01.000000000 +0200
-@@ -330,7 +330,7 @@ done
- 
- # some configs
- mpegnorm="-f $VCDMODE -b $vbr -B 260 -V 46"
--if [ "$vnorm" == "SVCD" ]; then
-+if [ "$vnorm" = "SVCD" ]; then
-    [ $vbrset -eq 0 ] && vbr=2500
-    mplexnorm="-f $SVCDMODE -m 2 -V -b 230"
-    mpegnorm="-f $SVCDMODE -b $vbr -B 260 -V 230"
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index ace09f04d50..faa56c247fb 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/10/11 00:01:00 grant Exp $
+# $NetBSD: Makefile,v 1.33 2006/10/31 22:33:28 wiz Exp $
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
 
@@ -6,8 +6,6 @@ COMMENT=	Software-only MPEG-1/2/4 video decoder
 
 .include "../../multimedia/mplayer-share/Makefile.common"
 
-PKGREVISION=	1
-
 CONFIGURE_ARGS+=	--disable-mencoder
 CONFIGURE_ARGS+=	--confdir=${PREFIX}/share/mplayer
 
-- 
cgit v1.2.3