Update to 1.0pre2 (rc2).

Changes:

 DOCS:

    * Spanish and Russian translations almost finished
    * French, Hungarian, Polish translations updated
    * New Romanian translation started
    * numerous sections updated

Ports:

    * initial Amiga/MorphOS (through GeekGadgets) support
    * FreeBSD 5.x (libkse/libthr) support in win32 DLL loader
    * finally fixed the compilation on non-mvi capable alpha CPUs
    * OSD menu now works on MinGW
    * slave mode, vobsub and MEncoder support on Windows
    * MinGW 3.1.0 supports MPlayer out of the box!

Codecs and demuxers:

    * support for QuickTime version 6.3 DLLs
    * fixed some bugs in imported FAAD
    * disabled internal FAAD when using buggy GCC
    * --enable-externalfaad option to force using external FAAD library
    * imaadpcm bug fixed
    * ViVD v2 codec support (DLL only)
    * QuickTime codecs support inside Matroska
    * improved seeking inside Matroska
    * some bugs with DMO codecs have been fixed
    * fix for MOV files with bogus user data length
    * fixed some demuxers which read after the EOF
    * better RTP synchronisation
    * FLAC support through imported libmpflac

Filters:

    * new delogo filter (for removing TV channel logos)
    * presets support in swscaler filter
    * new audio filter export, for supporting visual effect applications
    * correct select handling in bmovl filter

FFmpeg/libavcodec:

    * better divx/xvid bug detection code
    * Id RoQ decoder
    * Interplay MVE decoder
    * WC3/Xan video decoder
    * Xan DPCM, DK3 & DK4 ADPCM audio decoders
    * detect old xvid with fourcc=DIVX
    * vp3 decoder fixes
    * improved the Alpha optimizations
    * x86 optimizations are threadsafe now
    * settable scene change threshold
    * better MPEG1/MPEG2 conformance encoder
    * quality improvement for high bitrate videos with trellis quantization
    * indeo3 decoder fixed
    * new options: mv0, cbp
    * DV video encoder
    * MPEG1 now works with Trellis quantization

Faad2:

    * synced to latest CVS
    * HE_AAC profile added
    * SBR QMF improvements
    * DRM updates
    * Covariance speedup
    * reduced memory usage
    * overall cleanups and fixes

Drivers:

    * VIDIX driver for nVidia cards
    * VIDIX and libdha ported to Windows
    * SDL on IRIX support
    * directfb2 fixed for latest directfb
    * opengl video output for Windows
    * smoother audio playback with alsa9
    * fullscreen and geometry support in directx
    * fullscreen support with opengl drivers
    * OSD fixed with svga
    * new cvidix and winvidix drivers
    * user settable colorkey

Others:

    * several leak fixes
    * selecting optimizations for PPC 7455 CPU
    * CPU detection code now measures speed on x86
    * unrarlib cleaned up a bit
    * updated the list of known x86 CPUs (including Opteron!)
    * alignment and smart line splitting option on subtitles

14 files changed, 99 insertions, 129 deletions

diff --git a/graphics/gmplayer/Makefile b/graphics/gmplayer/Makefile
index d6a98feab7b..86db6b9ac1b 100644
--- a/graphics/gmplayer/Makefile
+++ b/graphics/gmplayer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2003/12/08 19:20:49 wiz Exp $
 
 PKGNAME=	gmplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	3
 SKIN_SITES=	http://www.mplayerhq.hu/MPlayer/Skin/		\
 		ftp://ftp.mplayerhq.hu/MPlayer/Skin/		\
 		${MASTER_SITE_LOCAL:=mplayer}
diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo
index 257b64cc9ab..487d01a735c 100644
--- a/graphics/gmplayer/distinfo
+++ b/graphics/gmplayer/distinfo
@@ -1,48 +1,47 @@
-$NetBSD: distinfo,v 1.43 2003/11/03 01:01:10 kristerw Exp $
+$NetBSD: distinfo,v 1.44 2003/12/08 19:20:49 wiz Exp $
 
