28 files changed, 277 insertions, 335 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 378df97bba72..8ab91063b65a 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	1
 COMMENT=	Convenient video file and movie encoder
 RESTRICTED=	Port has restricted dependencies
 
@@ -34,6 +33,9 @@ OPTIONS+=	TREMOR "Use built-in tremor instead of libvorbis" off
 OPTIONS+=	XMMS "Enable XMMS plugin support" off
 OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
 OPTIONS+=	THEORA "Enable ogg theora video support" off
+.if !defined(PACKAGE_BUILDING)
+OPTIONS+=	AMR "Enable AMR audio codec support" off
+.endif
 OPTIONS+=	X264 "Enable x264 (H.264) video codec support" off
 OPTIONS+=	XANIM "Enable xanim DLL support" off
 OPTIONS+=	XVID "Enable XVID video codec support" on
@@ -50,9 +52,11 @@ MLINKS=		mplayer.1 mencoder.1
 PATCHDIR=	${.CURDIR}/../mplayer/files
 DATADIR=	${PREFIX}/share/mplayer
 
-TOOLFILES=	calcbpp.pl countquant.pl dvd2divxscript.pl \
-		menc2pass mencvcd mp.pl subedit.pl subsearch.sh \
-		sws-test w32codec_dl.pl wma2ogg.pl x2mpsub.sh
+TOOLFILES=	calcbpp.pl checktree.sh countquant.pl \
+		dvd2divxscript.pl mencvcd \
+		mplmult.sh plotpsnr.pl psnr-video.sh \
+		qepdvcd.sh subedit.pl subsearch.sh \
+		w32codec_dl.pl wma2ogg.pl
 
 .include <bsd.port.pre.mk>
 
@@ -72,7 +76,8 @@ CONFIGURE_ARGS+=	--disable-vidix-internal \
 			--disable-sdl \
 			--disable-svga \
 			--disable-aa \
-			--disable-joystick
+			--disable-joystick \
+			--disable-ssse3
 
 .include "${.CURDIR}/../mplayer/Makefile.options"
 
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index ce7f15a5afc1..a93ea236b326 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,6 +1,3 @@
-MD5 (MPlayer-1.0rc1.tar.bz2) = 18c05d88e22c3b815a43ca8d7152ccdc
-SHA256 (MPlayer-1.0rc1.tar.bz2) = 8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
-SIZE (MPlayer-1.0rc1.tar.bz2) = 8414213
-MD5 (asmrules_fix_20061231.diff) = f0b71c38b1207c1d604be091876ac051
-SHA256 (asmrules_fix_20061231.diff) = 3f71e6f4e07940d4d55084d0df12404371bc4e534a3a6b0756ca73e44ddbc3c4
-SIZE (asmrules_fix_20061231.diff) = 1450
+MD5 (MPlayer-1.0rc2.tar.bz2) = 7e27e535c2d267637df34898f1b91707
+SHA256 (MPlayer-1.0rc2.tar.bz2) = 3875b7cc85e8e7df81c02a638db6b4a970d1e66a86dad6ebf29a1d19f38f5953
+SIZE (MPlayer-1.0rc2.tar.bz2) = 9338201
diff --git a/multimedia/mencoder/pkg-plist b/multimedia/mencoder/pkg-plist
index 516b18d2a14f..edf35073d54b 100644
--- a/multimedia/mencoder/pkg-plist
+++ b/multimedia/mencoder/pkg-plist
@@ -1,15 +1,16 @@
 bin/mencoder
 %%DATADIR%%/tools/calcbpp.pl
+%%DATADIR%%/tools/checktree.sh
 %%DATADIR%%/tools/countquant.pl
 %%DATADIR%%/tools/dvd2divxscript.pl
-%%DATADIR%%/tools/menc2pass
 %%DATADIR%%/tools/mencvcd
-%%DATADIR%%/tools/mp.pl
+%%DATADIR%%/tools/mplmult.sh
+%%DATADIR%%/tools/plotpsnr.pl
+%%DATADIR%%/tools/psnr-video.sh
+%%DATADIR%%/tools/qepdvcd.sh
 %%DATADIR%%/tools/subedit.pl
 %%DATADIR%%/tools/subsearch.sh
-%%DATADIR%%/tools/sws-test
 %%DATADIR%%/tools/w32codec_dl.pl
 %%DATADIR%%/tools/wma2ogg.pl
-%%DATADIR%%/tools/x2mpsub.sh
 @dirrm %%DATADIR%%/tools
 @dirrmtry %%DATADIR%%
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 52d12f2b86c9..2f96921f6634 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	14
+
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
@@ -40,12 +40,13 @@ OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
 OPTIONS+=	DTS "Enable DTS audio codec support" on
 OPTIONS+=	LIBMPCDEC "Enable libmpcdec support" off
 OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
-OPTIONS+=	SPEEX "Enable speex audio codec support" off
+OPTIONS+=	SPEEX "Enable speex audio codec support" on
 OPTIONS+=	TREMOR "Use built-in tremor instead of libvorbis" off
 OPTIONS+=	XMMS "Enable XMMS plugin support" off
 OPTIONS+=	THEORA "Enable ogg theora video support" off
 .if !defined(PACKAGE_BUILDING)
 OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
+OPTIONS+=	AMR "Enable AMR audio codec support" off
 .endif
 OPTIONS+=	X264 "Enable x264 (H.264) video codec support" off
 OPTIONS+=	XANIM "Enable xanim DLL support" off
@@ -69,7 +70,8 @@ CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS+=	--disable-faac \
+CONFIGURE_ARGS+=	--disable-ssse3 \
+			--disable-faac \
 			--disable-twolame \
 			--disable-mencoder
 
@@ -78,16 +80,11 @@ CONFIGURE_ARGS+=	--disable-faac \
 #Building of vidix dependent shared libs is only possible
 #on i386 and amd64 at the moment.
 .if !defined(WITHOUT_VIDIX)
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
-USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/mplayer/vidix
-PLIST_SUB+=	VIDIX=""
-.else
+.if !(${ARCH} == "i386" || ${ARCH} == "amd64")
 CONFIGURE_ARGS+=--disable-vidix-internal
-PLIST_SUB+=	VIDIX="@comment "
 .endif
 .else
 CONFIGURE_ARGS+=--disable-vidix-internal
-PLIST_SUB+=	VIDIX="@comment "
 .endif
 
 .if !defined(WITHOUT_GUI)
