diff --git a/x11/mplayer/Makefile b/x11/mplayer/Makefile
index 761a06373ab..9a5dba71841 100644
--- a/x11/mplayer/Makefile
+++ b/x11/mplayer/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.60 2003/10/26 19:54:46 brad Exp $
+# $OpenBSD: Makefile,v 1.61 2003/11/02 23:30:27 brad Exp $
 
 # May not be hard to add more.
 ONLY_FOR_ARCHS=		i386 macppc
 
 COMMENT=		"Movie player supporting MPEG, DivX, AVI, ASF, MOV & more"
 
-DISTNAME=		MPlayer-0.92
+DISTNAME=		MPlayer-1.0pre2
 DIST_SUBDIR=		mplayer
-PKGNAME=		${DISTNAME:L}p1
+PKGNAME=		${DISTNAME:L}
 CATEGORIES=		x11
 EXTRACT_SUFX=		.tar.bz2
 
@@ -64,16 +64,9 @@ CONFIGURE_ARGS+=--disable-alsa \
 CONFIGURE_ARGS+=--target=ppc-openbsd
 .endif
 
-FLAVORS=	arts esd sdl ggi debug mad win32 no_x11 cdda faad aa lzo
+FLAVORS=	arts esd sdl ggi debug mad win32 no_x11 cdda aa lzo
 FLAVOR?=
 
-.if ${FLAVOR:L:Mfaad}
-CONFIGURE_ARGS+=--enable-faad
-LIB_DEPENDS+=   faad::audio/faad
-.else
-CONFIGURE_ARGS+=--disable-faad
-.endif
-
 .if ${FLAVOR:L:Marts}
 CONFIGURE_ARGS+=--enable-arts
 LIB_DEPENDS+=	artsc::x11/kde/arts3
@@ -176,6 +169,6 @@ post-install:
 		${PREFIX}/share/examples/mplayer
 	${INSTALL_DATA} ${WRKDIST}/etc/example.conf \
 		${PREFIX}/share/examples/mplayer/mplayer.conf
-	${INSTALL_DATA} ${WRKDIST}/DOCS/*.html ${PREFIX}/share/doc/mplayer
+	${INSTALL_DATA} ${WRKDIST}/DOCS/en/*.html ${PREFIX}/share/doc/mplayer
 
 .include <bsd.port.mk>
diff --git a/x11/mplayer/distinfo b/x11/mplayer/distinfo
index 1ce217278a0..9193481272e 100644
--- a/x11/mplayer/distinfo
+++ b/x11/mplayer/distinfo
@@ -1,6 +1,6 @@
-MD5 (mplayer/MPlayer-0.92.tar.bz2) = c4e003fc6c6f82c1cae96a95eb9b2d28
+MD5 (mplayer/MPlayer-1.0pre2.tar.bz2) = a60c179468f85e83e3f9e1922e81ad64
 MD5 (mplayer/default-1.7.tar.bz2) = 7e1d16c2f8a32469f4354cb043eecc5d
-RMD160 (mplayer/MPlayer-0.92.tar.bz2) = 9af2b8b480f0b51119886b65b56c72cce222f7d1
+RMD160 (mplayer/MPlayer-1.0pre2.tar.bz2) = 460a9e5fc1c1ed7d5a8f66fe8448699bb782571d
 RMD160 (mplayer/default-1.7.tar.bz2) = 5f78ff9db296d8fd53ef6603ec8a227eeb602dd1
-SHA1 (mplayer/MPlayer-0.92.tar.bz2) = 32496dbc6b7dfa2b2ce2c5d73eaf31109644d513
+SHA1 (mplayer/MPlayer-1.0pre2.tar.bz2) = 49b20cf4c55f7557aa4c0f9b8a020f3d7be07b48
 SHA1 (mplayer/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3
diff --git a/x11/mplayer/patches/patch-Makefile b/x11/mplayer/patches/patch-Makefile
index 64f39201832..16862ca9270 100644
--- a/x11/mplayer/patches/patch-Makefile
+++ b/x11/mplayer/patches/patch-Makefile
@@ -1,16 +1,16 @@
-$OpenBSD: patch-Makefile,v 1.5 2003/10/26 19:54:46 brad Exp $
---- Makefile.orig	2003-08-09 10:12:30.000000000 -0400
-+++ Makefile	2003-08-21 17:28:02.000000000 -0400
-@@ -228,7 +228,7 @@ $(PRG_FIBMAP): fibmap_mplayer.o
+$OpenBSD: patch-Makefile,v 1.6 2003/11/02 23:30:27 brad Exp $
+--- Makefile.orig	2003-10-04 18:00:01.000000000 -0400
++++ Makefile	2003-10-26 19:57:37.000000000 -0500
+@@ -236,7 +236,7 @@ $(PRG_FIBMAP): fibmap_mplayer.o
  ifeq ($(MENCODER),yes)
  $(PRG_MENCODER): $(MENCODER_DEP)
  	./darwinfixlib.sh $(MENCODER_DEP) libmpcodecs/libmpencoders.a
--	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
-+	$(CXX) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
+-	$(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
++	$(CXX) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) libmpcodecs/libmpencoders.a $(ENCORE_LIB) $(COMMON_LIBS) $(EXTRA_LIB) $(MLIB_LIB) $(LIRC_LIB) $(LIRCC_LIB) $(ARCH_LIB) $(I18NLIBS) -lm 
  endif
  
  codecs.conf.h: $(PRG_CFG)
-@@ -276,8 +276,6 @@ ifeq ($(GUI),yes)
+@@ -294,8 +294,6 @@ ifeq ($(GUI),yes)
  	@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
  	@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
  endif
diff --git a/x11/mplayer/patches/patch-configure b/x11/mplayer/patches/patch-configure
index 7732341bca8..a6ae509a4a3 100644
--- a/x11/mplayer/patches/patch-configure
+++ b/x11/mplayer/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.22 2003/09/25 20:59:01 sturm Exp $
---- configure.orig	2003-08-09 16:12:30.000000000 +0200
-+++ configure	2003-08-24 10:47:19.000000000 +0200
-@@ -3524,7 +3524,7 @@ echores "$_sgiaudio"
+$OpenBSD: patch-configure,v 1.23 2003/11/02 23:30:27 brad Exp $
+--- configure.orig	2003-10-05 11:34:40.000000000 -0400
++++ configure	2003-10-28 18:00:19.000000000 -0500
+@@ -3903,7 +3903,7 @@ echores "$_sgiaudio"
  
  
  echocheck "VCD support"
@@ -10,7 +10,16 @@ $OpenBSD: patch-configure,v 1.22 2003/09/25 20:59:01 sturm Exp $
    _inputmodules="vcd $_inputmodules"
    _def_vcd='#define HAVE_VCD 1'
    echores "ok"
-@@ -4173,7 +4173,7 @@ fi
+@@ -4442,7 +4442,7 @@ int main(void) {
+   return 0;
+ }
+ EOF
+-  if cc_check $_inc_faad $_ld_faad -lm && "$TMPO" >> "$TMPLOG" ; then
++  if ($_cc $_inc_faad $_ld_faad -lm -o "$TMPO" "$TMPC") && "$TMPO" >> "$TMPLOG" ; then
+     _faad_version=`"$TMPO"`
+     _faad_tempversion=`"$TMPO" | sed -e 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).*/\1\2/'`
+     _def_faad_version="#define FAADVERSION $_faad_tempversion"
+@@ -4691,7 +4691,7 @@ fi
  
  
  echocheck "iconv"
