Map mipsel/mipseb -> mips in the configure script.

2 files changed, 23 insertions, 13 deletions

diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index fd3685277c7..a18a26c9990 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.59 2009/02/02 19:20:48 drochner Exp $
+$NetBSD: distinfo,v 1.60 2009/03/06 01:33:12 jmcneill Exp $
 
 SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d
 RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52
 Size (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 9338201 bytes
-SHA1 (patch-aa) = 66237776593acde3de025d485285978e63b4996a
+SHA1 (patch-aa) = ebcbff0b8d0914aaaf89d8388bc9e04229680658
 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9
 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913
 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 856051b062b..0a51a35dbfc 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
+$NetBSD: patch-aa,v 1.23 2009/03/06 01:33:12 jmcneill Exp $
 
 --- configure.orig	2007-10-07 15:49:33.000000000 -0400
-+++ configure	2008-12-19 19:29:30.000000000 -0500
-@@ -718,7 +718,7 @@
++++ configure	2009-03-05 20:17:42.000000000 -0500
+@@ -718,7 +718,7 @@ for ac_option do
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -11,7 +11,17 @@ $NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
      ;;
  
    --with-install=*)
-@@ -1411,11 +1411,11 @@
+@@ -1238,6 +1238,9 @@ if test -z "$_target" ; then
+    powerpc) # Darwin returns 'powerpc'
+      host_arch=ppc
+      ;;
++   mipseb|mipsel) # NetBSD
++     host_arch=mips
++     ;;
+    *) # uname -p on Linux returns 'unknown' for the processor type,
+       # OpenBSD returns 'Intel Pentium/MMX ("Genuine Intel" 586-class)'
+ 
+@@ -1411,11 +1414,11 @@ if test "$_gcc_check" = yes ; then
    esac
    echores "$cc_version"
   else
@@ -25,7 +35,7 @@ $NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -1548,7 +1548,7 @@
+@@ -1548,7 +1551,7 @@ if x86 ; then
    # gather more CPU information
    pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | _head 1`
    pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | _head 1`
@@ -34,7 +44,7 @@ $NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
    pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
    pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | _head 1`
  
-@@ -3098,7 +3098,6 @@
+@@ -3098,7 +3101,6 @@ test "$_w32threads" = yes && _def_thread
  echores "$_w32threads"
  
  echocheck "rpath"
@@ -42,7 +52,7 @@ $NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
  if test "$_rpath" = yes ; then
    for I in `echo $_ld_extra | sed 's/-L//g'` ; do
      tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`"
-@@ -3884,7 +3883,11 @@
+@@ -3884,7 +3886,11 @@ EOF
    for I in "" -L/usr/X11R6/lib -L/usr/lib/X11R6 -L/usr/X11/lib \
             -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 -L/usr/lib ; do
      if netbsd; then
@@ -55,7 +65,7 @@ $NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
      else
        _ld_tmp="$I -lXext -lX11 $_ld_pthread"
      fi
-@@ -4368,7 +4371,7 @@
+@@ -4368,7 +4374,7 @@ fi
  if test "$_aa" = yes ; then
    _def_aa='#define HAVE_AA 1'
    if cygwin ; then
@@ -64,7 +74,7 @@ $NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
    fi
    _vosrc="$_vosrc vo_aa.c"
    _vomodules="aa $_vomodules"
-@@ -5100,15 +5103,15 @@
+@@ -5100,15 +5106,15 @@ fi
  echocheck "Polyp"
  if test "$_polyp" = auto ; then
    _polyp=no
@@ -85,7 +95,7 @@ $NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
  
    fi
  fi
-@@ -5118,8 +5121,8 @@
+@@ -5118,8 +5124,8 @@ if test "$_polyp" = yes ; then
    _def_polyp='#define USE_POLYP 1'
    _aosrc="$_aosrc ao_polyp.c"
    _aomodules="polyp $_aomodules"
@@ -96,7 +106,7 @@ $NetBSD: patch-aa,v 1.22 2008/12/20 00:43:47 jmcneill Exp $
  else
    _def_polyp='#undef USE_POLYP'
    _noaomodules="polyp $_noaomodules"
-@@ -6837,11 +6840,16 @@
+@@ -6837,11 +6843,16 @@ echores "$_tv_v4l1"
  echocheck "Video 4 Linux 2 TV interface"
  if test "$_tv_v4l2" = auto ; then
    _tv_v4l2=no