@@ -121,7 +118,6 @@ CONFIGURE_ARGS+=	--disable-freetype
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
-CONFIGURE_ARGS+=--with-x11libdir="${LOCALBASE}/lib"
 .else
 WITHOUT_GUI=	yes
 CONFIGURE_ARGS+=--disable-x11 \
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index 151cc533b353..2f1fe695bb18 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -111,7 +111,8 @@ LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if !defined(WITHOUT_XVID)
-CONFIGURE_ARGS+=	--enable-xvid
+#Adding --enable-xvid to CONFIG args breaks LDFLAGS in this release
+#CONFIGURE_ARGS+=	--enable-xvid
 LIB_DEPENDS+=		xvidcore.4:${PORTSDIR}/multimedia/xvid
 .else
 CONFIGURE_ARGS+=	--disable-xvid
@@ -130,11 +131,11 @@ CONFIGURE_ARGS+=	--disable-musepack
 .endif
 
 .if !defined(WITHOUT_DTS)
-CFLAGS+=		-I${LOCALBASE}/include
-CONFIGURE_ARGS+=	--enable-libdts
+#CFLAGS+=		-I${LOCALBASE}/include
+CONFIGURE_ARGS+=	--enable-libdca
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libdca.a:${PORTSDIR}/multimedia/libdca
 .else
-CONFIGURE_ARGS+=	--disable-libdts
+CONFIGURE_ARGS+=	--disable-libdca
 .endif
 
 .if !defined(WITHOUT_SPEEX)
@@ -152,8 +153,8 @@ CONFIGURE_ARGS+=--disable-xanim
 .endif
 
 .if defined(WITH_LIVEMEDIA)
-CONFIGURE_ARGS+=	--enable-live \
-			--with-livelibdir=${LOCALBASE}/live
+#CONFIGURE_ARGS+=	--enable-live \
+#			--with-livelibdir=${LOCALBASE}/live
 RUN_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 .else
@@ -260,26 +261,30 @@ CONFIGURE_ARGS+=--disable-mmxext --disable-sse --disable-sse2
 .endif #WITH_RTCPU
 .if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
-CONFIGURE_ARGS+=	--with-win32libdir=${LOCALBASE}/lib/win32
+CONFIGURE_ARGS+=	--win32codecsdir=${LOCALBASE}/lib/win32
 CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .else
-CONFIGURE_ARGS+=	--disable-win32 \
-			--disable-qtx-codecs
+CONFIGURE_ARGS+=	--disable-win32dll \
+			--disable-qtx
 .endif
 .endif # ARCH == i386/amd64
 
 .if defined(WITH_REALPLAYER)
 CONFIGURE_ARGS+=	--enable-real \
-			--with-reallibdir=${X11BASE}/lib/RealPlayer/codecs
+			--realcodecsdir=${X11BASE}/lib/RealPlayer/codecs
 RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 .else
 .if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS+=	--enable-real \
-			--with-reallibdir=${LOCALBASE}/lib/win32
+			--realcodecsdir=${LOCALBASE}/lib/win32
 .else
 CONFIGURE_ARGS+=	--disable-real
 .endif
 .endif
 
+.if defined(WITH_AMR)
+LIB_DEPENDS+=		amrnb:${PORTSDIR}/audio/libamrnb \
+			amrwb:${PORTSDIR}/audio/libamrwb
+.endif
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index 3d44befcb002..185b612e1d9b 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -2,7 +2,7 @@
 # mplayer and mencoder....the variables that we need to set
 # before we include bsd.port.pre.mk
 
-MPLAYER_PORT_VERSION=	0.99.10
+MPLAYER_PORT_VERSION=	0.99.11
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -14,12 +14,11 @@ MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		ftp://ftp.lug.udel.edu/MPlayer/releases/ \
 		ftp://mirrors.xmission.com/MPlayer/releases/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-1.0rc1
+DISTNAME=	MPlayer-1.0rc2
 
 MAINTAINER?=	riggs@rrr.de
 
 PATCH_SITES=	http://www.mplayerhq.hu/MPlayer/patches/
-PATCHFILES+=	asmrules_fix_20061231.diff
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
@@ -30,17 +29,16 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS=${PTHREAD_LIBS} \
 		TMPDIR="${WRKSRC}"
-CONFIGURE_ARGS=	--with-extralibdir=${LOCALBASE}/lib \
-		--with-extraincdir=${LOCALBASE}/include \
-		--cc=${CC} \
+CONFIGURE_ARGS=	--cc=${CC} \
 		--as=${AS} \
 		--enable-png \
 		--enable-menu \
-		--disable-libfame \
 		--disable-faad-external \
 		--disable-vidix-external \
 		--disable-tv-v4l1 \
-		--disable-tv-v4l2
+		--disable-tv-v4l2 \
+		--disable-dvdnav \
+		--disable-dvdread
 
 WANT_GNOME=	yes
 WANT_SDL=	yes
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index ce7f15a5afc1..a93ea236b326 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,6 +1,3 @@
-MD5 (MPlayer-1.0rc1.tar.bz2) = 18c05d88e22c3b815a43ca8d7152ccdc
-SHA256 (MPlayer-1.0rc1.tar.bz2) = 8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
-SIZE (MPlayer-1.0rc1.tar.bz2) = 8414213
-MD5 (asmrules_fix_20061231.diff) = f0b71c38b1207c1d604be091876ac051
-SHA256 (asmrules_fix_20061231.diff) = 3f71e6f4e07940d4d55084d0df12404371bc4e534a3a6b0756ca73e44ddbc3c4
-SIZE (asmrules_fix_20061231.diff) = 1450
+MD5 (MPlayer-1.0rc2.tar.bz2) = 7e27e535c2d267637df34898f1b91707
+SHA256 (MPlayer-1.0rc2.tar.bz2) = 3875b7cc85e8e7df81c02a638db6b4a970d1e66a86dad6ebf29a1d19f38f5953
+SIZE (MPlayer-1.0rc2.tar.bz2) = 9338201
diff --git a/multimedia/mplayer/files/patch-DMO_VideoDecoder.c b/multimedia/mplayer/files/patch-DMO_VideoDecoder.c
deleted file mode 100644
index 94878a0ce528..000000000000
--- a/multimedia/mplayer/files/patch-DMO_VideoDecoder.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- loader/dmo/DMO_VideoDecoder.c	2007/01/26 09:21:22	22019
-+++ loader/dmo/DMO_VideoDecoder.c	2007/02/11 17:55:49	22204
-@@ -119,6 +119,7 @@
-      
-         this->iv.m_bh = malloc(bihs);
-         memcpy(this->iv.m_bh, format, bihs);
-+        this->iv.m_bh->biSize = bihs;
- 
-         this->iv.m_State = STOP;
-         //this->iv.m_pFrame = 0;
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index 70734c7f5f6d..ad4871aecd2a 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,27 +1,37 @@
---- configure.orig	Tue Apr  3 13:35:43 2007
-+++ configure	Tue Apr  3 13:35:51 2007
-@@ -59,9 +59,9 @@
+--- configure.orig	2007-10-08 03:49:33.000000000 +0800
++++ configure	2007-11-11 13:09:59.000000000 +0800
+@@ -62,9 +62,9 @@
    echo >> "$TMPLOG"
    cat "$1" >> "$TMPLOG"
    echo >> "$TMPLOG"