-SHA1 (mplayer-1.0rc1/MPlayer-1.0pre1.tar.bz2) = 34482db6102a0d4b2a3692617926a92e44116f81
-Size (mplayer-1.0rc1/MPlayer-1.0pre1.tar.bz2) = 4190784 bytes
-SHA1 (mplayer-1.0rc1/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3
-Size (mplayer-1.0rc1/default-1.7.tar.bz2) = 173439 bytes
-SHA1 (mplayer-1.0rc1/AlienMind-1.1.tar.bz2) = 93c1ec4a0b26c456730101bf45c7fdcf4cf96dd9
-Size (mplayer-1.0rc1/AlienMind-1.1.tar.bz2) = 131362 bytes
-SHA1 (mplayer-1.0rc1/BlueHeart-1.4.tar.bz2) = b8298e7862eb61fd1d9e57091a2df397b649508d
-Size (mplayer-1.0rc1/BlueHeart-1.4.tar.bz2) = 281128 bytes
-SHA1 (mplayer-1.0rc1/CornerMP-1.0.tar.bz2) = 347ad066585386e11872e479dcecf6fb9242c3a4
-Size (mplayer-1.0rc1/CornerMP-1.0.tar.bz2) = 237483 bytes
-SHA1 (mplayer-1.0rc1/CornerMP-aqua-1.0.tar.bz2) = 7cceeb260a2d78e2af63ed451093a2a9cae0ff08
-Size (mplayer-1.0rc1/CornerMP-aqua-1.0.tar.bz2) = 248102 bytes
-SHA1 (mplayer-1.0rc1/Cyrus-1.0.tar.bz2) = 54582822ade62334473a791aed2034f1c1a4eb48
-Size (mplayer-1.0rc1/Cyrus-1.0.tar.bz2) = 228907 bytes
-SHA1 (mplayer-1.0rc1/MidnightLove-1.5.tar.bz2) = 36fa598cee849f168d3a795131d2854792456647
-Size (mplayer-1.0rc1/MidnightLove-1.5.tar.bz2) = 539660 bytes
-SHA1 (mplayer-1.0rc1/WindowsMediaPlayer6-1.2.tar.bz2) = 3ae9d0053922ec0f43af38740c8d904a32b711e7
-Size (mplayer-1.0rc1/WindowsMediaPlayer6-1.2.tar.bz2) = 31057 bytes
-SHA1 (mplayer-1.0rc1/avifile-1.5.tar.bz2) = 27acd5a3a3574a36f8de1c7bdd2a367b6326de57
-Size (mplayer-1.0rc1/avifile-1.5.tar.bz2) = 42398 bytes
-SHA1 (mplayer-1.0rc1/gnome-1.1.tar.bz2) = b27618f2ec2f8bf83929b6e30c4fe1fab59595fd
-Size (mplayer-1.0rc1/gnome-1.1.tar.bz2) = 368720 bytes
-SHA1 (mplayer-1.0rc1/hayraphon-1.0.tar.bz2) = 793febace6325776d9795ef81566f378edcb4541
-Size (mplayer-1.0rc1/hayraphon-1.0.tar.bz2) = 77628 bytes
-SHA1 (mplayer-1.0rc1/hwswskin-1.0.tar.bz2) = ff96c63ad6750e83a85ba96c600ad275ae57e0fc
-Size (mplayer-1.0rc1/hwswskin-1.0.tar.bz2) = 20340 bytes
-SHA1 (mplayer-1.0rc1/mentalic-1.1.tar.bz2) = 054b713ff2985719351462604ac3d8e341f3fa3a
-Size (mplayer-1.0rc1/mentalic-1.1.tar.bz2) = 166599 bytes
-SHA1 (mplayer-1.0rc1/neutron-1.4.tar.bz2) = 79f7df9a86572fe81d2f905fcf1678cebf11c534
-Size (mplayer-1.0rc1/neutron-1.4.tar.bz2) = 369319 bytes
-SHA1 (mplayer-1.0rc1/phony-1.0.tar.bz2) = 7c31d6f98cb98f5cb74c85b0759002cdbd902a41
-Size (mplayer-1.0rc1/phony-1.0.tar.bz2) = 386446 bytes
-SHA1 (mplayer-1.0rc1/plastic-1.1.1.tar.bz2) = fbd3ce681e6ab786828c842b87fe1779d4f13f32
-Size (mplayer-1.0rc1/plastic-1.1.1.tar.bz2) = 454180 bytes
-SHA1 (mplayer-1.0rc1/proton-1.1.tar.bz2) = 0574cc2b17864a5bfb67a12b774b425d3785123f
-Size (mplayer-1.0rc1/proton-1.1.tar.bz2) = 322590 bytes
-SHA1 (mplayer-1.0rc1/slim-1.0.tar.bz2) = ebdfc875f037f2fbadd4d217f08835b678a1c9ca
-Size (mplayer-1.0rc1/slim-1.0.tar.bz2) = 398938 bytes
-SHA1 (mplayer-1.0rc1/xanim-1.5.tar.bz2) = 205a763e424bf140f682b725adf780fa5f27f4a3
-Size (mplayer-1.0rc1/xanim-1.5.tar.bz2) = 94535 bytes
-SHA1 (mplayer-1.0rc1/xine-lcd-1.0.tar.bz2) = 1edbf1703e64f7a7c2aa3837d3383ba60a6d2f2d
-Size (mplayer-1.0rc1/xine-lcd-1.0.tar.bz2) = 168441 bytes
-SHA1 (patch-aa) = b8b012ebf858d050493c0d7c0b097460b06a26f0
-SHA1 (patch-ab) = a9765eaba21c68242bf106b6d679af851d6480fb
-SHA1 (patch-ad) = e77e938e7f4b9a2849f816bbc662db277d7898d3
-SHA1 (patch-ae) = 12d16a7dda6be9d950d09d23d41d0de03ca70425
+SHA1 (mplayer-1.0rc2/MPlayer-1.0pre2.tar.bz2) = 49b20cf4c55f7557aa4c0f9b8a020f3d7be07b48
+Size (mplayer-1.0rc2/MPlayer-1.0pre2.tar.bz2) = 4341127 bytes
+SHA1 (mplayer-1.0rc2/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3
+Size (mplayer-1.0rc2/default-1.7.tar.bz2) = 173439 bytes
+SHA1 (mplayer-1.0rc2/AlienMind-1.1.tar.bz2) = 93c1ec4a0b26c456730101bf45c7fdcf4cf96dd9
+Size (mplayer-1.0rc2/AlienMind-1.1.tar.bz2) = 131362 bytes
+SHA1 (mplayer-1.0rc2/BlueHeart-1.4.tar.bz2) = b8298e7862eb61fd1d9e57091a2df397b649508d
+Size (mplayer-1.0rc2/BlueHeart-1.4.tar.bz2) = 281128 bytes
+SHA1 (mplayer-1.0rc2/CornerMP-1.0.tar.bz2) = 347ad066585386e11872e479dcecf6fb9242c3a4
+Size (mplayer-1.0rc2/CornerMP-1.0.tar.bz2) = 237483 bytes
+SHA1 (mplayer-1.0rc2/CornerMP-aqua-1.0.tar.bz2) = 7cceeb260a2d78e2af63ed451093a2a9cae0ff08
+Size (mplayer-1.0rc2/CornerMP-aqua-1.0.tar.bz2) = 248102 bytes
+SHA1 (mplayer-1.0rc2/Cyrus-1.0.tar.bz2) = 54582822ade62334473a791aed2034f1c1a4eb48
+Size (mplayer-1.0rc2/Cyrus-1.0.tar.bz2) = 228907 bytes
+SHA1 (mplayer-1.0rc2/MidnightLove-1.5.tar.bz2) = 36fa598cee849f168d3a795131d2854792456647
+Size (mplayer-1.0rc2/MidnightLove-1.5.tar.bz2) = 539660 bytes
+SHA1 (mplayer-1.0rc2/WindowsMediaPlayer6-1.2.tar.bz2) = 3ae9d0053922ec0f43af38740c8d904a32b711e7
+Size (mplayer-1.0rc2/WindowsMediaPlayer6-1.2.tar.bz2) = 31057 bytes
+SHA1 (mplayer-1.0rc2/avifile-1.5.tar.bz2) = 27acd5a3a3574a36f8de1c7bdd2a367b6326de57
+Size (mplayer-1.0rc2/avifile-1.5.tar.bz2) = 42398 bytes
+SHA1 (mplayer-1.0rc2/gnome-1.1.tar.bz2) = b27618f2ec2f8bf83929b6e30c4fe1fab59595fd
+Size (mplayer-1.0rc2/gnome-1.1.tar.bz2) = 368720 bytes
+SHA1 (mplayer-1.0rc2/hayraphon-1.0.tar.bz2) = 793febace6325776d9795ef81566f378edcb4541
+Size (mplayer-1.0rc2/hayraphon-1.0.tar.bz2) = 77628 bytes
+SHA1 (mplayer-1.0rc2/hwswskin-1.0.tar.bz2) = ff96c63ad6750e83a85ba96c600ad275ae57e0fc
+Size (mplayer-1.0rc2/hwswskin-1.0.tar.bz2) = 20340 bytes
+SHA1 (mplayer-1.0rc2/mentalic-1.1.tar.bz2) = 054b713ff2985719351462604ac3d8e341f3fa3a
+Size (mplayer-1.0rc2/mentalic-1.1.tar.bz2) = 166599 bytes
+SHA1 (mplayer-1.0rc2/neutron-1.4.tar.bz2) = 79f7df9a86572fe81d2f905fcf1678cebf11c534
+Size (mplayer-1.0rc2/neutron-1.4.tar.bz2) = 369319 bytes
+SHA1 (mplayer-1.0rc2/phony-1.0.tar.bz2) = 7c31d6f98cb98f5cb74c85b0759002cdbd902a41
+Size (mplayer-1.0rc2/phony-1.0.tar.bz2) = 386446 bytes
+SHA1 (mplayer-1.0rc2/plastic-1.1.1.tar.bz2) = fbd3ce681e6ab786828c842b87fe1779d4f13f32
+Size (mplayer-1.0rc2/plastic-1.1.1.tar.bz2) = 454180 bytes
+SHA1 (mplayer-1.0rc2/proton-1.1.tar.bz2) = 0574cc2b17864a5bfb67a12b774b425d3785123f
+Size (mplayer-1.0rc2/proton-1.1.tar.bz2) = 322590 bytes
+SHA1 (mplayer-1.0rc2/slim-1.0.tar.bz2) = ebdfc875f037f2fbadd4d217f08835b678a1c9ca
+Size (mplayer-1.0rc2/slim-1.0.tar.bz2) = 398938 bytes
+SHA1 (mplayer-1.0rc2/xanim-1.5.tar.bz2) = 205a763e424bf140f682b725adf780fa5f27f4a3
+Size (mplayer-1.0rc2/xanim-1.5.tar.bz2) = 94535 bytes
+SHA1 (mplayer-1.0rc2/xine-lcd-1.0.tar.bz2) = 1edbf1703e64f7a7c2aa3837d3383ba60a6d2f2d
+Size (mplayer-1.0rc2/xine-lcd-1.0.tar.bz2) = 168441 bytes
+SHA1 (patch-aa) = dc8437467536c056cb345c91f3462ba77c4e3b16
+SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e
+SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7
diff --git a/graphics/mencoder/Makefile b/graphics/mencoder/Makefile
index 0f7bfd80f6d..653cb6a1131 100644
--- a/graphics/mencoder/Makefile
+++ b/graphics/mencoder/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/08 19:20:50 wiz Exp $
 #
 
 PKGNAME=	mencoder-${MPLAYER_PKG_VERSION}
-PKGREVISION=	2
 COMMENT=	Simple movie encoder for MPlayer-playable movies
 
 .include "../../graphics/mplayer-share/Makefile.common"
diff --git a/graphics/mencoder/distinfo b/graphics/mencoder/distinfo
index 672e335d0db..06b62981f82 100644
--- a/graphics/mencoder/distinfo
+++ b/graphics/mencoder/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.26 2003/11/03 20:12:20 kristerw Exp $
+$NetBSD: distinfo,v 1.27 2003/12/08 19:20:50 wiz Exp $
 
-SHA1 (mplayer-1.0rc1/MPlayer-1.0pre1.tar.bz2) = 34482db6102a0d4b2a3692617926a92e44116f81
-Size (mplayer-1.0rc1/MPlayer-1.0pre1.tar.bz2) = 4190784 bytes
-SHA1 (patch-aa) = b8b012ebf858d050493c0d7c0b097460b06a26f0
-SHA1 (patch-ab) = a9765eaba21c68242bf106b6d679af851d6480fb
-SHA1 (patch-ad) = e77e938e7f4b9a2849f816bbc662db277d7898d3
-SHA1 (patch-ae) = 12d16a7dda6be9d950d09d23d41d0de03ca70425
+SHA1 (mplayer-1.0rc2/MPlayer-1.0pre2.tar.bz2) = 49b20cf4c55f7557aa4c0f9b8a020f3d7be07b48
+Size (mplayer-1.0rc2/MPlayer-1.0pre2.tar.bz2) = 4341127 bytes
+SHA1 (patch-aa) = dc8437467536c056cb345c91f3462ba77c4e3b16
+SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e
+SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 71081386094..3126b8984f6 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile.common,v 1.46 2003/11/03 00:59:05 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.47 2003/12/08 19:20:49 wiz Exp $
 #
 
-MPLAYER_DIST_VERSION=	1.0pre1
+MPLAYER_DIST_VERSION=	1.0pre2
 
 # This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION=	1.0rc1
+MPLAYER_PKG_VERSION=	1.0rc2
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
-WRKSRC=			${WRKDIR}/${DISTNAME:S/MPlayer/mplayer/}
 CATEGORIES?=		graphics
 MASTER_SITES=		http://www.mplayerhq.hu/MPlayer/releases/ \
 			http://www2.mplayerhq.hu/MPlayer/releases/ \
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index 9a111cbc82d..e3366c341db 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.22 2003/10/06 05:49:24 mycroft Exp $
+# $NetBSD: Makefile.depends,v 1.23 2003/12/08 19:20:49 wiz Exp $
 #
 
 DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share
@@ -29,7 +29,7 @@ USE_X11=	YES
 .  endif
 .endfor
 
-.include "../../audio/faad2/buildlink2.mk"
+#.include "../../audio/faad2/buildlink2.mk"
 .include "../../audio/libmad/buildlink2.mk"
 .include "../../audio/libvorbis/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST
index a4ed6127c1b..ed511621b40 100644
--- a/graphics/mplayer-share/PLIST
+++ b/graphics/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2003/09/02 17:46:32 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.14 2003/12/08 19:20:49 wiz Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/de/bugreports.html
 share/mplayer/DOCS/de/cd-dvd.html
@@ -14,7 +14,6 @@ share/mplayer/DOCS/de/video.html
 share/mplayer/DOCS/default.css
 share/mplayer/DOCS/en/bugreports.html
 share/mplayer/DOCS/en/cd-dvd.html
-share/mplayer/DOCS/en/codecs-in.html
 share/mplayer/DOCS/en/codecs.html
 share/mplayer/DOCS/en/documentation.html
 share/mplayer/DOCS/en/encoding.html
@@ -74,9 +73,11 @@ share/mplayer/DOCS/pl/skin.html
 share/mplayer/DOCS/pl/sound.html
 share/mplayer/DOCS/pl/users_against_developers.html
 share/mplayer/DOCS/pl/video.html
+share/mplayer/DOCS/ro/codecs.html
 share/mplayer/DOCS/tech/MAINTAINERS
 share/mplayer/DOCS/tech/TODO
 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
@@ -205,6 +206,7 @@ share/mplayer/input.conf
 @dirrm share/mplayer/DOCS/tech
 @exec ${MKDIR} %D/share/mplayer/DOCS/ru
 @dirrm share/mplayer/DOCS/ru
+@dirrm share/mplayer/DOCS/ro
 @dirrm share/mplayer/DOCS/pl
 @dirrm share/mplayer/DOCS/it
 @dirrm share/mplayer/DOCS/hu
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index 72717b24bc3..0e3a5c09248 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.30 2003/11/03 00:59:05 kristerw Exp $
+$NetBSD: distinfo,v 1.31 2003/12/08 19:20:49 wiz Exp $
 
-SHA1 (mplayer-1.0rc1/MPlayer-1.0pre1.tar.bz2) = 34482db6102a0d4b2a3692617926a92e44116f81
-Size (mplayer-1.0rc1/MPlayer-1.0pre1.tar.bz2) = 4190784 bytes
-SHA1 (mplayer-1.0rc1/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
-Size (mplayer-1.0rc1/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
-SHA1 (mplayer-1.0rc1/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
-Size (mplayer-1.0rc1/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
-SHA1 (mplayer-1.0rc1/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
-Size (mplayer-1.0rc1/font-arial-cp1250.tar.bz2) = 249705 bytes
-SHA1 (patch-aa) = b8b012ebf858d050493c0d7c0b097460b06a26f0
-SHA1 (patch-ab) = a9765eaba21c68242bf106b6d679af851d6480fb
-SHA1 (patch-ad) = e77e938e7f4b9a2849f816bbc662db277d7898d3
-SHA1 (patch-ae) = 12d16a7dda6be9d950d09d23d41d0de03ca70425
+SHA1 (mplayer-1.0rc2/MPlayer-1.0pre2.tar.bz2) = 49b20cf4c55f7557aa4c0f9b8a020f3d7be07b48
+Size (mplayer-1.0rc2/MPlayer-1.0pre2.tar.bz2) = 4341127 bytes
+SHA1 (mplayer-1.0rc2/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
+Size (mplayer-1.0rc2/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
+SHA1 (mplayer-1.0rc2/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
+Size (mplayer-1.0rc2/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
+SHA1 (mplayer-1.0rc2/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
+Size (mplayer-1.0rc2/font-arial-cp1250.tar.bz2) = 249705 bytes
+SHA1 (patch-aa) = dc8437467536c056cb345c91f3462ba77c4e3b16
+SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e
+SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7
diff --git a/graphics/mplayer-share/patches/patch-aa b/graphics/mplayer-share/patches/patch-aa
index 689098786f5..72a6d1f3f88 100644
--- a/graphics/mplayer-share/patches/patch-aa
+++ b/graphics/mplayer-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/10/26 14:26:26 tron Exp $
+$NetBSD: patch-aa,v 1.7 2003/12/08 19:20:49 wiz Exp $
 
---- configure.orig	2003-09-01 12:51:11.000000000 +0200
-+++ configure	2003-10-26 15:24:19.000000000 +0100
-@@ -348,8 +348,8 @@
+--- configure.orig	Sun Oct  5 17:34:40 2003
++++ configure
+@@ -352,8 +352,8 @@ for ac_option do
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.6 2003/10/26 14:26:26 tron Exp $
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
-@@ -473,7 +473,7 @@
+@@ -481,7 +481,7 @@ if test "$_skip_cc_check" != yes ; then
   for _cc in "$_cc" gcc-3.1 gcc3 gcc-3.0 cc ; do
    echocheck "$_cc version"
    cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
diff --git a/graphics/mplayer-share/patches/patch-ab b/graphics/mplayer-share/patches/patch-ab
deleted file mode 100644
index e52fec34870..00000000000
--- a/graphics/mplayer-share/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2003/09/26 12:04:46 salo Exp $
-
-Fixes remotely exploitable buffer overflow vulnerability. A malicious host can
-craft a harmful ASX header, and trick MPlayer into executing arbitrary code
-upon parsing that header.
-
---- libmpdemux/asf_streaming.c.orig	2003-08-15 21:13:23.000000000 +0200
-+++ libmpdemux/asf_streaming.c	2003-09-26 13:27:04.000000000 +0200
-@@ -502,11 +502,11 @@
- 			return NULL;
- 		}
- 		http_set_uri( http_hdr, server_url->url );
--		sprintf( str, "Host: %s:%d", server_url->hostname, server_url->port );
-+		sprintf( str, "Host: %.220s:%d", server_url->hostname, server_url->port );
- 		url_free( server_url );
- 	} else {
- 		http_set_uri( http_hdr, url->file );
--		sprintf( str, "Host: %s:%d", url->hostname, url->port );
-+		sprintf( str, "Host: %.220s:%d", url->hostname, url->port );
- 	}
- 	
- 	http_set_field( http_hdr, str );
diff --git a/graphics/mplayer-share/patches/patch-ad b/graphics/mplayer-share/patches/patch-ad
index e532fd45aa4..0eeab91c5de 100644
--- a/graphics/mplayer-share/patches/patch-ad
+++ b/graphics/mplayer-share/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2003/08/31 00:25:21 xtraeme Exp $
+$NetBSD: patch-ad,v 1.7 2003/12/08 19:20:49 wiz Exp $
 
---- mp_msg.c.orig	2003-08-31 01:59:09.000000000 +0200
-+++ mp_msg.c	2003-08-31 02:01:03.000000000 +0200
-@@ -34,6 +34,7 @@
+--- mp_msg.c.orig	Fri Sep 12 17:46:16 2003
++++ mp_msg.c
+@@ -34,6 +34,7 @@ void mp_msg_init(){
  #ifdef MP_DEBUG
      fprintf(stdout, "Using GNU internationalization\n");
      fprintf(stdout, "Original domain: %s\n", textdomain(NULL));
@@ -10,16 +10,14 @@ $NetBSD: patch-ad,v 1.6 2003/08/31 00:25:21 xtraeme Exp $
      fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL));
  #endif
      setlocale(LC_ALL, ""); /* set from the environment variables */
-@@ -41,9 +42,12 @@
+@@ -41,7 +42,10 @@ void mp_msg_init(){
      textdomain("mplayer");
  #ifdef MP_DEBUG
      fprintf(stdout, "Current domain: %s\n", textdomain(NULL));
 +#if 0
      fprintf(stdout, "Current dirname: %s\n\n", bindtextdomain(textdomain(NULL),NULL));
- #endif
- #endif
 +#endif
 +#endif
+ #endif
+ #endif
      mp_msg_set_level(MSGL_STATUS);
- }
- 
diff --git a/graphics/mplayer-share/patches/patch-ae b/graphics/mplayer-share/patches/patch-ae
index 756413cf18c..a7fc664dd04 100644
--- a/graphics/mplayer-share/patches/patch-ae
+++ b/graphics/mplayer-share/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1 2003/05/25 07:12:55 dan Exp $
+$NetBSD: patch-ae,v 1.2 2003/12/08 19:20:49 wiz Exp $
 
---- libmpdemux/tvi_bsdbt848.c.orig	2003-01-15 05:20:17.000000000 +1100
-+++ libmpdemux/tvi_bsdbt848.c	2003-05-25 16:40:00.000000000 +1000
+--- libmpdemux/tvi_bsdbt848.c.orig	Sat Oct  4 19:29:01 2003
++++ libmpdemux/tvi_bsdbt848.c
 @@ -41,6 +41,7 @@
  
  #ifdef __NetBSD__
@@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.1 2003/05/25 07:12:55 dan Exp $
  #else
  #include <machine/ioctl_meteor.h>
  #include <machine/ioctl_bt848.h>
-@@ -777,14 +778,29 @@
+@@ -785,14 +786,29 @@ return(priv->dspbytesread * 1.0 / priv->
  static int get_audio_framesize(priv_t *priv)
  {
  int bytesavail;
@@ -39,4 +39,4 @@ $NetBSD: patch-ae,v 1.1 2003/05/25 07:12:55 dan Exp $
 +#endif
  
  /* When mencoder wants audio data, it wants data..
-    it wont go do anything else until it gets it :( */
+    it won't go do anything else until it gets it :( */
diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index a3e4cf07ed0..9ca0c072f07 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2003/12/08 14:41:40 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2003/12/08 19:20:49 wiz Exp $
 #
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
-PKGREVISION=	2
 COMMENT=	Software-only MPEG-1/2/4 video decoder
 
 .include "../../graphics/mplayer-share/Makefile.common"
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index a1491e18880..93e543d4dbe 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.40 2003/11/03 01:00:08 kristerw Exp $
+$NetBSD: distinfo,v 1.41 2003/12/08 19:20:49 wiz Exp $
 
-SHA1 (mplayer-1.0rc1/MPlayer-1.0pre1.tar.bz2) = 34482db6102a0d4b2a3692617926a92e44116f81
-Size (mplayer-1.0rc1/MPlayer-1.0pre1.tar.bz2) = 4190784 bytes
-SHA1 (patch-aa) = b8b012ebf858d050493c0d7c0b097460b06a26f0
-SHA1 (patch-ab) = a9765eaba21c68242bf106b6d679af851d6480fb
-SHA1 (patch-ad) = e77e938e7f4b9a2849f816bbc662db277d7898d3
-SHA1 (patch-ae) = 12d16a7dda6be9d950d09d23d41d0de03ca70425
+SHA1 (mplayer-1.0rc2/MPlayer-1.0pre2.tar.bz2) = 49b20cf4c55f7557aa4c0f9b8a020f3d7be07b48
+Size (mplayer-1.0rc2/MPlayer-1.0pre2.tar.bz2) = 4341127 bytes
+SHA1 (patch-aa) = dc8437467536c056cb345c91f3462ba77c4e3b16
+SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e
+SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7