[pkgsrc/trunk]: pkgsrc/graphics/mplayer-share Solve GCC version problem by pa...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b6b3b1e92b98
branches:  trunk
changeset: 463052:b6b3b1e92b98
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Oct 26 14:26:25 2003 +0000

description:
Solve GCC version problem by patching the "configure" script because the
"--disable-gcc-checking" makes the build interactive.

diffstat:

 graphics/mplayer-share/Makefile.common  |   3 +--
 graphics/mplayer-share/patches/patch-aa |  17 +++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r f2deaaa731fd -r b6b3b1e92b98 graphics/mplayer-share/Makefile.common
--- a/graphics/mplayer-share/Makefile.common    Sun Oct 26 14:05:59 2003 +0000
+++ b/graphics/mplayer-share/Makefile.common    Sun Oct 26 14:26:25 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.43 2003/10/26 14:04:41 tron Exp $
+# $NetBSD: Makefile.common,v 1.44 2003/10/26 14:26:25 tron Exp $
 #
 
 MPLAYER_DIST_VERSION=  1.0pre1
@@ -37,7 +37,6 @@
                        --with-extralibdir="${LOCALBASE}/lib" \
                        --with-extralibdir="${X11BASE}/lib" \
                        --disable-mpdvdkit \
-                       --disable-gcc-checking \
 
 # The configure script attempts to test-execute compiled programs in /tmp,
 # but that directory may be mounted as noexec; work this around by setting
diff -r f2deaaa731fd -r b6b3b1e92b98 graphics/mplayer-share/patches/patch-aa
--- a/graphics/mplayer-share/patches/patch-aa   Sun Oct 26 14:05:59 2003 +0000
+++ b/graphics/mplayer-share/patches/patch-aa   Sun Oct 26 14:26:25 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2003/01/20 07:10:42 fredb Exp $
+$NetBSD: patch-aa,v 1.6 2003/10/26 14:26:26 tron Exp $
 
---- configure.orig     Thu Oct 24 14:12:40 2002
-+++ configure
-@@ -298,8 +298,8 @@ for ac_option do
+--- configure.orig     2003-09-01 12:51:11.000000000 +0200
++++ configure  2003-10-26 15:24:19.000000000 +0100
+@@ -348,8 +348,8 @@
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
      ;;
    --with-extralibdir=*)
@@ -13,3 +13,12 @@
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
+@@ -473,7 +473,7 @@
+  for _cc in "$_cc" gcc-3.1 gcc3 gcc-3.0 cc ; do
+   echocheck "$_cc version"
+   cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
+-  cc_version=`( $_cc -dumpversion ) 2>&1`
++  cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1`
+   if test "$?" -gt 0; then
+     cc_version="not found"
+   fi