update to 1.0pre6

This release updates and enhances documentation and translations, adds full X86-64 support, adds 18
 new codecs, updates various codecs, adds special CPU saving options for low end machines, adds
  better support for MacOS X and Windows, and adds uncountable fixes and enhancements all over the
   place.

4 files changed, 189 insertions, 46 deletions

diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 5ff7089edfb..feb63e8df04 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.17 2004/12/17 22:33:13 tron Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/01/05 15:39:15 drochner Exp $
 
-MPLAYER_DIST_VERSION=	1.0pre5try2
+MPLAYER_DIST_VERSION=	1.0pre6a
 
 # This variable is used in all packages which depend on this package
-MPLAYER_PKG_VERSION=	1.0rc5pl2
+MPLAYER_PKG_VERSION=	1.0rc6
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
 CATEGORIES?=		multimedia
diff --git a/multimedia/mplayer-share/PLIST b/multimedia/mplayer-share/PLIST
index 19d577d5d75..d60db562e16 100644
--- a/multimedia/mplayer-share/PLIST
+++ b/multimedia/mplayer-share/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2004/07/17 19:06:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/01/05 15:39:15 drochner Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/HTML/en/amiga.html
 share/mplayer/DOCS/HTML/en/aspect.html
+share/mplayer/DOCS/HTML/en/audio.html
 share/mplayer/DOCS/HTML/en/bsd.html
 share/mplayer/DOCS/HTML/en/bugreports.html
 share/mplayer/DOCS/HTML/en/bugreports_advusers.html
@@ -18,7 +19,6 @@ share/mplayer/DOCS/HTML/en/commandline.html
 share/mplayer/DOCS/HTML/en/control.html
 share/mplayer/DOCS/HTML/en/custommatrices.html
 share/mplayer/DOCS/HTML/en/default.css
-share/mplayer/DOCS/HTML/en/devices.html
 share/mplayer/DOCS/HTML/en/drives.html
 share/mplayer/DOCS/HTML/en/dvd.html
 share/mplayer/DOCS/HTML/en/edl.html
@@ -68,6 +68,7 @@ share/mplayer/DOCS/HTML/en/tv-input.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.html
 share/mplayer/DOCS/HTML/en/windows.html
 share/mplayer/DOCS/HTML/es/amiga.html
 share/mplayer/DOCS/HTML/es/aspect.html
@@ -140,6 +141,7 @@ share/mplayer/DOCS/HTML/es/vcd.html
 share/mplayer/DOCS/HTML/es/windows.html
 share/mplayer/DOCS/HTML/fr/amiga.html
 share/mplayer/DOCS/HTML/fr/aspect.html
+share/mplayer/DOCS/HTML/fr/audio.html
 share/mplayer/DOCS/HTML/fr/bsd.html
 share/mplayer/DOCS/HTML/fr/bugreports.html
 share/mplayer/DOCS/HTML/fr/bugreports_advusers.html
@@ -156,7 +158,6 @@ share/mplayer/DOCS/HTML/fr/commandline.html
 share/mplayer/DOCS/HTML/fr/control.html
 share/mplayer/DOCS/HTML/fr/custommatrices.html
 share/mplayer/DOCS/HTML/fr/default.css
-share/mplayer/DOCS/HTML/fr/devices.html
 share/mplayer/DOCS/HTML/fr/drives.html
 share/mplayer/DOCS/HTML/fr/dvd.html
 share/mplayer/DOCS/HTML/fr/edl.html
@@ -206,9 +207,11 @@ share/mplayer/DOCS/HTML/fr/tv-input.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.html
 share/mplayer/DOCS/HTML/fr/windows.html
 share/mplayer/DOCS/HTML/hu/amiga.html
 share/mplayer/DOCS/HTML/hu/aspect.html
+share/mplayer/DOCS/HTML/hu/audio.html
 share/mplayer/DOCS/HTML/hu/bsd.html
 share/mplayer/DOCS/HTML/hu/bugreports.html
 share/mplayer/DOCS/HTML/hu/bugreports_advusers.html