--  echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o $TMPO $@" >> "$TMPLOG"
-+  echo "$_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra -o $TMPO $@" >> "$TMPLOG"
-   rm -f "$TMPO"
--  $_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o "$TMPO" "$@" >> "$TMPLOG" 2>&1
-+  $_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra -o "$TMPO" "$@" >> "$TMPLOG" 2>&1
+-  echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra $_libs_mplayer $_libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
++  echo "$_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra $_libs_mplayer $_libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
+   rm -f "$TMPEXE"
+-  $_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra $_libs_mplayer $_libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
++  $_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra $_libs_mplayer $_libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
    TMP="$?"
    echo >> "$TMPLOG"
-   echo "ldd $TMPO" >> "$TMPLOG"
-@@ -474,7 +474,7 @@
- _armv5te=auto
+   echo >> "$TMPLOG"
+@@ -484,7 +484,7 @@
  _iwmmxt=auto
  _mtrr=auto
+ _altivec=auto
 -_install=install
 +_install=@${BSD_INSTALL_PROGRAM}
  _ranlib=ranlib
+ _ldconfig=ldconfig
  _cc=cc
- test "$CC" && _cc="$CC"
-@@ -599,14 +599,7 @@
+@@ -1188,8 +1188,7 @@
+         _3dnow=no _3dnowext=no _mmx=no _mmxext=no ;;
+ 
+   *)
+-    echo "Unknown parameter: $ac_option"
+-    exit 1
++    echo "Unknown parameter: $ac_option (ignoring)"
+     ;;
+ 
+   esac
+@@ -1248,14 +1247,7 @@
        case "`uname -m 2>&1`" in
        i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
@@ -37,52 +47,42 @@
        macppc|ppc|ppc64) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
        sparc) host_arch=sparc ;;
-@@ -831,25 +824,10 @@
- _cpuinfo="echo"
+@@ -1524,25 +1516,10 @@
+ 
  # Cygwin has /proc/cpuinfo, but only supports Intel CPUs
  # FIXME: Remove the cygwin check once AMD CPUs are supported
 -if test -r /proc/cpuinfo && not cygwin; then
 -  # Linux with /proc mounted, extract CPU information from it
 -  _cpuinfo="cat /proc/cpuinfo"
--elif test -r /compat/linux/proc/cpuinfo && not x86 ; then
+-elif test -r /compat/linux/proc/cpuinfo && not x86_32 ; then
 -  # FreeBSD with Linux emulation /proc mounted,
 -  # extract CPU information from it
 -  _cpuinfo="cat /compat/linux/proc/cpuinfo"
--elif darwin && not x86 ; then
+-elif darwin && not x86_32 ; then
 -  # use hostinfo on Darwin
 -  _cpuinfo="hostinfo"
 -elif aix; then
 -  # use 'lsattr' on AIX
 -  _cpuinfo="lsattr -E -l proc0 -a type"
--elif x86 || x86_64; then
+-elif x86; then
    # all other OSes try to extract CPU information from a small helper
-   # program TOOLS/cpuinfo instead
-   $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
-   _cpuinfo="TOOLS/cpuinfo"
+   # program cpuinfo instead
+   $_cc -o cpuinfo$_exesuf cpuinfo.c
+   _cpuinfo="./cpuinfo$_exesuf"
 -fi
  
- if x86 || x86_64 ; then
+ if x86 ; then
    # gather more CPU information
-@@ -1539,7 +1517,7 @@
+@@ -2331,7 +2308,7 @@
+   elif test "$cc_vendor" != "gnu" ; then
+     CFLAGS="-O2 $_march $_mcpu $_pipe"
+   else
+-    CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
++    CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O $_pipe"
    fi
-   _stripbinaries=no
- elif test -z "$CFLAGS" ; then
--    CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
-+    CFLAGS="-O $_pipe"
  else
    _warn_CFLAGS=yes
- fi
-@@ -2204,8 +2182,7 @@
-     ;;
- 
-   *)
--    echo "Unknown parameter: $ac_option"
--    exit 1
-+    echo "Unknown parameter: $ac_option (ignoring)..."
-     ;;
- 
-   esac
-@@ -2898,13 +2875,7 @@
+@@ -2965,13 +2942,7 @@
  
  
  echocheck "memalign()"
@@ -96,7 +96,7 @@
  if test "$_memalign" = yes ; then
   _def_memalign='#define HAVE_MEMALIGN 1'
  else
-@@ -3005,20 +2976,8 @@
+@@ -3057,20 +3028,8 @@
  _def_threads='#undef HAVE_THREADS'
  
  echocheck "pthread"
@@ -119,51 +119,42 @@
  if test "$_pthreads" = yes ; then
    _res_comment="using $_ld_pthread"
    _def_pthreads='#define HAVE_PTHREADS 1'
-@@ -6555,7 +6514,8 @@
- #endif
- int main(void) { x264_encoder_open((void*)0); return 0; }
- EOF
--  _ld_x264="$_ld_x264 -lx264 $_ld_pthread"
-+  _ld_x264pc=`pkg-config x264 --libs 2>/dev/null`
-+  _ld_x264="$_ld_x264 $_ld_x264pc $_ld_pthread"
-   _x264=no
-   if cc_check $_ld_x264 $_ld_lm ; then 
-     _x264=yes
-@@ -6685,8 +6645,11 @@
-  if test "$_tv" = yes ; then
+@@ -6722,12 +6681,12 @@
+ if bsd; then
+   echocheck "*BSD BT848 bt8xx header"
+   _ioctl_bt848_h=no
+-  for file in "machine/ioctl_bt848.h" \
+-            "dev/bktr/ioctl_bt848.h" \
+-            "dev/video/bktr/ioctl_bt848.h" \
+-            "dev/ic/bt8xx.h" ; do
++  for file in "dev/bktr/ioctl_bt848.h" \
++              "machine/ioctl_bt848.h" ; do
      cat > $TMPC <<EOF
  #include <sys/types.h>
 +#include <sys/param.h>
