123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185 |
- $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- --- cgilib-0.7.orig/missing 2009-02-08 19:47:04.000000000 +0100
- +++ cgilib-0.7/missing 2009-05-09 03:58:09.000000000 +0200
- @@ -1,9 +1,9 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
-
- -scriptversion=2006-05-10.23
- +scriptversion=2005-06-08.21
-
- -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
- +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
- @@ -33,8 +33,6 @@ if test $# -eq 0; then
- fi
-
- run=:
- -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
- -sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
- @@ -46,7 +44,7 @@ fi
-
- msg="missing on your system"
-
- -case $1 in
- +case "$1" in
- --run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- @@ -79,7 +77,6 @@ Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- - autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- @@ -109,7 +106,7 @@ esac
- # Now exit if we have it, but it failed. Also exit now if we
- # don't have it and --version was passed (most likely to detect
- # the program).
- -case $1 in
- +case "$1" in
- lex|yacc)
- # Not GNU programs, they don't have --version.
- ;;
- @@ -138,7 +135,7 @@ esac
-
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
- -case $1 in
- +case "$1" in
- aclocal*)
- echo 1>&2 "\
- WARNING: \`$1' is $msg. You should only need it if
- @@ -167,7 +164,7 @@ WARNING: \`$1' is $msg. You should only
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- - case $f in
- + case "$f" in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- @@ -195,8 +192,8 @@ WARNING: \`$1' is needed, but is $msg.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- - file=`echo "$*" | sed -n "$sed_output"`
- - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
- if test -f "$file"; then
- touch $file
- else
- @@ -217,25 +214,25 @@ WARNING: \`$1' $msg. You should only ne
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- - if test $# -ne 1; then
- + if [ $# -ne 1 ]; then
- eval LASTARG="\${$#}"
- - case $LASTARG in
- + case "$LASTARG" in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- - if test -f "$SRCFILE"; then
- + if [ -f "$SRCFILE" ]; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- - if test -f "$SRCFILE"; then
- + if [ -f "$SRCFILE" ]; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- - if test ! -f y.tab.h; then
- + if [ ! -f y.tab.h ]; then
- echo >y.tab.h
- fi
- - if test ! -f y.tab.c; then
- + if [ ! -f y.tab.c ]; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
- @@ -247,18 +244,18 @@ WARNING: \`$1' is $msg. You should only
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- - if test $# -ne 1; then
- + if [ $# -ne 1 ]; then
- eval LASTARG="\${$#}"
- - case $LASTARG in
- + case "$LASTARG" in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- - if test -f "$SRCFILE"; then
- + if [ -f "$SRCFILE" ]; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- - if test ! -f lex.yy.c; then
- + if [ ! -f lex.yy.c ]; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
- @@ -270,9 +267,11 @@ WARNING: \`$1' is $msg. You should only
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- - file=`echo "$*" | sed -n "$sed_output"`
- - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- - if test -f "$file"; then
- + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- + if test -z "$file"; then
- + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- + fi
- + if [ -f "$file" ]; then
- touch $file
- else
- test -z "$file" || exec >$file
- @@ -290,17 +289,11 @@ WARNING: \`$1' is $msg. You should only
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- - file=`echo "$*" | sed -n "$sed_output"`
- - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- - file=`sed -n '
- - /^@setfilename/{
- - s/.* \([^ ]*\) *$/\1/
- - p
- - q
- - }' $infile`
- + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- @@ -324,13 +317,13 @@ WARNING: \`$1' is $msg. You should only
- fi
- firstarg="$1"
- if shift; then
- - case $firstarg in
- + case "$firstarg" in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- - case $firstarg in
- + case "$firstarg" in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
|