@@ -225,7 +228,6 @@ share/mplayer/DOCS/HTML/hu/commandline.html
 share/mplayer/DOCS/HTML/hu/control.html
 share/mplayer/DOCS/HTML/hu/custommatrices.html
 share/mplayer/DOCS/HTML/hu/default.css
-share/mplayer/DOCS/HTML/hu/devices.html
 share/mplayer/DOCS/HTML/hu/drives.html
 share/mplayer/DOCS/HTML/hu/dvd.html
 share/mplayer/DOCS/HTML/hu/edl.html
@@ -236,7 +238,7 @@ share/mplayer/DOCS/HTML/hu/gcc-296.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/hpux.html
+share/mplayer/DOCS/HTML/hu/hp-ux.html
 share/mplayer/DOCS/HTML/hu/index.html
 share/mplayer/DOCS/HTML/hu/install.html
 share/mplayer/DOCS/HTML/hu/intro.html
@@ -275,9 +277,11 @@ share/mplayer/DOCS/HTML/hu/tv-input.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.html
 share/mplayer/DOCS/HTML/hu/windows.html
 share/mplayer/DOCS/HTML/pl/amiga.html
 share/mplayer/DOCS/HTML/pl/aspect.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
@@ -294,7 +298,6 @@ 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/devices.html
 share/mplayer/DOCS/HTML/pl/drives.html
 share/mplayer/DOCS/HTML/pl/dvd.html
 share/mplayer/DOCS/HTML/pl/edl.html
@@ -343,9 +346,11 @@ share/mplayer/DOCS/HTML/pl/tv-input.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.html
 share/mplayer/DOCS/HTML/pl/windows.html
 share/mplayer/DOCS/HTML/ru/amiga.html
 share/mplayer/DOCS/HTML/ru/aspect.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
@@ -362,7 +367,6 @@ share/mplayer/DOCS/HTML/ru/commandline.html
 share/mplayer/DOCS/HTML/ru/control.html
 share/mplayer/DOCS/HTML/ru/custommatrices.html
 share/mplayer/DOCS/HTML/ru/default.css
-share/mplayer/DOCS/HTML/ru/devices.html
 share/mplayer/DOCS/HTML/ru/drives.html
 share/mplayer/DOCS/HTML/ru/dvd.html
 share/mplayer/DOCS/HTML/ru/edl.html
@@ -373,7 +377,7 @@ share/mplayer/DOCS/HTML/ru/gcc-296.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/hpux.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
@@ -412,6 +416,7 @@ share/mplayer/DOCS/HTML/ru/tv-input.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.html
 share/mplayer/DOCS/HTML/ru/windows.html
 share/mplayer/DOCS/README
 share/mplayer/DOCS/de/bugreports.html
@@ -436,6 +441,7 @@ 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
 share/mplayer/DOCS/man/es/mplayer.1
@@ -443,9 +449,12 @@ share/mplayer/DOCS/man/fr/mplayer.1
 share/mplayer/DOCS/man/hu/mplayer.1
 share/mplayer/DOCS/man/it/mplayer.1
 share/mplayer/DOCS/man/pl/mplayer.1
+share/mplayer/DOCS/man/sv/mplayer.1
 share/mplayer/DOCS/man/zh/mplayer.1
+share/mplayer/DOCS/tech/Doxyfile
 share/mplayer/DOCS/tech/MAINTAINERS
 share/mplayer/DOCS/tech/TODO
+share/mplayer/DOCS/tech/code-documentation.txt
 share/mplayer/DOCS/tech/codec-devel.txt
 share/mplayer/DOCS/tech/codecs-in.html
 share/mplayer/DOCS/tech/codecs.conf.txt
@@ -461,6 +470,7 @@ share/mplayer/DOCS/tech/libmpcodecs.txt
 share/mplayer/DOCS/tech/libvo.txt
 share/mplayer/DOCS/tech/libvo2.txt
 share/mplayer/DOCS/tech/manpage.txt
+share/mplayer/DOCS/tech/mncf.txt
 share/mplayer/DOCS/tech/mpcf.txt
 share/mplayer/DOCS/tech/mpsub.sub
 share/mplayer/DOCS/tech/osd.txt
