Fix CPU family detection on NetBSD with /proc mounted with "-o linux".

For more information see also PR kern/25076

5 files changed, 24 insertions, 14 deletions

diff --git a/multimedia/gmplayer/distinfo b/multimedia/gmplayer/distinfo
index 90f500ae3fc..63673663922 100644
--- a/multimedia/gmplayer/distinfo
+++ b/multimedia/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/03/31 13:23:27 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/04/06 18:33:10 salo Exp $
 
 SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432
 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes
@@ -42,7 +42,7 @@ SHA1 (mplayer-1.0rc3/xanim-1.5.tar.bz2) = 205a763e424bf140f682b725adf780fa5f27f4
 Size (mplayer-1.0rc3/xanim-1.5.tar.bz2) = 94535 bytes
 SHA1 (mplayer-1.0rc3/xine-lcd-1.0.tar.bz2) = 1edbf1703e64f7a7c2aa3837d3383ba60a6d2f2d
 Size (mplayer-1.0rc3/xine-lcd-1.0.tar.bz2) = 168441 bytes
-SHA1 (patch-aa) = 51722c503120b0771102a0ca48c9817271666b81
+SHA1 (patch-aa) = 3ab26e41524bee01fba4002f0f827eb5b1b390d7
 SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b
 SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index dbc8765b06a..ae0cb5bda3d 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2004/03/31 13:23:27 wiz Exp $
+$NetBSD: distinfo,v 1.4 2004/04/06 18:33:10 salo Exp $
 
 SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432
 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes
-SHA1 (patch-aa) = 51722c503120b0771102a0ca48c9817271666b81
+SHA1 (patch-aa) = 3ab26e41524bee01fba4002f0f827eb5b1b390d7
 SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b
 SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 4007275bd06..d80134b9bb0 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/01/26 12:06:41 jmmv Exp $
+$NetBSD: distinfo,v 1.2 2004/04/06 18:33:10 salo Exp $
 
 SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432
 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes
@@ -8,7 +8,8 @@ SHA1 (mplayer-1.0rc3/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f9
 Size (mplayer-1.0rc3/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
 SHA1 (mplayer-1.0rc3/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
 Size (mplayer-1.0rc3/font-arial-cp1250.tar.bz2) = 249705 bytes
-SHA1 (patch-aa) = 51722c503120b0771102a0ca48c9817271666b81
+SHA1 (patch-aa) = 3ab26e41524bee01fba4002f0f827eb5b1b390d7
 SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b
+SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b
 SHA1 (patch-ae) = 61fec8b2ace8bd507df57102ff72c98cd6b194d7
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 0e25c94f57a..c49e8271e80 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/06 18:33:10 salo Exp $
 
 --- configure.orig	2003-12-08 22:33:31.000000000 +0100
-+++ configure
-@@ -367,8 +367,8 @@ for ac_option do
++++ configure	2004-04-06 20:22:24.000000000 +0200
+@@ -367,8 +367,8 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
-@@ -431,7 +431,7 @@ if test -z "$_target" ; then
+@@ -431,7 +431,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) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $
        ppc) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
        sparc*) host_arch=sparc ;;
-@@ -499,7 +499,7 @@ if test "$_skip_cc_check" != yes ; then
+@@ -499,7 +499,7 @@
   for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
    echocheck "$_cc version"
    cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
@@ -31,7 +31,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/01/26 12:06:43 jmmv Exp $
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -819,7 +819,7 @@ EOF
+@@ -610,7 +610,7 @@
+ 
+   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`
+ 
+@@ -819,7 +819,7 @@
      _optimizing=''
      ;;
  
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 7d0b983bb96..aea4c6337fe 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2004/03/31 13:23:27 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/04/06 18:33:10 salo Exp $
 
 SHA1 (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = d3341f05518f6b331396c431f81b736b89402432
 Size (mplayer-1.0rc3/MPlayer-1.0pre3.tar.bz2) = 4714725 bytes
-SHA1 (patch-aa) = 51722c503120b0771102a0ca48c9817271666b81
+SHA1 (patch-aa) = 3ab26e41524bee01fba4002f0f827eb5b1b390d7
 SHA1 (patch-ab) = a0f80f7d44b41509d215bb9cf6c1266c836efd1b
 SHA1 (patch-ac) = 8d28e03ef054dfe8e7f62d31631727616a87d4ed
 SHA1 (patch-ad) = 95c8741263b822e20eea3da00ca64923ed91c53b