- #if defined(__NetBSD__)
- #include <dev/ic/bt8xx.h>
-+#elif(__FreeBSD_version >= 502100)
-+#include <dev/bktr/ioctl_bt848.h>
- #else
- #include <machine/ioctl_bt848.h>
- #endif
-@@ -7218,7 +7181,7 @@
-   CFLAGS="$CFLAGS -D_REENTRANT"
- elif bsd ; then
-   # FIXME bsd needs this so maybe other OS'es
--  CFLAGS="$CFLAGS -D_THREAD_SAFE"
-+  CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
- fi
- # 64 bit file offsets?
- if test "$_largefiles" = yes || freebsd ; then
-@@ -7362,12 +7325,12 @@
++#include <sys/ioctl.h>
+ #include <$file>
+ int main(void) {
+  ioctl(0, TVTUNER_GETFREQ, 0);
+@@ -7343,12 +7302,8 @@
  echocheck "joystick"
  _def_joystick='#undef HAVE_JOYSTICK'
  if test "$_joystick" = yes ; then
 -  if linux ; then
-+#  if linux ; then
      # TODO add some check
      _def_joystick='#define HAVE_JOYSTICK 1'
 -  else
 -    _joystick="no (unsupported under $system_name)"
 -  fi
-+#  else
-+#    _joystick="no (unsupported under $system_name)"
-+#  fi
  fi
  echores "$_joystick"
  
+@@ -7448,7 +7403,7 @@
+   CFLAGS="$CFLAGS -D_REENTRANT"
+ elif bsd ; then
+   # FIXME bsd needs this so maybe other OS'es
+-  CFLAGS="$CFLAGS -D_THREAD_SAFE"
++  CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
+ fi
+ if cygwin ; then
+   CFLAGS="$CFLAGS -D__CYGWIN__"
diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae
index 7f20ee2f144b..f21b28af1b36 100644
--- a/multimedia/mplayer/files/patch-ae
+++ b/multimedia/mplayer/files/patch-ae
@@ -1,27 +1,32 @@
---- Makefile.orig	Mon Oct 23 00:32:31 2006
-+++ Makefile	Tue Oct 24 21:35:42 2006
-@@ -414,43 +414,11 @@
- 	$(MAKE) -C libdha install
- 	$(MAKE) -C vidix install
- endif
+--- Makefile.orig	2007-10-08 03:49:33.000000000 +0800
++++ Makefile	2007-10-20 15:44:28.000000000 +0800
+@@ -246,44 +246,17 @@
+ install: install-dirs $(INSTALL_TARGETS)
+ 
+ install-dirs:
 -	$(INSTALL) -d $(BINDIR)
--	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
--ifeq ($(GUI),yes)
--	-ln -sf $(PRG) $(BINDIR)/gmplayer
--endif
+-	$(INSTALL) -d $(DATADIR)
 -	$(INSTALL) -d $(MANDIR)/man1
+-	$(INSTALL) -d $(CONFDIR)
+-	if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
+ 
+ install-mplayer: mplayer$(EXESUF)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR)
++	@${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR)
+ 
+ install-mplayer-man:
 -	for i in $(MAN_LANG); do \
 -		if test "$$i" = en ; then \