@@ -480,6 +490,140 @@ share/mplayer/DOCS/tech/swscaler_methods.txt
 share/mplayer/DOCS/tech/translations.txt
 share/mplayer/DOCS/tech/vidix.txt
 share/mplayer/DOCS/tech/wishlist
+share/mplayer/DOCS/xml/Makefile
+share/mplayer/DOCS/xml/Makefile.inc
+share/mplayer/DOCS/xml/README
+share/mplayer/DOCS/xml/README.maintainers
+share/mplayer/DOCS/xml/configure
+share/mplayer/DOCS/xml/default.css
+share/mplayer/DOCS/xml/en/Makefile
+share/mplayer/DOCS/xml/en/audio.xml
+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/documentation.xml
+share/mplayer/DOCS/xml/en/faq.xml
+share/mplayer/DOCS/xml/en/features.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/patches.xml
+share/mplayer/DOCS/xml/en/ports.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
+share/mplayer/DOCS/xml/es/bugreports.xml
+share/mplayer/DOCS/xml/es/bugs.xml
+share/mplayer/DOCS/xml/es/cd-dvd.xml
+share/mplayer/DOCS/xml/es/codecs.xml
+share/mplayer/DOCS/xml/es/documentation.xml
+share/mplayer/DOCS/xml/es/faq.xml
+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/patches.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
+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/documentation.xml
+share/mplayer/DOCS/xml/fr/faq.xml
+share/mplayer/DOCS/xml/fr/features.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/patches.xml
+share/mplayer/DOCS/xml/fr/ports.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
+share/mplayer/DOCS/xml/hu/audio.xml
+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/documentation.xml
+share/mplayer/DOCS/xml/hu/faq.xml
+share/mplayer/DOCS/xml/hu/features.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/patches.xml
+share/mplayer/DOCS/xml/hu/ports.xml
+share/mplayer/DOCS/xml/hu/usage.xml
+share/mplayer/DOCS/xml/ldp.dsl
+share/mplayer/DOCS/xml/pl/Makefile
+share/mplayer/DOCS/xml/pl/audio.xml
+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/documentation.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/patches.xml
+share/mplayer/DOCS/xml/pl/ports.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/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/documentation.xml
+share/mplayer/DOCS/xml/ru/features.xml
+share/mplayer/DOCS/xml/ru/formats.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/patches.xml
+share/mplayer/DOCS/xml/ru/ports.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/xsl/ldp-html-chunk.xsl
+share/mplayer/DOCS/xml/xsl/ldp-html-common.xsl
+share/mplayer/DOCS/xml/xsl/ldp-html.xsl
+share/mplayer/DOCS/xml/xsl/ldp-print.xsl
 share/mplayer/DOCS/zh/bugreports.html
 share/mplayer/DOCS/zh/cd-dvd.html
 share/mplayer/DOCS/zh/codecs.html
@@ -571,9 +715,18 @@ share/mplayer/input.conf
 @dirrm share/mplayer/fonts/font-arial-14-cp1250
 @dirrm share/mplayer/fonts
 @dirrm share/mplayer/DOCS/zh
+@dirrm share/mplayer/DOCS/xml/xsl
+@dirrm share/mplayer/DOCS/xml/ru
+@dirrm share/mplayer/DOCS/xml/pl
+@dirrm share/mplayer/DOCS/xml/hu
+@dirrm share/mplayer/DOCS/xml/fr
+@dirrm share/mplayer/DOCS/xml/es
+@dirrm share/mplayer/DOCS/xml/en
+@dirrm share/mplayer/DOCS/xml
 @dirrm share/mplayer/DOCS/tech/realcodecs
 @dirrm share/mplayer/DOCS/tech
 @dirrm share/mplayer/DOCS/man/zh
+@dirrm share/mplayer/DOCS/man/sv
 @dirrm share/mplayer/DOCS/man/pl
 @dirrm share/mplayer/DOCS/man/it
 @dirrm share/mplayer/DOCS/man/hu
