Prevent configure from finding compilers that exist outside of what

is handled by the pkgsrc wrappers.

2 files changed, 15 insertions, 10 deletions

diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index 5e231cf9457..b51aaa9a2d5 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2005/12/10 23:34:42 salo Exp $
+$NetBSD: distinfo,v 1.26 2005/12/31 01:09:56 kristerw Exp $
 
 SHA1 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = df1e8d4f2f44d72c6f7989932f3b272e815ecb80
 RMD160 (mplayer-1.0rc7/MPlayer-1.0pre7.tar.bz2) = a4bac10df287c4b134ea49b3bc9bf7fb0126cae6
@@ -12,7 +12,7 @@ Size (mplayer-1.0rc7/font-arial-iso-8859-2.tar.bz2) = 222208 bytes
 SHA1 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
 RMD160 (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = a2fc7ae07b0d80936ea58e168e1047efccb9eb91
 Size (mplayer-1.0rc7/font-arial-cp1250.tar.bz2) = 249705 bytes
-SHA1 (patch-aa) = d77cd903d735d7a88336e0aff309f8508cafed94
+SHA1 (patch-aa) = 708128dde21b8de799aa26d75335da76543e2373
 SHA1 (patch-ab) = 1a08f717e326d83b355eee26e1be9c0636b735c5
 SHA1 (patch-ac) = 3b9ae32e6e656ec4b58b7e51a1c2eaa280384f3e
 SHA1 (patch-ad) = d705dd315e913593223b83e533c60a9620d34cc8
diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa
index 12a92b614d0..fde56669c95 100644
--- a/multimedia/mplayer-share/patches/patch-aa
+++ b/multimedia/mplayer-share/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2005/07/21 14:24:48 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2005/12/31 01:09:56 kristerw Exp $
 
 --- configure.orig	2005-04-13 13:46:35.000000000 +0200
-+++ configure
-@@ -408,7 +408,7 @@ for ac_option do
++++ configure	2005-12-31 02:02:59.000000000 +0100
+@@ -408,7 +408,7 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -11,7 +11,12 @@ $NetBSD: patch-aa,v 1.12 2005/07/21 14:24:48 wiz Exp $
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
-@@ -596,7 +596,7 @@ if test "$_skip_cc_check" != yes ; then
+@@ -592,11 +592,11 @@
+   esac
+   echores "$cc_version"
+  else
+- for _cc in "$_cc" gcc gcc-3.4 gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
++ for _cc in "$_cc" gcc cc ; do
    echocheck "$_cc version"
    cc_vendor=gnu
    cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
@@ -20,7 +25,7 @@ $NetBSD: patch-aa,v 1.12 2005/07/21 14:24:48 wiz Exp $
    if test "$?" -gt 0; then
      cc_version="not found"
    fi
-@@ -743,7 +743,7 @@ case "$host_arch" in
+@@ -743,7 +743,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`
@@ -29,7 +34,7 @@ $NetBSD: patch-aa,v 1.12 2005/07/21 14:24:48 wiz 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`
  
-@@ -1797,7 +1797,8 @@ for ac_option do
+@@ -1797,7 +1797,8 @@
      _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-x11libdir=*)
@@ -39,7 +44,7 @@ $NetBSD: patch-aa,v 1.12 2005/07/21 14:24:48 wiz Exp $
      ;;
    --with-dxr2incdir=*)
      _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
-@@ -2382,7 +2383,7 @@ echores "$_posix4"
+@@ -2382,7 +2383,7 @@
  echocheck "lrintf"
  cat > $TMPC << EOF
  #include <math.h>
@@ -48,7 +53,7 @@ $NetBSD: patch-aa,v 1.12 2005/07/21 14:24:48 wiz Exp $
  EOF
  _lrintf=no
  cc_check $_ld_lm && _lrintf=yes
-@@ -3788,7 +3789,7 @@ fi
+@@ -3788,7 +3789,7 @@
  if test "$_aa" = yes ; then
    _def_aa='#define HAVE_AA 1'
    if cygwin ; then