Diff for /embedaddon/quagga/missing between versions 1.1 and 1.1.1.2

version 1.1, 2012/02/21 17:26:11 version 1.1.1.2, 2012/10/09 09:22:28
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # Common stub for a few missing GNU programs while installing.  # Common stub for a few missing GNU programs while installing.
   
scriptversion=2009-04-28.21; # UTCscriptversion=2012-01-06.13; # UTC
   
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,  # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
# 2008, 2009 Free Software Foundation, Inc.# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.  # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
   
 # This program is free software; you can redistribute it and/or modify  # This program is free software; you can redistribute it and/or modify
Line 84  Supported PROGRAM values: Line 84  Supported PROGRAM values:
   help2man     touch the output file    help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c    lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file    makeinfo     touch the output file
   tar          try tar, gnutar, gtar, then tar without non-portable flags  
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
   
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and  Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
Line 122  case $1 in Line 121  case $1 in
     # Not GNU programs, they don't have --version.      # Not GNU programs, they don't have --version.
     ;;      ;;
   
   tar*)  
     if test -n "$run"; then  
        echo 1>&2 "ERROR: \`tar' requires --run"  
        exit 1  
     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then  
        exit 1  
     fi  
     ;;  
   
   *)    *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then      if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.         # We have it, but it failed.
Line 226  WARNING: \`$1' $msg.  You should only need it if Line 216  WARNING: \`$1' $msg.  You should only need it if
          \`Bison' from any GNU archive site."           \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h      rm -f y.tab.c y.tab.h
     if test $# -ne 1; then      if test $# -ne 1; then
        eval LASTARG="\${$#}"        eval LASTARG=\${$#}
         case $LASTARG in          case $LASTARG in
         *.y)          *.y)
             SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`              SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
Line 256  WARNING: \`$1' is $msg.  You should only need it if Line 246  WARNING: \`$1' is $msg.  You should only need it if
          \`Flex' from any GNU archive site."           \`Flex' from any GNU archive site."
     rm -f lex.yy.c      rm -f lex.yy.c
     if test $# -ne 1; then      if test $# -ne 1; then
        eval LASTARG="\${$#}"        eval LASTARG=\${$#}
         case $LASTARG in          case $LASTARG in
         *.l)          *.l)
             SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`              SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
Line 316  WARNING: \`$1' is $msg.  You should only need it if Line 306  WARNING: \`$1' is $msg.  You should only need it if
     # let's fail without touching anything.      # let's fail without touching anything.
     test -f $file || exit 1      test -f $file || exit 1
     touch $file      touch $file
     ;;  
   
   tar*)  
     shift  
   
     # We have already tried tar in the generic part.  
     # Look for gnutar/gtar before invocation to avoid ugly error  
     # messages.  
     if (gnutar --version > /dev/null 2>&1); then  
        gnutar "$@" && exit 0  
     fi  
     if (gtar --version > /dev/null 2>&1); then  
        gtar "$@" && exit 0  
     fi  
     firstarg="$1"  
     if shift; then  
         case $firstarg in  
         *o*)  
             firstarg=`echo "$firstarg" | sed s/o//`  
             tar "$firstarg" "$@" && exit 0  
             ;;  
         esac  
         case $firstarg in  
         *h*)  
             firstarg=`echo "$firstarg" | sed s/h//`  
             tar "$firstarg" "$@" && exit 0  
             ;;  
         esac  
     fi  
   
     echo 1>&2 "\  
 WARNING: I can't seem to be able to run \`tar' with the given arguments.  
          You may want to install GNU tar or Free paxutils, or check the  
          command line arguments."  
     exit 1  
     ;;      ;;
   
   *)    *)

Removed from v.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>