@@ -581,6 +734,7 @@ share/mplayer/input.conf
 @dirrm share/mplayer/DOCS/man/es
 @dirrm share/mplayer/DOCS/man/en
 @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/de
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index bff6cf5392c..f995f764c83 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.14 2004/12/17 22:33:13 tron Exp $
+$NetBSD: distinfo,v 1.15 2005/01/05 15:39:15 drochner Exp $
 
-SHA1 (mplayer-1.0rc5pl2/MPlayer-1.0pre5try2.tar.bz2) = 3a6143b1bfdcb73008461cd9fcdd30ab7524fc47
-Size (mplayer-1.0rc5pl2/MPlayer-1.0pre5try2.tar.bz2) = 5073725 bytes
-SHA1 (mplayer-1.0rc5pl2/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
-Size (mplayer-1.0rc5pl2/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
-SHA1 (mplayer-1.0rc5pl2/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
-Size (mplayer-1.0rc5pl2/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
-SHA1 (mplayer-1.0rc5pl2/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
-Size (mplayer-1.0rc5pl2/font-arial-cp1250.tar.bz2) = 249705 bytes
-SHA1 (patch-aa) = 9a90cadba608c518e998024f8dbde39cbfab70da
+SHA1 (mplayer-1.0rc6/MPlayer-1.0pre6a.tar.bz2) = 15acd1edf1e6ebb1dada81cdfcbfd3bc62d6bc0c
+Size (mplayer-1.0rc6/MPlayer-1.0pre6a.tar.bz2) = 6380482 bytes
+SHA1 (mplayer-1.0rc6/font-arial-iso-8859-1.tar.bz2) = 152c40bf20de34aa8802d7f80d34d673b0b67212
+Size (mplayer-1.0rc6/font-arial-iso-8859-1.tar.bz2) = 234242 bytes
+SHA1 (mplayer-1.0rc6/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f93c453c4f268181
+Size (mplayer-1.0rc6/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
+SHA1 (mplayer-1.0rc6/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
+Size (mplayer-1.0rc6/font-arial-cp1250.tar.bz2) = 249705 bytes
+SHA1 (patch-aa) = 7f0a858c226fb0e1e0382bff4e31817d510ffca1
 SHA1 (patch-ab) = 68e81c67cd3902499f912d3ca8c6d6bc208a2433
 SHA1 (patch-ac) = 696183adc3777cb4d9bc4b6d96d5cb7c88ec489d
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 398e9015c75..373092059bf 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,46 +1,35 @@
-$NetBSD: patch-aa,v 1.8 2004/07/20 22:04:44 salo Exp $
+$NetBSD: patch-aa,v 1.9 2005/01/05 15:39:15 drochner Exp $
 
---- configure.orig	2004-07-15 00:04:42.000000000 +0200
+--- configure.orig	2004-12-23 16:36:00.000000000 +0100
 +++ configure
-@@ -380,8 +380,8 @@ for ac_option do
+@@ -398,7 +398,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'`
-+#    _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
-@@ -514,7 +514,7 @@ if test "$_skip_cc_check" != yes ; then
-  for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
+@@ -586,7 +586,7 @@ if test "$_skip_cc_check" != yes ; then
    echocheck "$_cc version"
-   cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
+   cc_vendor=gnu
+   cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
 -  cc_version=`( $_cc -dumpversion ) 2>&1`
 +  cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1`
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -625,7 +625,7 @@ case "$host_arch" in
+@@ -733,7 +733,7 @@ case "$host_arch" in
  
-   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`
--  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
-+  pfamily=`$_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
-   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`
+   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`
+-  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
++  pfamily=`$_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
+   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`
  
-@@ -842,7 +842,7 @@ EOF
-     _optimizing=''
-     ;;
- 
--  x86_64)
-+  x86_64|amd64)
-     _def_arch='#define ARCH_X86_64 1'
-     _target_arch='TARGET_ARCH_X86_64 = yes'
-     iproc='x86_64'
-@@ -1618,7 +1618,8 @@ for ac_option do
+@@ -1762,7 +1762,8 @@ for ac_option do
      _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-x11libdir=*)