@@ -19,7 +28,7 @@ $OpenBSD: patch-configure,v 1.22 2003/09/25 20:59:01 sturm Exp $
    _iconv_tmp='#include <iconv.h>'
  
    cat > $TMPC << EOF
-@@ -5406,6 +5406,9 @@ $_def_vcd
+@@ -6123,6 +6123,9 @@ $_def_vcd
  #elif defined(SYS_DARWIN)
  #define DEFAULT_CDROM_DEVICE    "/dev/rdiskN"
  #define DEFAULT_DVD_DEVICE	DEFAULT_CDROM_DEVICE
diff --git a/x11/mplayer/patches/patch-etc_example_conf b/x11/mplayer/patches/patch-etc_example_conf
deleted file mode 100644
index 2800dd89eab..00000000000
--- a/x11/mplayer/patches/patch-etc_example_conf
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-etc_example_conf,v 1.1 2003/10/26 19:54:46 brad Exp $
---- etc/example.conf.orig	2003-10-25 21:14:26.000000000 -0400
-+++ etc/example.conf	2003-10-25 21:15:11.000000000 -0400
-@@ -14,7 +14,7 @@
- # ao=oss		# To specify default audio driver (see -ao help for
- 			# list)
- 
--fs=yes			# Enlarges movie window to your desktop's size.
-+# fs=yes		# Enlarges movie window to your desktop's size.
- 			# Used by drivers: all
- 
- # vm=no			# Tries to change to a different videomode
-@@ -124,7 +124,3 @@ cache		= 8192	# use 8Mb input cache by d
- ## You can also include other configfiles
- ## Specify full path!
- ##
--## Delete this default :)
--##
--
--include = /home/gabucino/.mplayer/i_did_not_RTFM_carefully_enough...
diff --git a/x11/mplayer/patches/patch-libavcodec_Makefile b/x11/mplayer/patches/patch-libavcodec_Makefile
deleted file mode 100644
index 3ac64801c1e..00000000000
--- a/x11/mplayer/patches/patch-libavcodec_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libavcodec_Makefile,v 1.4 2003/02/16 07:25:18 brad Exp $
---- libavcodec/Makefile.orig	Sat Feb  1 15:57:37 2003
-+++ libavcodec/Makefile	Thu Feb 13 16:58:25 2003
-@@ -117,7 +117,7 @@ $(LIB): $(OBJS)
- 	rm -f $@
- 	$(AR) rc $@ $(OBJS)
- ifneq ($(CONFIG_OS2),yes)
--	$(RANLIB) $@
-+#	$(RANLIB) $@
- endif
- 
- $(SLIB): $(OBJS)
diff --git a/x11/mplayer/patches/patch-libavcodec_common_h b/x11/mplayer/patches/patch-libavcodec_common_h
deleted file mode 100644
index ee476c2725c..00000000000
--- a/x11/mplayer/patches/patch-libavcodec_common_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libavcodec_common_h,v 1.2 2003/09/25 20:59:01 sturm Exp $
---- libavcodec/common.h.orig	2003-01-28 15:37:44.000000000 +0100
-+++ libavcodec/common.h	2003-08-24 10:47:19.000000000 +0200
-@@ -158,7 +158,7 @@ typedef signed long long INT64;
- #    include "bswap.h"
- 
- #    if defined(__MINGW32__) || defined(__CYGWIN__) || \
--        defined(__OS2__) || defined (__OpenBSD__)
-+        defined(__OS2__) || (defined (__OpenBSD__) && ! defined (__ELF__))
- #        define MANGLE(a) "_" #a
- #    else
- #        define MANGLE(a) #a
diff --git a/x11/mplayer/patches/patch-libmenu_menu_console_c b/x11/mplayer/patches/patch-libmenu_menu_console_c
deleted file mode 100644
index 82dee70fb81..00000000000
--- a/x11/mplayer/patches/patch-libmenu_menu_console_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmenu_menu_console_c,v 1.1 2003/03/02 21:22:22 pvalchev Exp $
---- libmenu/menu_console.c.orig	Sun Mar  2 12:27:10 2003
-+++ libmenu/menu_console.c	Sun Mar  2 12:27:22 2003
-@@ -301,7 +301,7 @@ static int run_shell_cmd(menu_t* menu, c
-     dup2(in[0],0);
-     dup2(out[1],1);
-     dup2(err[1],2);
--    execl("/bin/sh","sh","-c",cmd,NULL);
-+    execl("/bin/sh","sh","-c",cmd,(void *)NULL);
-     fprintf(errf,"exec failed : %s\n",strerror(errno));
-     exit(1);
-   }
diff --git a/x11/mplayer/patches/patch-libmpdemux_stream_c b/x11/mplayer/patches/patch-libmpdemux_stream_c
deleted file mode 100644
index c928e1c4414..00000000000
--- a/x11/mplayer/patches/patch-libmpdemux_stream_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-libmpdemux_stream_c,v 1.6 2003/02/16 07:25:18 brad Exp $
---- libmpdemux/stream.c.orig	Sun Jan 12 21:16:28 2003
-+++ libmpdemux/stream.c	Mon Jan 20 00:35:46 2003
-@@ -24,7 +24,7 @@ extern int verbose; // defined in mplaye
- 
- #ifdef HAVE_VCD
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
- #include "vcd_read_fbsd.h" 
- #elif defined(__NetBSD__)
- #include "vcd_read_nbsd.h" 
diff --git a/x11/mplayer/patches/patch-libmpdemux_stream_vcd_c b/x11/mplayer/patches/patch-libmpdemux_stream_vcd_c
new file mode 100644
index 00000000000..89c477a2d64
--- /dev/null
+++ b/x11/mplayer/patches/patch-libmpdemux_stream_vcd_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-libmpdemux_stream_vcd_c,v 1.1 2003/11/02 23:30:27 brad Exp $
+--- libmpdemux/stream_vcd.c.orig	2003-09-02 22:07:48.000000000 +0200
++++ libmpdemux/stream_vcd.c	2003-09-02 22:09:21.000000000 +0200
+@@ -17,7 +17,7 @@
+ #ifdef __FreeBSD__
+ #include <sys/cdrio.h>
+ #include "vcd_read_fbsd.h" 
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined (__OpenBSD__)
+ #include "vcd_read_nbsd.h" 
+ #else
+ #include "vcd_read.h"
diff --git a/x11/mplayer/patches/patch-libmpdemux_vcd_read_fbsd_h b/x11/mplayer/patches/patch-libmpdemux_vcd_read_fbsd_h
deleted file mode 100644
index 91017a31482..00000000000
--- a/x11/mplayer/patches/patch-libmpdemux_vcd_read_fbsd_h
+++ /dev/null
@@ -1,145 +0,0 @@
-$OpenBSD: patch-libmpdemux_vcd_read_fbsd_h,v 1.1 2002/06/07 23:58:14 espie Exp $
---- libmpdemux/vcd_read_fbsd.h.orig	Sat May 18 14:49:21 2002
-+++ libmpdemux/vcd_read_fbsd.h	Sat May 18 15:15:07 2002
-@@ -1,5 +1,7 @@
- #include <sys/cdio.h>
-+#if defined(__FreeBSD__)
- #include <sys/cdrio.h>
-+#endif
- 
- //=================== VideoCD ==========================
- #define	CDROM_LEADOUT	0xAA
-@@ -13,22 +15,30 @@ typedef struct {
- } cdsector_t;
- 
- static cdsector_t vcd_buf;
-+#if defined(__FreeBSD__)
- static struct ioc_read_toc_single_entry vcd_entry;
-+#define MSF(a)	((a).entry.addr.msf)
-+#endif
-+#if defined(__OpenBSD__)
-+static struct cd_toc_entry vcd_entry;
-+#define MSF(a) ((a).addr.msf)
-+#endif
- 
- static inline void vcd_set_msf(unsigned int sect){
--  vcd_entry.entry.addr.msf.frame=sect%75;
-+  MSF(vcd_entry).frame=sect%75;
-   sect=sect/75;
--  vcd_entry.entry.addr.msf.second=sect%60;
-+  MSF(vcd_entry).second=sect%60;
-   sect=sect/60;
--  vcd_entry.entry.addr.msf.minute=sect;
-+  MSF(vcd_entry).minute=sect;
- }
- 
- static inline unsigned int vcd_get_msf(){
--  return vcd_entry.entry.addr.msf.frame +
--        (vcd_entry.entry.addr.msf.second+
--         vcd_entry.entry.addr.msf.minute*60)*75;
-+  return MSF(vcd_entry).frame +
-+        (MSF(vcd_entry).second+
-+         MSF(vcd_entry).minute*60)*75;
- }
- 
-+#if defined(__FreeBSD__)
- int vcd_seek_to_track(int fd,int track){
-   vcd_entry.address_format = CD_MSF_FORMAT;
-   vcd_entry.track  = track;
-@@ -38,20 +48,32 @@ int vcd_seek_to_track(int fd,int track){
-   }
-   return VCD_SECTOR_DATA*vcd_get_msf();
- }
-+#endif
-+#if defined(__OpenBSD__)
-+int vcd_seek_to_track(int fd,int track)
-+{
-+	struct ioc_read_toc_entry t;
-+	t.data = &vcd_entry;
-+	t.address_format = CD_MSF_FORMAT;
-+	t.starting_track = track;
-+	t.data_len = sizeof(vcd_entry);
-+	if (ioctl(fd, CDIOREADTOCENTRYS, &t) == -1) {
-+		perror("ioctl dif1");
-+		return -1;
-+	}
-+	return VCD_SECTOR_DATA*vcd_get_msf();
-+}
-+#endif
- 
- int vcd_get_track_end(int fd,int track){
-   struct ioc_toc_header tochdr;
-   if (ioctl(fd,CDIOREADTOCHEADER,&tochdr)==-1)
-     { perror("read CDROM toc header: "); return -1; }
--  vcd_entry.address_format = CD_MSF_FORMAT;
--  vcd_entry.track  = track<tochdr.ending_track?(track+1):CDROM_LEADOUT;
--  if (ioctl(fd, CDIOREADTOCENTRY, &vcd_entry)) {
--    perror("ioctl dif2");
--    return -1;
--  }
--  return VCD_SECTOR_DATA*vcd_get_msf();
-+  return vcd_seek_to_track(fd, 
-+  	track<tochdr.ending_track?(track+1):CDROM_LEADOUT);
- }
- 
-+#if defined(__FreeBSD__)
- void vcd_read_toc(int fd){
-   struct ioc_toc_header tochdr;
-   int i;
-@@ -77,19 +99,49 @@ void vcd_read_toc(int fd){
-       );
-     }
- }
-+#endif
-+
-+#if defined(__OpenBSD__)
-+void vcd_read_toc(int fd){
-+  struct ioc_toc_header tochdr;
-+  struct cd_toc_entry e;
-+  int i;
-+  if (ioctl(fd,CDIOREADTOCHEADER,&tochdr)==-1)
-+    { perror("read CDROM toc header: "); return; }
-+  for (i=tochdr.starting_track ; i<=tochdr.ending_track ; i++){
-+    	struct ioc_read_toc_entry t;
-+	t.data = &e;
-+	t.data_len = sizeof(e);
-+	t.starting_track = i;
-+	t.address_format = CD_MSF_FORMAT;
-+      if (ioctl(fd,CDIOREADTOCENTRYS,&t)==-1)
-+	{ perror("read CDROM toc entry: "); return; }
-+        
-+      printf("track %02d:  adr=%d  ctrl=%d  %02d:%02d:%02d\n",
-+          (int)e.track,
-+          (int)e.addr_type,
-+          (int)e.control,
-+          (int)e.addr.msf.minute,
-+          (int)e.addr.msf.second,
-+          (int)e.addr.msf.frame
-+      );
-+    }
-+}
-+#endif
- 
- static int vcd_read(int fd,char *mem){
- 
-       if (pread(fd,&vcd_buf,VCD_SECTOR_SIZE,vcd_get_msf()*VCD_SECTOR_SIZE)
- 	 != VCD_SECTOR_SIZE) return 0;  // EOF?
- 
--      vcd_entry.entry.addr.msf.frame++;
--      if (vcd_entry.entry.addr.msf.frame==75){
--        vcd_entry.entry.addr.msf.frame=0;
--        vcd_entry.entry.addr.msf.second++;
--        if (vcd_entry.entry.addr.msf.second==60){
--          vcd_entry.entry.addr.msf.second=0;
--          vcd_entry.entry.addr.msf.minute++;
-+      MSF(vcd_entry).frame++;
-+
-+      if (MSF(vcd_entry).frame==75){
-+        MSF(vcd_entry).frame=0;
-+        MSF(vcd_entry).second++;
-+        if (MSF(vcd_entry).second==60){
-+          MSF(vcd_entry).second=0;
-+          MSF(vcd_entry).minute++;
-         }
-       }
-       memcpy(mem,vcd_buf.data,VCD_SECTOR_DATA);
diff --git a/x11/mplayer/patches/patch-libmpdemux_vcd_read_nbsd_h b/x11/mplayer/patches/patch-libmpdemux_vcd_read_nbsd_h
new file mode 100644
index 00000000000..3c2453e8fc6
--- /dev/null
+++ b/x11/mplayer/patches/patch-libmpdemux_vcd_read_nbsd_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-libmpdemux_vcd_read_nbsd_h,v 1.3 2003/11/02 23:30:27 brad Exp $
+--- libmpdemux/vcd_read_nbsd.h.orig	2003-04-09 03:33:59.000000000 -0400
++++ libmpdemux/vcd_read_nbsd.h	2003-10-28 18:03:39.000000000 -0500
+@@ -1,6 +1,8 @@
+ 
+ #include <sys/types.h>
++#ifdef __NetBSD__
+ #include <sys/inttypes.h>
++#endif
+ #include <sys/cdio.h>
+ #include <sys/scsiio.h>
+ 
diff --git a/x11/mplayer/patches/patch-mangle_h b/x11/mplayer/patches/patch-mangle_h
index 7e4fbdd509b..73b7a717135 100644
--- a/x11/mplayer/patches/patch-mangle_h
+++ b/x11/mplayer/patches/patch-mangle_h
@@ -1,8 +1,8 @@
-$OpenBSD: patch-mangle_h,v 1.1 2002/12/22 14:19:47 espie Exp $
---- mangle.h.orig	Sun Dec  8 21:13:38 2002
-+++ mangle.h	Sun Dec  8 21:13:51 2002
+$OpenBSD: patch-mangle_h,v 1.2 2003/11/02 23:30:27 brad Exp $
+--- mangle.h.orig	2003-03-30 15:11:05.000000000 -0500
++++ mangle.h	2003-10-26 19:53:32.000000000 -0500
 @@ -11,8 +11,10 @@
- #if defined(__CYGWIN__) || defined(__OS2__) || \
+ #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \
     (defined(__OpenBSD__) && !defined(__ELF__))
  #define MANGLE(a) "_" #a
 +#define MANGLEA(a) _ ## a
diff --git a/x11/mplayer/patches/patch-mp3lib_Makefile b/x11/mplayer/patches/patch-mp3lib_Makefile
index bb0b509fd2b..655996450bf 100644
--- a/x11/mplayer/patches/patch-mp3lib_Makefile
+++ b/x11/mplayer/patches/patch-mp3lib_Makefile
@@ -1,8 +1,8 @@
-$OpenBSD: patch-mp3lib_Makefile,v 1.5 2003/02/16 07:25:18 brad Exp $
---- mp3lib/Makefile.orig	Mon Jan 27 16:47:25 2003
-+++ mp3lib/Makefile	Thu Feb 13 16:58:25 2003
-@@ -54,9 +54,6 @@ libMP3.a:	$(OBJS)
- ifeq ($(TARGET_OS),CYGWIN)
+$OpenBSD: patch-mp3lib_Makefile,v 1.6 2003/11/02 23:30:27 brad Exp $
+--- mp3lib/Makefile.orig	2003-06-21 23:32:16.000000000 -0400
++++ mp3lib/Makefile	2003-10-26 19:53:32.000000000 -0500
+@@ -57,9 +57,6 @@ endif
+ ifeq ($(TARGET_MINGW32),yes)
  	./mp3lib_objfix.sh
  endif
 -ifeq ($(TARGET_OS),OpenBSD)
diff --git a/x11/mplayer/patches/patch-mp3lib_dct36_3dnow_S b/x11/mplayer/patches/patch-mp3lib_dct36_3dnow_S
deleted file mode 100644
index 0c0d0c98e66..00000000000
--- a/x11/mplayer/patches/patch-mp3lib_dct36_3dnow_S
+++ /dev/null
@@ -1,505 +0,0 @@
-$OpenBSD: patch-mp3lib_dct36_3dnow_S,v 1.1 2002/12/22 14:19:47 espie Exp $
---- mp3lib/dct36_3dnow.S.orig	Fri Nov 15 10:29:28 2002
-+++ mp3lib/dct36_3dnow.S	Fri Nov 15 10:32:57 2002
-@@ -0,0 +1,501 @@
-+//
-+// dct36_3dnow.s - 3DNow! optimized dct36()
-+//
-+// This code based 'dct36_3dnow.s' by Syuuhei Kashiyama
-+// <squash@mb.kcom.ne.jp>,only two types of changes have been made:
-+//
-+// - remove PREFETCH instruction for speedup
-+// - change function name for support 3DNow! automatic detect
-+//
-+// You can find Kashiyama's original 3dnow! support patch
-+// (for mpg123-0.59o) at
-+// http://user.ecc.u-tokyo.ac.jp/~g810370/linux-simd/ (Japanese).
-+//
-+// by KIMURA Takuhiro <kim@hannah.ipc.miyakyo-u.ac.jp> - until 31.Mar.1999
-+//                    <kim@comtec.co.jp>               - after  1.Apr.1999
-+//
-+	
-+///
-+/// Replacement of dct36() with AMD's 3DNow! SIMD operations support
-+/// 
-+/// Syuuhei Kashiyama <squash@mb.kcom.ne.jp>
-+/// 
-+/// The author of this program disclaim whole expressed or implied
-+/// warranties with regard to this program, and in no event shall the
-+/// author of this program liable to whatever resulted from the use of
-+/// this program. Use it at your own risk.
-+/// 
-+
-+#include "../mangle.h"
-+
-+	.globl MANGLEA(dct36_3dnow)
-+	.type	 MANGLEA(dct36_3dnow),@function
-+MANGLEA(dct36_3dnow):
-+	pushl %ebp
-+	movl %esp,%ebp
-+	subl $120,%esp
-+	pushl %esi
-+	pushl %ebx
-+	movl 8(%ebp),%eax
-+	movl 12(%ebp),%esi
-+	movl 16(%ebp),%ecx
-+	movl 20(%ebp),%edx
-+	movl 24(%ebp),%ebx
-+	leal -128(%ebp),%esp
-+
-+	femms
-+	movq (%eax),%mm0
-+	movq 4(%eax),%mm1
-+	pfadd %mm1,%mm0
-+	movq %mm0,4(%eax)
-+	psrlq $32,%mm1
-+	movq 12(%eax),%mm2
-+	punpckldq %mm2,%mm1
-+	pfadd %mm2,%mm1
-+	movq %mm1,12(%eax)
-+	psrlq $32,%mm2
-+	movq 20(%eax),%mm3
-+	punpckldq %mm3,%mm2
-+	pfadd %mm3,%mm2
-+	movq %mm2,20(%eax)
-+	psrlq $32,%mm3
-+	movq 28(%eax),%mm4
-+	punpckldq %mm4,%mm3
-+	pfadd %mm4,%mm3
-+	movq %mm3,28(%eax)
-+	psrlq $32,%mm4
-+	movq 36(%eax),%mm5
-+	punpckldq %mm5,%mm4
-+	pfadd %mm5,%mm4
-+	movq %mm4,36(%eax)
-+	psrlq $32,%mm5
-+	movq 44(%eax),%mm6
-+	punpckldq %mm6,%mm5
-+	pfadd %mm6,%mm5
-+	movq %mm5,44(%eax)
-+	psrlq $32,%mm6
-+	movq 52(%eax),%mm7
-+	punpckldq %mm7,%mm6
-+	pfadd %mm7,%mm6
-+	movq %mm6,52(%eax)
-+	psrlq $32,%mm7
-+	movq 60(%eax),%mm0
-+	punpckldq %mm0,%mm7
-+	pfadd %mm0,%mm7
-+	movq %mm7,60(%eax)
-+	psrlq $32,%mm0
-+	movd 68(%eax),%mm1
-+	pfadd %mm1,%mm0
-+	movd %mm0,68(%eax)
-+	movd 4(%eax),%mm0
-+	movd 12(%eax),%mm1
-+	punpckldq %mm1,%mm0
-+	punpckldq 20(%eax),%mm1
-+	pfadd %mm1,%mm0
-+	movd %mm0,12(%eax)
-+	psrlq $32,%mm0
-+	movd %mm0,20(%eax)
-+	psrlq $32,%mm1
-+	movd 28(%eax),%mm2
-+	punpckldq %mm2,%mm1
-+	punpckldq 36(%eax),%mm2
-+	pfadd %mm2,%mm1
-+	movd %mm1,28(%eax)
-+	psrlq $32,%mm1
-+	movd %mm1,36(%eax)
-+	psrlq $32,%mm2
-+	movd 44(%eax),%mm3
-+	punpckldq %mm3,%mm2
-+	punpckldq 52(%eax),%mm3
-+	pfadd %mm3,%mm2
-+	movd %mm2,44(%eax)
-+	psrlq $32,%mm2
-+	movd %mm2,52(%eax)
-+	psrlq $32,%mm3
-+	movd 60(%eax),%mm4
-+	punpckldq %mm4,%mm3
-+	punpckldq 68(%eax),%mm4
-+	pfadd %mm4,%mm3
-+	movd %mm3,60(%eax)
-+	psrlq $32,%mm3
-+	movd %mm3,68(%eax)
-+
-+	movq 24(%eax),%mm0
-+	movq 48(%eax),%mm1
-+	movd MANGLEA(COS9)+12,%mm2
-+	punpckldq %mm2,%mm2
-+	movd MANGLEA(COS9)+24,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm2,%mm0
-+	pfmul %mm3,%mm1
-+	pushl %eax
-+	movl $1,%eax
-+	movd %eax,%mm7
-+	pi2fd %mm7,%mm7
-+	popl %eax
-+	movq 8(%eax),%mm2
-+	movd MANGLEA(COS9)+4,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm3,%mm2
-+	pfadd %mm0,%mm2
-+	movq 40(%eax),%mm3
-+	movd MANGLEA(COS9)+20,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfadd %mm3,%mm2
-+	movq 56(%eax),%mm3
-+	movd MANGLEA(COS9)+28,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfadd %mm3,%mm2
-+	movq (%eax),%mm3
-+	movq 16(%eax),%mm4
-+	movd MANGLEA(COS9)+8,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	movq 32(%eax),%mm4
-+	movd MANGLEA(COS9)+16,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	pfadd %mm1,%mm3
-+	movq 64(%eax),%mm4
-+	movd MANGLEA(COS9)+32,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	movq %mm2,%mm4
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+0,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 108(%edx),%mm6
-+	punpckldq 104(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,36(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,32(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 32(%edx),%mm6
-+	punpckldq 36(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 32(%esi),%mm6
-+	punpckldq 36(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,1024(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1152(%ebx)
-+	movq %mm3,%mm4
-+	pfsub %mm2,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+32,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 140(%edx),%mm6
-+	punpckldq 72(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,68(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,0(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 0(%edx),%mm6
-+	punpckldq 68(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 0(%esi),%mm6
-+	punpckldq 68(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,0(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,2176(%ebx)
-+	movq 8(%eax),%mm2
-+	movq 40(%eax),%mm3
-+	pfsub %mm3,%mm2
-+	movq 56(%eax),%mm3
-+	pfsub %mm3,%mm2
-+	movd MANGLEA(COS9)+12,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm3,%mm2
-+	movq 16(%eax),%mm3
-+	movq 32(%eax),%mm4
-+	pfsub %mm4,%mm3
-+	movq 64(%eax),%mm4
-+	pfsub %mm4,%mm3
-+	movd MANGLEA(COS9)+24,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	movq 48(%eax),%mm4
-+	pfsub %mm4,%mm3
-+	movq (%eax),%mm4
-+	pfadd %mm4,%mm3
-+	movq %mm2,%mm4
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+4,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 112(%edx),%mm6
-+	punpckldq 100(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,40(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,28(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 28(%edx),%mm6
-+	punpckldq 40(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 28(%esi),%mm6
-+	punpckldq 40(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,896(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1280(%ebx)
-+	movq %mm3,%mm4
-+	pfsub %mm2,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+28,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 136(%edx),%mm6
-+	punpckldq 76(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,64(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,4(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 4(%edx),%mm6
-+	punpckldq 64(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 4(%esi),%mm6
-+	punpckldq 64(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,128(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,2048(%ebx)
-+
-+	movq 8(%eax),%mm2
-+	movd MANGLEA(COS9)+20,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm3,%mm2
-+	pfsub %mm0,%mm2
-+	movq 40(%eax),%mm3
-+	movd MANGLEA(COS9)+28,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfsub %mm3,%mm2
-+	movq 56(%eax),%mm3
-+	movd MANGLEA(COS9)+4,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfadd %mm3,%mm2
-+	movq (%eax),%mm3
-+	movq 16(%eax),%mm4
-+	movd MANGLEA(COS9)+32,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfsub %mm4,%mm3
-+	movq 32(%eax),%mm4
-+	movd MANGLEA(COS9)+8,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfsub %mm4,%mm3
-+	pfadd %mm1,%mm3
-+	movq 64(%eax),%mm4
-+	movd MANGLEA(COS9)+16,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	movq %mm2,%mm4
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+8,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 116(%edx),%mm6
-+	punpckldq 96(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,44(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,24(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 24(%edx),%mm6
-+	punpckldq 44(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 24(%esi),%mm6
-+	punpckldq 44(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,768(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1408(%ebx)
-+	movq %mm3,%mm4
-+	pfsub %mm2,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+24,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 132(%edx),%mm6
-+	punpckldq 80(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,60(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,8(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 8(%edx),%mm6
-+	punpckldq 60(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 8(%esi),%mm6
-+	punpckldq 60(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,256(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1920(%ebx)
-+	movq 8(%eax),%mm2
-+	movd MANGLEA(COS9)+28,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm3,%mm2
-+	pfsub %mm0,%mm2
-+	movq 40(%eax),%mm3
-+	movd MANGLEA(COS9)+4,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfadd %mm3,%mm2
-+	movq 56(%eax),%mm3
-+	movd MANGLEA(COS9)+20,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfsub %mm3,%mm2
-+	movq (%eax),%mm3
-+	movq 16(%eax),%mm4
-+	movd MANGLEA(COS9)+16,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfsub %mm4,%mm3
-+	movq 32(%eax),%mm4
-+	movd MANGLEA(COS9)+32,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	pfadd %mm1,%mm3
-+	movq 64(%eax),%mm4
-+	movd MANGLEA(COS9)+8,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfsub %mm4,%mm3
-+	movq %mm2,%mm4
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+12,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 120(%edx),%mm6
-+	punpckldq 92(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,48(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,20(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 20(%edx),%mm6
-+	punpckldq 48(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 20(%esi),%mm6
-+	punpckldq 48(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,640(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1536(%ebx)
-+	movq %mm3,%mm4
-+	pfsub %mm2,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+20,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 128(%edx),%mm6
-+	punpckldq 84(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,56(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,12(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 12(%edx),%mm6
-+	punpckldq 56(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 12(%esi),%mm6
-+	punpckldq 56(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,384(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1792(%ebx)
-+
-+	movq (%eax),%mm4
-+	movq 16(%eax),%mm3
-+	pfsub %mm3,%mm4
-+	movq 32(%eax),%mm3
-+	pfadd %mm3,%mm4
-+	movq 48(%eax),%mm3
-+	pfsub %mm3,%mm4
-+	movq 64(%eax),%mm3
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+16,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 124(%edx),%mm6
-+	punpckldq 88(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,52(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,16(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 16(%edx),%mm6
-+	punpckldq 52(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 16(%esi),%mm6
-+	punpckldq 52(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,512(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1664(%ebx)
-+
-+	femms
-+	popl %ebx
-+	popl %esi
-+	movl %ebp,%esp
-+	popl %ebp
-+	ret
diff --git a/x11/mplayer/patches/patch-mp3lib_dct36_k7_S b/x11/mplayer/patches/patch-mp3lib_dct36_k7_S
deleted file mode 100644
index 47457cc8e02..00000000000
--- a/x11/mplayer/patches/patch-mp3lib_dct36_k7_S
+++ /dev/null
@@ -1,515 +0,0 @@
-$OpenBSD: patch-mp3lib_dct36_k7_S,v 1.1 2002/12/22 14:19:47 espie Exp $
---- mp3lib/dct36_k7.S.orig	Fri Nov 15 10:33:37 2002
-+++ mp3lib/dct36_k7.S	Fri Nov 15 10:48:20 2002
-@@ -0,0 +1,511 @@
-+///
-+/// Replacement of dct36() with AMD's 3DNowEx(DSP)! SIMD operations support
-+///
-+/// This code based 'dct36_3dnow.s' by Syuuhei Kashiyama
-+/// <squash@mb.kcom.ne.jp>,only some types of changes have been made:
-+///
-+///  - added new opcode PSWAPD
-+///  - change function name for support 3DNowEx! automatic detect
-+///
-+/// note: because K7 processors are an aggresive out-of-order three-way
-+///       superscalar ones instruction order is not significand for them.
-+///
-+/// Modified by Nick Kurshev <nickols_k@mail.ru>
-+///
-+//
-+// dct36_3dnow.s - 3DNow! optimized dct36()
-+//
-+// This code based 'dct36_3dnow.s' by Syuuhei Kashiyama
-+// <squash@mb.kcom.ne.jp>,only two types of changes have been made:
-+//
-+// - remove PREFETCH instruction for speedup
-+// - change function name for support 3DNow! automatic detect
-+//
-+// You can find Kashiyama's original 3dnow! support patch
-+// (for mpg123-0.59o) at
-+// http://user.ecc.u-tokyo.ac.jp/~g810370/linux-simd/ (Japanese).
-+//
-+// by KIMURA Takuhiro <kim@hannah.ipc.miyakyo-u.ac.jp> - until 31.Mar.1999
-+//                    <kim@comtec.co.jp>               - after  1.Apr.1999
-+//
-+	
-+///
-+/// Replacement of dct36() with AMD's 3DNow! SIMD operations support
-+/// 
-+/// Syuuhei Kashiyama <squash@mb.kcom.ne.jp>
-+/// 
-+/// The author of this program disclaim whole expressed or implied
-+/// warranties with regard to this program, and in no event shall the
-+/// author of this program liable to whatever resulted from the use of
-+/// this program. Use it at your own risk.
-+/// 
-+#include "../mangle.h"
-+	.globl MANGLEA(dct36_3dnowex)
-+	.type	 MANGLEA(dct36_3dnowex),@function
-+MANGLEA(dct36_3dnowex):
-+	pushl %ebp
-+	movl %esp,%ebp
-+	subl $120,%esp
-+	pushl %esi
-+	pushl %ebx
-+	movl 8(%ebp),%eax
-+	movl 12(%ebp),%esi
-+	movl 16(%ebp),%ecx
-+	movl 20(%ebp),%edx
-+	movl 24(%ebp),%ebx
-+	leal -128(%ebp),%esp
-+
-+	femms
-+	movq (%eax),%mm0
-+	movq 4(%eax),%mm1
-+	pfadd %mm1,%mm0
-+	movq %mm0,4(%eax)
-+	psrlq $32,%mm1
-+	movq 12(%eax),%mm2
-+	punpckldq %mm2,%mm1
-+	pfadd %mm2,%mm1
-+	movq %mm1,12(%eax)
-+	psrlq $32,%mm2
-+	movq 20(%eax),%mm3
-+	punpckldq %mm3,%mm2
-+	pfadd %mm3,%mm2
-+	movq %mm2,20(%eax)
-+	psrlq $32,%mm3
-+	movq 28(%eax),%mm4
-+	punpckldq %mm4,%mm3
-+	pfadd %mm4,%mm3
-+	movq %mm3,28(%eax)
-+	psrlq $32,%mm4
-+	movq 36(%eax),%mm5
-+	punpckldq %mm5,%mm4
-+	pfadd %mm5,%mm4
-+	movq %mm4,36(%eax)
-+	psrlq $32,%mm5
-+	movq 44(%eax),%mm6
-+	punpckldq %mm6,%mm5
-+	pfadd %mm6,%mm5
-+	movq %mm5,44(%eax)
-+	psrlq $32,%mm6
-+	movq 52(%eax),%mm7
-+	punpckldq %mm7,%mm6
-+	pfadd %mm7,%mm6
-+	movq %mm6,52(%eax)
-+	psrlq $32,%mm7
-+	movq 60(%eax),%mm0
-+	punpckldq %mm0,%mm7
-+	pfadd %mm0,%mm7
-+	movq %mm7,60(%eax)
-+	psrlq $32,%mm0
-+	movd 68(%eax),%mm1
-+	pfadd %mm1,%mm0
-+	movd %mm0,68(%eax)
-+	movd 4(%eax),%mm0
-+	movd 12(%eax),%mm1
-+	punpckldq %mm1,%mm0
-+	punpckldq 20(%eax),%mm1
-+	pfadd %mm1,%mm0
-+	movd %mm0,12(%eax)
-+	psrlq $32,%mm0
-+	movd %mm0,20(%eax)
-+	psrlq $32,%mm1
-+	movd 28(%eax),%mm2
-+	punpckldq %mm2,%mm1
-+	punpckldq 36(%eax),%mm2
-+	pfadd %mm2,%mm1
-+	movd %mm1,28(%eax)
-+	psrlq $32,%mm1
-+	movd %mm1,36(%eax)
-+	psrlq $32,%mm2
-+	movd 44(%eax),%mm3
-+	punpckldq %mm3,%mm2
-+	punpckldq 52(%eax),%mm3
-+	pfadd %mm3,%mm2
-+	movd %mm2,44(%eax)
-+	psrlq $32,%mm2
-+	movd %mm2,52(%eax)
-+	psrlq $32,%mm3
-+	movd 60(%eax),%mm4
-+	punpckldq %mm4,%mm3
-+	punpckldq 68(%eax),%mm4
-+	pfadd %mm4,%mm3
-+	movd %mm3,60(%eax)
-+	psrlq $32,%mm3
-+	movd %mm3,68(%eax)
-+	movq 24(%eax),%mm0
-+	movq 48(%eax),%mm1
-+	movd MANGLEA(COS9)+12,%mm2
-+	punpckldq %mm2,%mm2
-+	movd MANGLEA(COS9)+24,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm2,%mm0
-+	pfmul %mm3,%mm1
-+	pushl %eax
-+	movl $1,%eax
-+	movd %eax,%mm7
-+	pi2fd %mm7,%mm7
-+	popl %eax
-+	movq 8(%eax),%mm2
-+	movd MANGLEA(COS9)+4,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm3,%mm2
-+	pfadd %mm0,%mm2
-+	movq 40(%eax),%mm3
-+	movd MANGLEA(COS9)+20,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfadd %mm3,%mm2
-+	movq 56(%eax),%mm3
-+	movd MANGLEA(COS9)+28,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfadd %mm3,%mm2
-+	movq (%eax),%mm3
-+	movq 16(%eax),%mm4
-+	movd MANGLEA(COS9)+8,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	movq 32(%eax),%mm4
-+	movd MANGLEA(COS9)+16,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	pfadd %mm1,%mm3
-+	movq 64(%eax),%mm4
-+	movd MANGLEA(COS9)+32,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	movq %mm2,%mm4
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+0,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 108(%edx),%mm6
-+	punpckldq 104(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	pswapd %mm5, %mm5
-+        movq   %mm5, 32(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 32(%edx),%mm6
-+	punpckldq 36(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 32(%esi),%mm6
-+	punpckldq 36(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,1024(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1152(%ebx)
-+	movq %mm3,%mm4
-+	pfsub %mm2,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+32,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 140(%edx),%mm6
-+	punpckldq 72(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,68(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,0(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 0(%edx),%mm6
-+	punpckldq 68(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 0(%esi),%mm6
-+	punpckldq 68(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,0(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,2176(%ebx)
-+	movq 8(%eax),%mm2
-+	movq 40(%eax),%mm3
-+	pfsub %mm3,%mm2
-+	movq 56(%eax),%mm3
-+	pfsub %mm3,%mm2
-+	movd MANGLEA(COS9)+12,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm3,%mm2
-+	movq 16(%eax),%mm3
-+	movq 32(%eax),%mm4
-+	pfsub %mm4,%mm3
-+	movq 64(%eax),%mm4
-+	pfsub %mm4,%mm3
-+	movd MANGLEA(COS9)+24,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	movq 48(%eax),%mm4
-+	pfsub %mm4,%mm3
-+	movq (%eax),%mm4
-+	pfadd %mm4,%mm3
-+	movq %mm2,%mm4
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+4,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 112(%edx),%mm6
-+	punpckldq 100(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,40(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,28(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 28(%edx),%mm6
-+	punpckldq 40(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 28(%esi),%mm6
-+	punpckldq 40(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,896(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1280(%ebx)
-+	movq %mm3,%mm4
-+	pfsub %mm2,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+28,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 136(%edx),%mm6
-+	punpckldq 76(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,64(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,4(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 4(%edx),%mm6
-+	punpckldq 64(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 4(%esi),%mm6
-+	punpckldq 64(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,128(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,2048(%ebx)
-+
-+	movq 8(%eax),%mm2
-+	movd MANGLEA(COS9)+20,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm3,%mm2
-+	pfsub %mm0,%mm2
-+	movq 40(%eax),%mm3
-+	movd MANGLEA(COS9)+28,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfsub %mm3,%mm2
-+	movq 56(%eax),%mm3
-+	movd MANGLEA(COS9)+4,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfadd %mm3,%mm2
-+	movq (%eax),%mm3
-+	movq 16(%eax),%mm4
-+	movd MANGLEA(COS9)+32,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfsub %mm4,%mm3
-+	movq 32(%eax),%mm4
-+	movd MANGLEA(COS9)+8,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfsub %mm4,%mm3
-+	pfadd %mm1,%mm3
-+	movq 64(%eax),%mm4
-+	movd MANGLEA(COS9)+16,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	movq %mm2,%mm4
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+8,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 116(%edx),%mm6
-+	punpckldq 96(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,44(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,24(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 24(%edx),%mm6
-+	punpckldq 44(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 24(%esi),%mm6
-+	punpckldq 44(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,768(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1408(%ebx)
-+	movq %mm3,%mm4
-+	pfsub %mm2,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+24,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 132(%edx),%mm6
-+	punpckldq 80(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,60(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,8(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 8(%edx),%mm6
-+	punpckldq 60(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 8(%esi),%mm6
-+	punpckldq 60(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,256(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1920(%ebx)
-+	movq 8(%eax),%mm2
-+	movd MANGLEA(COS9)+28,%mm3
-+	punpckldq %mm3,%mm3
-+	pfmul %mm3,%mm2
-+	pfsub %mm0,%mm2
-+	movq 40(%eax),%mm3
-+	movd MANGLEA(COS9)+4,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfadd %mm3,%mm2
-+	movq 56(%eax),%mm3
-+	movd MANGLEA(COS9)+20,%mm4
-+	punpckldq %mm4,%mm4
-+	pfmul %mm4,%mm3
-+	pfsub %mm3,%mm2
-+	movq (%eax),%mm3
-+	movq 16(%eax),%mm4
-+	movd MANGLEA(COS9)+16,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfsub %mm4,%mm3
-+	movq 32(%eax),%mm4
-+	movd MANGLEA(COS9)+32,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfadd %mm4,%mm3
-+	pfadd %mm1,%mm3
-+	movq 64(%eax),%mm4
-+	movd MANGLEA(COS9)+8,%mm5
-+	punpckldq %mm5,%mm5
-+	pfmul %mm5,%mm4
-+	pfsub %mm4,%mm3
-+	movq %mm2,%mm4
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+12,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 120(%edx),%mm6
-+	punpckldq 92(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,48(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,20(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 20(%edx),%mm6
-+	punpckldq 48(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 20(%esi),%mm6
-+	punpckldq 48(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,640(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1536(%ebx)
-+	movq %mm3,%mm4
-+	pfsub %mm2,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+20,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 128(%edx),%mm6
-+	punpckldq 84(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,56(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,12(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 12(%edx),%mm6
-+	punpckldq 56(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 12(%esi),%mm6
-+	punpckldq 56(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,384(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1792(%ebx)
-+
-+	movq (%eax),%mm4
-+	movq 16(%eax),%mm3
-+	pfsub %mm3,%mm4
-+	movq 32(%eax),%mm3
-+	pfadd %mm3,%mm4
-+	movq 48(%eax),%mm3
-+	pfsub %mm3,%mm4
-+	movq 64(%eax),%mm3
-+	pfadd %mm3,%mm4
-+	movq %mm7,%mm5
-+	punpckldq MANGLEA(tfcos36)+16,%mm5
-+	pfmul %mm5,%mm4
-+	movq %mm4,%mm5
-+	pfacc %mm5,%mm5
-+	movd 124(%edx),%mm6
-+	punpckldq 88(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd %mm5,52(%ecx)
-+	psrlq $32,%mm5
-+	movd %mm5,16(%ecx)
-+	movq %mm4,%mm6
-+	punpckldq %mm6,%mm5
-+	pfsub %mm6,%mm5
-+	punpckhdq %mm5,%mm5
-+	movd 16(%edx),%mm6
-+	punpckldq 52(%edx),%mm6
-+	pfmul %mm6,%mm5
-+	movd 16(%esi),%mm6
-+	punpckldq 52(%esi),%mm6
-+	pfadd %mm6,%mm5
-+	movd %mm5,512(%ebx)
-+	psrlq $32,%mm5
-+	movd %mm5,1664(%ebx)
-+
-+	femms
-+	popl %ebx
-+	popl %esi
-+	movl %ebp,%esp
-+	popl %ebp
-+	ret
diff --git a/x11/mplayer/patches/patch-vidix_drivers_Makefile b/x11/mplayer/patches/patch-vidix_drivers_Makefile
index a638c16758f..a21860cce44 100644
--- a/x11/mplayer/patches/patch-vidix_drivers_Makefile
+++ b/x11/mplayer/patches/patch-vidix_drivers_Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-vidix_drivers_Makefile,v 1.5 2003/01/03 23:06:36 brad Exp $
---- vidix/drivers/Makefile.orig	Sat Dec 21 14:06:23 2002
-+++ vidix/drivers/Makefile	Wed Dec 25 21:55:52 2002
+$OpenBSD: patch-vidix_drivers_Makefile,v 1.6 2003/11/02 23:30:27 brad Exp $
+--- vidix/drivers/Makefile.orig	2003-09-27 17:36:01.000000000 -0400
++++ vidix/drivers/Makefile	2003-10-26 19:53:32.000000000 -0500
 @@ -3,6 +3,7 @@
  include ../../config.mak
  
@@ -9,7 +9,7 @@ $OpenBSD: patch-vidix_drivers_Makefile,v 1.5 2003/01/03 23:06:36 brad Exp $
  
  CYBERBLADE_VID=cyberblade_vid.so
  CYBERBLADE_SRCS=cyberblade_vid.c
-@@ -120,7 +121,7 @@ depend:
+@@ -126,7 +127,7 @@ depend:
  
  install:
  	mkdir -p $(LIBDIR)/mplayer/vidix
diff --git a/x11/mplayer/pkg/INSTALL b/x11/mplayer/pkg/INSTALL
index 31757b6a876..f78c6f45abf 100644
--- a/x11/mplayer/pkg/INSTALL
+++ b/x11/mplayer/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2003/10/26 19:54:46 brad Exp $
+# $OpenBSD: INSTALL,v 1.2 2003/11/02 23:30:27 brad Exp $
 #
 # Pre/post-installation setup of MPlayer
 
@@ -23,10 +23,8 @@ do_notice()
 do_install()
 {
     install -d -o root -g wheel -m 755 $CONFIG_DIR
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/codecs.conf $CONFIG_DIR
     install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/input.conf $CONFIG_DIR
     install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/menu.conf $CONFIG_DIR
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/mplayer.conf $CONFIG_DIR
     echo
     echo "+---------------"
     echo "| The $1 configuration files have been installed into"
@@ -48,7 +46,7 @@ case $2 in
     POST-INSTALL)
 	if [ ! -d $CONFIG_DIR ]; then
 	    do_install $1
-	elif [ ! -f $CONFIG_DIR/mplayer.conf ]; then
+	elif [ ! -f $CONFIG_DIR/menu.conf ]; then
 	    do_install $1
 	else
 	    do_notice $1
diff --git a/x11/mplayer/pkg/PFRAG.shared b/x11/mplayer/pkg/PFRAG.shared
index 918f121d155..0d3bb0bce01 100644
--- a/x11/mplayer/pkg/PFRAG.shared
+++ b/x11/mplayer/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2002/05/09 05:19:10 pvalchev Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2003/11/02 23:30:27 brad Exp $
 lib/libdha.so.0.1
-DYNLIBDIR(%B)
+DYNLIBDIR(%D/lib)
diff --git a/x11/mplayer/pkg/PLIST b/x11/mplayer/pkg/PLIST
index 0bf37a26106..c1c51fad6ab 100644
--- a/x11/mplayer/pkg/PLIST
+++ b/x11/mplayer/pkg/PLIST
@@ -1,10 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.9 2003/10/26 19:54:46 brad Exp $
+@comment $OpenBSD: PLIST,v 1.10 2003/11/02 23:30:27 brad Exp $
 bin/mencoder
 bin/mplayer
 lib/mplayer/vidix/cyberblade_vid.so
 lib/mplayer/vidix/mach64_vid.so
 lib/mplayer/vidix/mga_crtc2_vid.so
 lib/mplayer/vidix/mga_vid.so
+lib/mplayer/vidix/nvidia_vid.so
 lib/mplayer/vidix/pm3_vid.so
 lib/mplayer/vidix/radeon_vid.so
 lib/mplayer/vidix/rage128_vid.so
@@ -13,7 +14,6 @@ man/man1/mencoder.1
 man/man1/mplayer.1
 share/doc/mplayer/bugreports.html
 share/doc/mplayer/cd-dvd.html
-share/doc/mplayer/codecs-in.html
 share/doc/mplayer/codecs.html
 share/doc/mplayer/documentation.html
 share/doc/mplayer/encoding.html
@@ -23,11 +23,11 @@ share/doc/mplayer/skin.html
 share/doc/mplayer/sound.html
 share/doc/mplayer/users_against_developers.html
 share/doc/mplayer/video.html
-!%%no_x11%%
 share/examples/mplayer/codecs.conf
 share/examples/mplayer/input.conf
 share/examples/mplayer/menu.conf
 share/examples/mplayer/mplayer.conf
+!%%no_x11%%
 @comment @exec mkdir -p %D/share/mplayer/font
 @comment @dirrm share/mplayer/font
 @comment @dirrm share/mplayer