--			$(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1 ; \
+-			$(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ ; \
 -		else \
 -			$(INSTALL) -d $(MANDIR)/$$i/man1 ; \
--			$(INSTALL) -c -m 644 DOCS/man/$$i/mplayer.1 $(MANDIR)/$$i/man1/mplayer.1 ; \
+-			$(INSTALL) -c -m 644 DOCS/man/$$i/mplayer.1 $(MANDIR)/$$i/man1/ ; \
 -		fi ; \
 -	done
-+	@${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)/$(PRG)
 +	@${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
- ifeq ($(MENCODER),yes)
--	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+ 
+ install-mencoder: mencoder$(EXESUF)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
 -	for i in $(MAN_LANG); do \
 -		if test "$$i" = en ; then \
 -			cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
@@ -29,21 +34,17 @@
 -			cd $(MANDIR)/$$i/man1 && ln -sf mplayer.1 mencoder.1 ; \
 -		fi ; \
 -	done
--endif
--	@$(INSTALL) -d $(DATADIR)
--	@$(INSTALL) -d $(DATADIR)/font
--ifeq ($(GUI),yes)
--	@$(INSTALL) -d $(DATADIR)/skins
--	@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
++	@${BSD_INSTALL_PROGRAM} mencoder$(EXESUF) $(BINDIR)
+ 
+ install-gui:
+-	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
+-	$(INSTALL) -d $(DATADIR)/skins
+-	@echo "*** Download skin(s) at http://www.mplayerhq.hu/design7/dload.html"
 -	@echo "*** for GUI, and extract to $(DATADIR)/skins/"
--	@$(INSTALL) -d $(prefix)/share/pixmaps
--	$(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/mplayer.xpm
--	@$(INSTALL) -d $(prefix)/share/applications
--	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/mplayer.desktop
-+	@${BSD_INSTALL_PROGRAM} $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
- endif
--	@$(INSTALL) -d $(CONFDIR)
--	@if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
+-	$(INSTALL) -d $(prefix)/share/pixmaps
+-	$(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/
+-	$(INSTALL) -d $(prefix)/share/applications
+-	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
  
  uninstall:
- 	-rm -f $(BINDIR)/$(PRG) $(BINDIR)/gmplayer $(MANDIR)/man1/mplayer.1
+ 	-rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
diff --git a/multimedia/mplayer/files/patch-cddb-CVE-2007-2948 b/multimedia/mplayer/files/patch-cddb-CVE-2007-2948
deleted file mode 100644
index c9f53a8092f2..000000000000
--- a/multimedia/mplayer/files/patch-cddb-CVE-2007-2948
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: stream/stream_cddb.c
-===================================================================
---- stream/stream_cddb.c	(revision 20381)
-+++ stream/stream_cddb.c	(working copy)
-@@ -435,7 +435,7 @@
- 
- 	switch(status) {
- 		case 210:
--			ret = sscanf( http_hdr->body, "%d %s %08lx", &status, category, &disc_id);
-+			ret = sscanf( http_hdr->body, "%d %99s %08lx", &status, category, &disc_id);
- 			if( ret!=3 ) {
- 				mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 				return -1;
-@@ -496,7 +496,7 @@
- 	ptr++;
- 	// We have a list of exact/inexact matches, so which one do we use?
- 	// So let's take the first one.
--	ret = sscanf(ptr, "%s %08lx %s", cddb_data->category, &(cddb_data->disc_id), album_title);
-+	ret = sscanf(ptr, "%99s %08lx %99s", cddb_data->category, &(cddb_data->disc_id), album_title);
- 	if( ret!=3 ) {
- 		mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 		return -1;
-@@ -533,7 +533,7 @@
- 	switch(status) {
- 		case 200:
- 			// Found exact match
--			ret = sscanf(http_hdr->body, "%d %s %08lx %s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
-+			ret = sscanf(http_hdr->body, "%d %99s %08lx %99s", &status, cddb_data->category, &(cddb_data->disc_id), album_title);
- 			if( ret!=4 ) {
- 				mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_ParseError);
- 				return -1;
diff --git a/multimedia/mplayer/files/patch-input-joystick.c b/multimedia/mplayer/files/patch-input-joystick.c
index f57f78b57235..ad424472e5b1 100644
--- a/multimedia/mplayer/files/patch-input-joystick.c
+++ b/multimedia/mplayer/files/patch-input-joystick.c
@@ -1,5 +1,5 @@
---- input/joystick.c.orig	Sat Mar 31 05:10:08 2007
-+++ input/joystick.c	Sat Mar 31 05:09:30 2007
+--- input/joystick.c.orig	2007-10-08 03:49:26.000000000 +0800
++++ input/joystick.c	2007-10-20 16:00:20.000000000 +0800
 @@ -24,8 +24,6 @@
  #define JS_DEV "/dev/input/js0"
  #endif
@@ -9,11 +9,12 @@
  #include <linux/joystick.h>
  
  int axis[256];
-@@ -147,17 +145,3 @@
+@@ -145,18 +143,3 @@
+ 
    return MP_INPUT_NOTHING;
  }
- 
--#else
+-
+-#else /* TARGET_LINUX */
 -
 -// dummy function
 -
@@ -26,4 +27,4 @@
 -  return MP_INPUT_NOTHING;
 -}
 -
--#endif
+-#endif /* TARGET_LINUX */
diff --git a/multimedia/mplayer/files/patch-libavcodec-Makefile b/multimedia/mplayer/files/patch-libavcodec-Makefile
new file mode 100644
index 000000000000..ea1db4f04e25
--- /dev/null
+++ b/multimedia/mplayer/files/patch-libavcodec-Makefile
@@ -0,0 +1,13 @@
+--- libavcodec/Makefile.orig	2007-10-07 15:49:37.000000000 -0400
++++ libavcodec/Makefile	2007-11-14 02:49:09.000000000 -0500
+@@ -6,6 +6,10 @@
+ 
+ CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
+ 
++ifeq ($(ARCH_X86_64),yes)
++CFLAGS += -DBROKEN_RELOCATIONS
++endif
++
+ OBJS = allcodecs.o \
+        audioconvert.o \
+        bitstream.o \
diff --git a/multimedia/mplayer/files/patch-libavcodec-h264.c b/multimedia/mplayer/files/patch-libavcodec-h264.c
index 371bf01eaef8..a6be14980de5 100644
--- a/multimedia/mplayer/files/patch-libavcodec-h264.c
+++ b/multimedia/mplayer/files/patch-libavcodec-h264.c
@@ -1,11 +1,11 @@
---- libavcodec/h264.c.orig	Thu Dec 21 14:57:54 2006
-+++ libavcodec/h264.c	Thu Dec 21 15:00:14 2006
-@@ -6034,7 +6034,7 @@
+--- libavcodec/h264.c.orig	2007-10-08 03:49:36.000000000 +0800
++++ libavcodec/h264.c	2007-10-20 16:03:23.000000000 +0800
+@@ -5241,7 +5241,7 @@
      return ctx + 4 * cat;
  }
  
--static const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
-+const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
+-static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
++const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
      0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
      2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
      3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
diff --git a/multimedia/mplayer/files/patch-libavcodec-vp56.h b/multimedia/mplayer/files/patch-libavcodec-vp56.h
deleted file mode 100644
index 5ac3e5f20a9d..000000000000
--- a/multimedia/mplayer/files/patch-libavcodec-vp56.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/vp56.h.orig	Mon Oct 23 07:32:34 2006
-+++ libavcodec/vp56.h	Wed Dec 13 03:03:41 2006
-@@ -24,7 +24,7 @@
- #ifndef VP56_H
- #define VP56_H
- 
--#include <stdint.h>
-+#include <inttypes.h>
- 
- #include "vp56data.h"
- #include "dsputil.h"
diff --git a/multimedia/mplayer/files/patch-bswap.h b/multimedia/mplayer/files/patch-libavutil-bswap.h
index e3a320a78183..fc196d2b6e52 100644
--- a/multimedia/mplayer/files/patch-bswap.h
+++ b/multimedia/mplayer/files/patch-libavutil-bswap.h
@@ -1,8 +1,8 @@
---- bswap.h.orig	Sun Jun 11 20:35:47 2006
-+++ bswap.h	Thu Jun 15 10:31:42 2006
-@@ -1,8 +1,17 @@
- #ifndef __BSWAP_H__
- #define __BSWAP_H__
+--- libavutil/bswap.h.orig	2007-10-08 03:49:34.000000000 +0800
++++ libavutil/bswap.h	2007-10-20 15:54:54.000000000 +0800
+@@ -29,8 +29,17 @@
+ #include <stdint.h>
+ #include "common.h"
  
 +#if (defined(__unix__) || defined(unix)) && !defined(USG)
 +#include <sys/param.h>
@@ -17,4 +17,4 @@
 +#define bswap_64(x) bswap64(x)
  #else
  
- #include <inttypes.h>
+ #ifdef ARCH_X86_64
diff --git a/multimedia/mplayer/files/patch-libdha-Makefile b/multimedia/mplayer/files/patch-libdha-Makefile
deleted file mode 100644
index 97202cf12906..000000000000
--- a/multimedia/mplayer/files/patch-libdha-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- libdha/Makefile.orig	Mon Jul 12 12:54:10 2004
-+++ libdha/Makefile	Thu Jul 22 22:18:21 2004
-@@ -4,8 +4,6 @@
- 
- MAJOR_VERSION = 1
- MINOR_VERSION = 0
--VERSION = $(MAJOR_VERSION).$(MINOR_VERSION) 
--
- 
- ifeq ($(TARGET_OS),CYGWIN)
- SHORTNAME = libdha.dll
-@@ -19,7 +17,7 @@
- LIBNAME = libdha.a
- SHORTNAME = libdha.a
- else
--LIBNAME = libdha.so.$(VERSION)
-+LIBNAME = libdha-$(MAJOR_VERSION).so.$(MINOR_VERSION)
- endif
- 
- SRCS=libdha.c mtrr.c pci.c pci_names.c
diff --git a/multimedia/mplayer/files/patch-libdha-pci.c b/multimedia/mplayer/files/patch-libdha-pci.c
deleted file mode 100644
index cc5972c72a44..000000000000
--- a/multimedia/mplayer/files/patch-libdha-pci.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- libdha/pci.c	Sun Oct 22 18:32:26 2006
-+++ libdha/pci.c	Sat Jun  9 17:09:11 2007
-@@ -493,5 +493,5 @@
- #elif defined(__powerpc__)
- #include "sysdep/pci_powerpc.c"
--#elif defined(__x86_64__)
-+#elif defined(__x86_64__) || defined(__amd64__)
- /* Nothing here right now */
- #else
diff --git a/multimedia/mplayer/files/patch-libmpcodecs-vf_ass.c b/multimedia/mplayer/files/patch-libmpcodecs-vf_ass.c
deleted file mode 100644
index f4f914904e97..000000000000
--- a/multimedia/mplayer/files/patch-libmpcodecs-vf_ass.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpcodecs/vf_ass.c.orig	Mon Oct 23 07:32:24 2006
-+++ libmpcodecs/vf_ass.c	Wed Dec 13 03:04:26 2006
-@@ -23,7 +23,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include <assert.h>
- 
- #include "config.h"
diff --git a/multimedia/mplayer/files/patch-stream-stream_dvd.h b/multimedia/mplayer/files/patch-stream-stream_dvd.h
new file mode 100644
index 000000000000..c1a709c8387b
--- /dev/null
+++ b/multimedia/mplayer/files/patch-stream-stream_dvd.h
@@ -0,0 +1,26 @@
+--- stream/stream_dvd.h.orig	2007-10-08 03:49:26.000000000 +0800
++++ stream/stream_dvd.h	2007-10-26 20:38:27.000000000 +0800
+@@ -1,19 +1,7 @@
+-#ifdef USE_DVDREAD_INTERNAL
+-#include "dvdread/dvd_reader.h"
+-#include "dvdread/ifo_types.h"
+-#include "dvdread/ifo_read.h"
+-#include "dvdread/nav_read.h"
+-#elif defined(USE_DVDNAV)
+-#include <dvd_reader.h>
+-#include <ifo_types.h>
+-#include <ifo_read.h>
+-#include <nav_read.h>
+-#else
+-#include <dvdread/dvd_reader.h>
+-#include <dvdread/ifo_types.h>
+-#include <dvdread/ifo_read.h>
+-#include <dvdread/nav_read.h>
+-#endif
++#include "../dvdread/dvd_reader.h"
++#include "../dvdread/ifo_types.h"
++#include "../dvdread/ifo_read.h"
++#include "../dvdread/nav_read.h"
+ 
+ typedef struct {
+   dvd_reader_t *dvd;
diff --git a/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c b/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
index 379b67050871..7fae2d768bbf 100644
--- a/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
+++ b/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
@@ -1,6 +1,14 @@
---- stream/tvi_bsdbt848.c.orig	Mon Oct 23 00:32:25 2006
-+++ stream/tvi_bsdbt848.c	Tue Oct 24 21:54:45 2006
-@@ -297,11 +297,11 @@
+--- stream/tvi_bsdbt848.c.orig	2007-10-08 03:49:26.000000000 +0800
++++ stream/tvi_bsdbt848.c	2007-11-11 15:24:05.000000000 +0800
+@@ -26,6 +26,7 @@
+ #define NTSC_HEIGHT 480
+ #define NTSC_FPS    29.97
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -351,11 +352,11 @@
          int req_mode = *(int *)arg;
  	u_short tmp_fps;
  
@@ -14,7 +22,7 @@
              priv->maxheight = PAL_HEIGHT;
              priv->maxwidth = PAL_WIDTH;
              priv->maxfps = PAL_FPS;
-@@ -322,7 +322,7 @@
+@@ -376,7 +377,7 @@
  
          if(req_mode == TV_NORM_NTSC) 
              {
@@ -23,7 +31,7 @@
              priv->maxheight = NTSC_HEIGHT;
              priv->maxwidth = NTSC_WIDTH;
              priv->maxfps = NTSC_FPS;
-@@ -346,9 +346,28 @@
+@@ -400,9 +401,28 @@
                  }
              }
  
@@ -52,23 +60,23 @@
 -        if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) 
 +        if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) 
              {
-             perror("format:ioctl");
+             mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));
              return(TVI_CONTROL_FALSE);
-@@ -479,7 +498,7 @@
+@@ -532,7 +552,7 @@
+ 
  priv->videoready = TRUE;
- priv->btdev = strdup("/dev/bktr0");
  priv->immediatemode = FALSE;
 -priv->iformat = METEOR_FMT_PAL;
 +priv->iformat = BT848_IFORM_F_PALBDGHI;
  priv->maxheight = PAL_HEIGHT;
  priv->maxwidth = PAL_WIDTH;
  priv->maxfps = PAL_FPS;
-@@ -504,7 +523,7 @@
+@@ -557,7 +577,7 @@
      }
  
  if(priv->videoready == TRUE && 
 -   ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) 
 +   ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) 
      {
-     perror("FMT:ioctl");
+     mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "SETEORSFMT", strerror(errno));
      }
diff --git a/multimedia/mplayer/files/patch-vidix-drivers-Makefile b/multimedia/mplayer/files/patch-vidix-drivers-Makefile
deleted file mode 100644
index d8e995550aec..000000000000
--- a/multimedia/mplayer/files/patch-vidix-drivers-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- vidix/drivers/Makefile.orig	Mon Oct 23 00:32:26 2006
-+++ vidix/drivers/Makefile	Tue Oct 24 22:04:38 2006
-@@ -6,7 +6,7 @@
- VIDIX_LIBS = -L../../libdha -ldha
- VIDIX_LIBS_M = $(VIDIX_LIBS) -lm
- VIDIX_LIBS_X = $(VIDIX_LIBS_M) $(X_LIB)
--VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) -fPIC
-+VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) $(X11_INC) -fPIC
- 
- RAGE128_CFLAGS=$(VIDIX_CFLAGS) -DRAGE128
- MGA_CRTC2_CFLAGS=$(VIDIX_CFLAGS) -DCRTC2
diff --git a/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c b/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c
deleted file mode 100644
index c6edd3977fa2..000000000000
--- a/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- vidix/drivers/mga_vid.c.orig	Sun Jun 11 20:35:43 2006
-+++ vidix/drivers/mga_vid.c	Mon Jul 31 22:48:55 2006
-@@ -43,7 +43,7 @@
- 
- #define MGA_VSYNC_POS 2
- 
--#undef MGA_PCICONFIG_MEMDETECT
-+#define MGA_PCICONFIG_MEMDETECT
- 
- #define MGA_DEFAULT_FRAMES 4
- 
-@@ -1218,8 +1218,7 @@
- 	    {
- 		if ((lst[i].command & PCI_COMMAND_IO) == 0)
- 		{
--			printf("[mga] Device is disabled, ignoring\n");
--			continue;
-+			printf("[mga] Device is disabled, trying anyways.\n");
- 		}
- 		switch(lst[i].device)
- 		{
diff --git a/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c b/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c
deleted file mode 100644
index 934d9e420dff..000000000000
--- a/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vidix/drivers/radeon_vid.c.orig	Tue Dec 21 00:43:54 2004
-+++ vidix/drivers/radeon_vid.c	Tue Apr 12 17:49:46 2005
-@@ -852,6 +852,8 @@
-  DEVICE_ATI_RAGE_128_PRO2,
-  DEVICE_ATI_RAGE_128_PRO3,
- /* these seem to be based on rage 128 instead of mach64 */
-+ DEVICE_ATI_RAGE_MOBILITY_M4,
-+ DEVICE_ATI_RAGE_MOBILITY_M42,
-  DEVICE_ATI_RAGE_MOBILITY_M3,
-  DEVICE_ATI_RAGE_MOBILITY_M32
- #else
diff --git a/multimedia/mplayer/files/patch-vidix-mga_vid.c b/multimedia/mplayer/files/patch-vidix-mga_vid.c
new file mode 100644
index 000000000000..9be0d06d7c5b
--- /dev/null
+++ b/multimedia/mplayer/files/patch-vidix-mga_vid.c
@@ -0,0 +1,17 @@
+--- vidix/mga_vid.c.orig	2007-10-08 03:49:27.000000000 +0800
++++ vidix/mga_vid.c	2007-10-20 16:24:47.000000000 +0800
+@@ -1110,13 +1110,10 @@
+ 		    i, lst[i].vendor, lst[i].device);
+ 	    if (lst[i].vendor == VENDOR_MATROX)
+ 	    {
+-#if 0
+ 		if ((lst[i].command & PCI_COMMAND_IO) == 0)
+ 		{
+-			printf("[mga] Device is disabled, ignoring\n");
+-			continue;
++			printf("[mga] Device is disabled, trying anyways.\n");
+ 		}
+-#endif
+ 		switch(lst[i].device)
+ 		{
+ 		    case DEVICE_MATROX_MGA_G550_AGP:
diff --git a/multimedia/mplayer/files/patch-vidix-pci.c b/multimedia/mplayer/files/patch-vidix-pci.c
new file mode 100644
index 000000000000..e349a3b8ef1e
--- /dev/null
+++ b/multimedia/mplayer/files/patch-vidix-pci.c
@@ -0,0 +1,11 @@
+--- vidix/pci.c.orig	2007-10-07 15:49:27.000000000 -0400
++++ vidix/pci.c	2007-11-14 03:12:26.000000000 -0500
+@@ -484,8 +484,6 @@
+ #include "sysdep/pci_arm32.c"
+ #elif defined(__powerpc__)
+ #include "sysdep/pci_powerpc.c"
+-#elif defined(__x86_64__)
+-/* Nothing here right now */
+ #else
+ #include "sysdep/pci_x86.c"
+ #endif
diff --git a/multimedia/mplayer/files/patch-vidix-radeon_vid.c b/multimedia/mplayer/files/patch-vidix-radeon_vid.c
new file mode 100644
index 000000000000..60f0ed1b217b
--- /dev/null
+++ b/multimedia/mplayer/files/patch-vidix-radeon_vid.c
@@ -0,0 +1,11 @@
+--- vidix/radeon_vid.c.orig	2007-10-08 03:49:27.000000000 +0800
++++ vidix/radeon_vid.c	2007-10-20 16:26:57.000000000 +0800
+@@ -353,6 +353,8 @@
+  { DEVICE_ATI_RAGE_128_PRO2, 0 },
+  { DEVICE_ATI_RAGE_128_PRO3, 0 },
+ /* these seem to be based on rage 128 instead of mach64 */
++ { DEVICE_ATI_RAGE_MOBILITY_M4, 0 },
++ { DEVICE_ATI_RAGE_MOBILITY_M42, 0 },
+  { DEVICE_ATI_RAGE_MOBILITY_M3, 0 },
+  { DEVICE_ATI_RAGE_MOBILITY_M32, 0 },
+ #else
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index c826c8a3fe2b..1fecd8521689 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -1,5 +1,6 @@
 bin/mplayer
 %%GMPLAYER%%bin/gmplayer
+%%PORTDOCS%%%%DOCSDIR%%/aalib.html
 %%PORTDOCS%%%%DOCSDIR%%/advaudio.html
 %%PORTDOCS%%%%DOCSDIR%%/aspect.html
 %%PORTDOCS%%%%DOCSDIR%%/audio-codecs.html
@@ -17,6 +18,7 @@ bin/mplayer
 %%PORTDOCS%%%%DOCSDIR%%/bugs-audio.html
 %%PORTDOCS%%%%DOCSDIR%%/bugs-special.html
 %%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/caca.html
 %%PORTDOCS%%%%DOCSDIR%%/cd-dvd.html
 %%PORTDOCS%%%%DOCSDIR%%/codec-importing.html
 %%PORTDOCS%%%%DOCSDIR%%/codecs.html
@@ -24,12 +26,16 @@ bin/mplayer
 %%PORTDOCS%%%%DOCSDIR%%/containers.html
 %%PORTDOCS%%%%DOCSDIR%%/control.html
 %%PORTDOCS%%%%DOCSDIR%%/default.css
+%%PORTDOCS%%%%DOCSDIR%%/directfb.html
+%%PORTDOCS%%%%DOCSDIR%%/dfbmga.html
+%%PORTDOCS%%%%DOCSDIR%%/dga.html
 %%PORTDOCS%%%%DOCSDIR%%/drives.html
 %%PORTDOCS%%%%DOCSDIR%%/dvd.html
 %%PORTDOCS%%%%DOCSDIR%%/edl.html
 %%PORTDOCS%%%%DOCSDIR%%/encoding-guide.html
 %%PORTDOCS%%%%DOCSDIR%%/exotic_platforms.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/fbdev.html
 %%PORTDOCS%%%%DOCSDIR%%/features.html
 %%PORTDOCS%%%%DOCSDIR%%/fonts-osd.html
 %%PORTDOCS%%%%DOCSDIR%%/gui.html
@@ -47,6 +53,7 @@ bin/mplayer
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-handheld-psp.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-mpeg.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-mpeg4.html
+%%PORTDOCS%%%%DOCSDIR%%/menc-feat-quicktime-7.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-rescale.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-selecting-codec.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-selecting-input.html
@@ -57,15 +64,17 @@ bin/mplayer
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-x264.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-xvid.html
 %%PORTDOCS%%%%DOCSDIR%%/mencoder.html
+%%PORTDOCS%%%%DOCSDIR%%/mga_vid.html
 %%PORTDOCS%%%%DOCSDIR%%/mpeg_decoders.html
-%%PORTDOCS%%%%DOCSDIR%%/mpst.html
 %%PORTDOCS%%%%DOCSDIR%%/mtrr.html
+%%PORTDOCS%%%%DOCSDIR%%/opengl.html
 %%PORTDOCS%%%%DOCSDIR%%/other.html
-%%PORTDOCS%%%%DOCSDIR%%/output-trad.html
 %%PORTDOCS%%%%DOCSDIR%%/ports.html
 %%PORTDOCS%%%%DOCSDIR%%/radio-input.html
 %%PORTDOCS%%%%DOCSDIR%%/radio.html
 %%PORTDOCS%%%%DOCSDIR%%/rtc.html
+%%PORTDOCS%%%%DOCSDIR%%/sdl.html
+%%PORTDOCS%%%%DOCSDIR%%/svgalib.html
 %%PORTDOCS%%%%DOCSDIR%%/skin-file.html
 %%PORTDOCS%%%%DOCSDIR%%/skin-fonts.html
 %%PORTDOCS%%%%DOCSDIR%%/skin-gui.html
@@ -73,35 +82,27 @@ bin/mplayer
 %%PORTDOCS%%%%DOCSDIR%%/skin-quality.html
 %%PORTDOCS%%%%DOCSDIR%%/skin.html
 %%PORTDOCS%%%%DOCSDIR%%/softreq.html
-%%PORTDOCS%%%%DOCSDIR%%/sound-cards.html
 %%PORTDOCS%%%%DOCSDIR%%/streaming.html
 %%PORTDOCS%%%%DOCSDIR%%/subosd.html
 %%PORTDOCS%%%%DOCSDIR%%/sync.html
+%%PORTDOCS%%%%DOCSDIR%%/tdfx_vid.html
+%%PORTDOCS%%%%DOCSDIR%%/tdfxfb.html
 %%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%/tv-input.html
 %%PORTDOCS%%%%DOCSDIR%%/tv.html
+%%PORTDOCS%%%%DOCSDIR%%/tv-input.html
+%%PORTDOCS%%%%DOCSDIR%%/tv-teletext.html
 %%PORTDOCS%%%%DOCSDIR%%/tvout.html
 %%PORTDOCS%%%%DOCSDIR%%/unix.html
 %%PORTDOCS%%%%DOCSDIR%%/usage.html
 %%PORTDOCS%%%%DOCSDIR%%/vcd.html
-%%PORTDOCS%%%%DOCSDIR%%/video-cards.html
+%%PORTDOCS%%%%DOCSDIR%%/vesa.html
 %%PORTDOCS%%%%DOCSDIR%%/video-codecs.html
 %%PORTDOCS%%%%DOCSDIR%%/video-formats.html
 %%PORTDOCS%%%%DOCSDIR%%/video.html
+%%PORTDOCS%%%%DOCSDIR%%/vidix.html
 %%PORTDOCS%%%%DOCSDIR%%/windows.html
-%%VIDIX%%lib/libdha.so.1
-%%VIDIX%%lib/libdha-1.so.0
-%%VIDIX%%lib/mplayer/vidix/cyberblade_vid.so
-%%VIDIX%%lib/mplayer/vidix/mach64_vid.so
-%%VIDIX%%lib/mplayer/vidix/mga_crtc2_vid.so
-%%VIDIX%%lib/mplayer/vidix/mga_vid.so
-%%VIDIX%%lib/mplayer/vidix/nvidia_vid.so
-%%VIDIX%%lib/mplayer/vidix/pm3_vid.so
-%%VIDIX%%lib/mplayer/vidix/radeon_vid.so
-%%VIDIX%%lib/mplayer/vidix/rage128_vid.so
-%%VIDIX%%lib/mplayer/vidix/savage_vid.so
-%%VIDIX%%lib/mplayer/vidix/sis_vid.so
-%%VIDIX%%lib/mplayer/vidix/unichrome_vid.so
+%%PORTDOCS%%%%DOCSDIR%%/x11.html
+%%PORTDOCS%%%%DOCSDIR%%/xv.html
 %%DATADIR%%/examples/etc/example.conf
 %%DATADIR%%/examples/etc/input.conf
 %%DATADIR%%/examples/etc/menu.conf
@@ -110,5 +111,3 @@ bin/mplayer
 @dirrm %%DATADIR%%/examples
 @dirrmtry %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%VIDIX%%@dirrm lib/mplayer/vidix
-%%VIDIX%%@dirrm lib/mplayer