Ticket #38580: ufraw.diff

File ufraw.diff, 59.9 KB (added by ryandesign (Ryan Carsten Schmidt), 12 years ago)

difference between the old 0.19.2 and the new 0.19.2

  • ufraw-0.19.2/config.guess 

    diff -ru ufraw-0.19.2/config.guess 0.19.2_1/ufraw-0.19.2/config.guess
    old new  
    11#! /bin/sh
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    5 #   Free Software Foundation, Inc.
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     5#   2011, 2012 Free Software Foundation, Inc.
    66
    7 timestamp='2009-04-27'
     7timestamp='2012-02-10'
    88
    99# This file is free software; you can redistribute it and/or modify it
    1010# under the terms of the GNU General Public License as published by
    … …  
    1717# General Public License for more details.
    1818#
    1919# You should have received a copy of the GNU General Public License
    20 # along with this program; if not, write to the Free Software
    21 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    22 # 02110-1301, USA.
     20# along with this program; if not, see <http://www.gnu.org/licenses/>.
    2321#
    2422# As a special exception to the GNU General Public License, if you
    2523# distribute this file as part of a program that contains a
    … …  
    2725# the same distribution terms that you use for the rest of that program.
    2826
    2927
    30 # Originally written by Per Bothner <per@bothner.com>.
    31 # Please send patches to <config-patches@gnu.org>.  Submit a context
    32 # diff and a properly formatted ChangeLog entry.
     28# Originally written by Per Bothner.  Please send patches (context
     29# diff format) to <config-patches@gnu.org> and include a ChangeLog
     30# entry.
    3331#
    3432# This script attempts to guess a canonical system name similar to
    3533# config.sub.  If it succeeds, it prints the system name on stdout, and
    3634# exits with 0.  Otherwise, it exits with 1.
    3735#
    38 # The plan is that this can be called by configure scripts if you
    39 # don't specify an explicit build system type.
     36# You can get the latest version of this script from:
     37# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
    4038
    4139me=`echo "$0" | sed -e 's,.*/,,'`
    4240
    … …  
    5654GNU config.guess ($timestamp)
    5755
    5856Originally written by Per Bothner.
    59 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    60 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
     57Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
     582001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
     59Free Software Foundation, Inc.
    6160
    6261This is free software; see the source for copying conditions.  There is NO
    6362warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    … …  
    144143case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    145144    *:NetBSD:*:*)
    146145        # NetBSD (nbsd) targets should (where applicable) match one or
    147         # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
     146        # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
    148147        # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
    149148        # switched to ELF, *-*-netbsd* would select the old
    150149        # object file format.  This provides both forward
    … …  
    170169            arm*|i386|m68k|ns32k|sh3*|sparc|vax)
    171170                eval $set_cc_for_build
    172171                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
    173                         | grep __ELF__ >/dev/null
     172                        | grep -q __ELF__
    174173                then
    175174                    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
    176175                    # Return netbsd for either.  FIX?
    … …  
    180179                fi
    181180                ;;
    182181            *)
    183                 os=netbsd
     182                os=netbsd
    184183                ;;
    185184        esac
    186185        # The OS release
    … …  
    223222                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
    224223                ;;
    225224        *5.*)
    226                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
     225                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
    227226                ;;
    228227        esac
    229228        # According to Compaq, /usr/sbin/psrinfo has been available on
    … …  
    269268        # A Xn.n version is an unreleased experimental baselevel.
    270269        # 1.2 uses "1.2" for uname -r.
    271270        echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    272         exit ;;
     271        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
     272        exitcode=$?
     273        trap '' 0
     274        exit $exitcode ;;
    273275    Alpha\ *:Windows_NT*:*)
    274276        # How do we know it's Interix rather than the generic POSIX subsystem?
    275277        # Should we change UNAME_MACHINE based on the output of uname instead
    … …  
    295297        echo s390-ibm-zvmoe
    296298        exit ;;
    297299    *:OS400:*:*)
    298         echo powerpc-ibm-os400
     300        echo powerpc-ibm-os400
    299301        exit ;;
    300302    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
    301303        echo arm-acorn-riscix${UNAME_RELEASE}
    … …  
    333335    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
    334336        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
    335337        exit ;;
     338    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
     339        echo i386-pc-auroraux${UNAME_RELEASE}
     340        exit ;;
    336341    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
    337342        eval $set_cc_for_build
    338343        SUN_ARCH="i386"
    … …  
    391396    # MiNT.  But MiNT is downward compatible to TOS, so this should
    392397    # be no problem.
    393398    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
    394         echo m68k-atari-mint${UNAME_RELEASE}
     399        echo m68k-atari-mint${UNAME_RELEASE}
    395400        exit ;;
    396401    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
    397402        echo m68k-atari-mint${UNAME_RELEASE}
    398         exit ;;
     403        exit ;;
    399404    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
    400         echo m68k-atari-mint${UNAME_RELEASE}
     405        echo m68k-atari-mint${UNAME_RELEASE}
    401406        exit ;;
    402407    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
    403         echo m68k-milan-mint${UNAME_RELEASE}
    404         exit ;;
     408        echo m68k-milan-mint${UNAME_RELEASE}
     409        exit ;;
    405410    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
    406         echo m68k-hades-mint${UNAME_RELEASE}
    407         exit ;;
     411        echo m68k-hades-mint${UNAME_RELEASE}
     412        exit ;;
    408413    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
    409         echo m68k-unknown-mint${UNAME_RELEASE}
    410         exit ;;
     414        echo m68k-unknown-mint${UNAME_RELEASE}
     415        exit ;;
    411416    m68k:machten:*:*)
    412417        echo m68k-apple-machten${UNAME_RELEASE}
    413418        exit ;;
    … …  
    477482        echo m88k-motorola-sysv3
    478483        exit ;;
    479484    AViiON:dgux:*:*)
    480         # DG/UX returns AViiON for all architectures
    481         UNAME_PROCESSOR=`/usr/bin/uname -p`
     485        # DG/UX returns AViiON for all architectures
     486        UNAME_PROCESSOR=`/usr/bin/uname -p`
    482487        if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
    483488        then
    484489            if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
    … …  
    491496        else
    492497            echo i586-dg-dgux${UNAME_RELEASE}
    493498        fi
    494         exit ;;
     499        exit ;;
    495500    M88*:DolphinOS:*:*) # DolphinOS (SVR3)
    496501        echo m88k-dolphin-sysv3
    497502        exit ;;
    … …  
    548553                echo rs6000-ibm-aix3.2
    549554        fi
    550555        exit ;;
    551     *:AIX:*:[456])
     556    *:AIX:*:[4567])
    552557        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
    553558        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
    554559                IBM_ARCH=rs6000
    … …  
    591596            9000/[678][0-9][0-9])
    592597                if [ -x /usr/bin/getconf ]; then
    593598                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
    594                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
    595                     case "${sc_cpu_version}" in
    596                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
    597                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
    598                       532)                      # CPU_PA_RISC2_0
    599                         case "${sc_kernel_bits}" in
    600                           32) HP_ARCH="hppa2.0n" ;;
    601                           64) HP_ARCH="hppa2.0w" ;;
     599                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
     600                    case "${sc_cpu_version}" in
     601                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
     602                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
     603                      532)                      # CPU_PA_RISC2_0
     604                        case "${sc_kernel_bits}" in
     605                          32) HP_ARCH="hppa2.0n" ;;
     606                          64) HP_ARCH="hppa2.0w" ;;
    602607                          '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
    603                         esac ;;
    604                     esac
     608                        esac ;;
     609                    esac
    605610                fi
    606611                if [ "${HP_ARCH}" = "" ]; then
    607612                    eval $set_cc_for_build
    608                     sed 's/^              //' << EOF >$dummy.c
     613                    sed 's/^            //' << EOF >$dummy.c
    609614
    610               #define _HPUX_SOURCE
    611               #include <stdlib.h>
    612               #include <unistd.h>
    613 
    614               int main ()
    615               {
    616               #if defined(_SC_KERNEL_BITS)
    617                   long bits = sysconf(_SC_KERNEL_BITS);
    618               #endif
    619                   long cpu  = sysconf (_SC_CPU_VERSION);
    620 
    621                   switch (cpu)
    622                 {
    623                 case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
    624                 case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
    625                 case CPU_PA_RISC2_0:
    626               #if defined(_SC_KERNEL_BITS)
    627                     switch (bits)
    628                         {
    629                         case 64: puts ("hppa2.0w"); break;
    630                         case 32: puts ("hppa2.0n"); break;
    631                         default: puts ("hppa2.0"); break;
    632                         } break;
    633               #else  /* !defined(_SC_KERNEL_BITS) */
    634                     puts ("hppa2.0"); break;
    635               #endif
    636                 default: puts ("hppa1.0"); break;
    637                 }
    638                   exit (0);
    639               }
     615                #define _HPUX_SOURCE
     616                #include <stdlib.h>
     617                #include <unistd.h>
     618
     619                int main ()
     620                {
     621                #if defined(_SC_KERNEL_BITS)
     622                    long bits = sysconf(_SC_KERNEL_BITS);
     623                #endif
     624                    long cpu  = sysconf (_SC_CPU_VERSION);
     625
     626                    switch (cpu)
     627                        {
     628                        case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
     629                        case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
     630                        case CPU_PA_RISC2_0:
     631                #if defined(_SC_KERNEL_BITS)
     632                            switch (bits)
     633                                {
     634                                case 64: puts ("hppa2.0w"); break;
     635                                case 32: puts ("hppa2.0n"); break;
     636                                default: puts ("hppa2.0"); break;
     637                                } break;
     638                #else  /* !defined(_SC_KERNEL_BITS) */
     639                            puts ("hppa2.0"); break;
     640                #endif
     641                        default: puts ("hppa1.0"); break;
     642                        }
     643                    exit (0);
     644                }
    640645EOF
    641646                    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
    642647                    test -z "$HP_ARCH" && HP_ARCH=hppa
    … …  
    656661            # => hppa64-hp-hpux11.23
    657662
    658663            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
    659                 grep __LP64__ >/dev/null
     664                grep -q __LP64__
    660665            then
    661666                HP_ARCH="hppa2.0w"
    662667            else
    … …  
    727732        exit ;;
    728733    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
    729734        echo c1-convex-bsd
    730         exit ;;
     735        exit ;;
    731736    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
    732737        if getsysinfo -f scalar_acc
    733738        then echo c32-convex-bsd
    734739        else echo c2-convex-bsd
    735740        fi
    736         exit ;;
     741        exit ;;
    737742    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
    738743        echo c34-convex-bsd
    739         exit ;;
     744        exit ;;
    740745    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
    741746        echo c38-convex-bsd
    742         exit ;;
     747        exit ;;
    743748    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
    744749        echo c4-convex-bsd
    745         exit ;;
     750        exit ;;
    746751    CRAY*Y-MP:*:*:*)
    747752        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
    748753        exit ;;
    … …  
    766771        exit ;;
    767772    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
    768773        FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    769         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
    770         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
    771         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    772         exit ;;
     774        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     775        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
     776        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
     777        exit ;;
    773778    5000:UNIX_System_V:4.*:*)
    774         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
    775         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
    776         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
     779        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
     780        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
     781        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
    777782        exit ;;
    778783    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
    779784        echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
    … …  
    785790        echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
    786791        exit ;;
    787792    *:FreeBSD:*:*)
    788         case ${UNAME_MACHINE} in
    789             pc98)
    790                 echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     793        UNAME_PROCESSOR=`/usr/bin/uname -p`
     794        case ${UNAME_PROCESSOR} in
    791795            amd64)
    792796                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
    793797            *)
    794                 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     798                echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
    795799        esac
    796800        exit ;;
    797801    i*:CYGWIN*:*)
    … …  
    800804    *:MINGW*:*)
    801805        echo ${UNAME_MACHINE}-pc-mingw32
    802806        exit ;;
     807    i*:MSYS*:*)
     808        echo ${UNAME_MACHINE}-pc-msys
     809        exit ;;
    803810    i*:windows32*:*)
    804         # uname -m includes "-pc" on this system.
    805         echo ${UNAME_MACHINE}-mingw32
     811        # uname -m includes "-pc" on this system.
     812        echo ${UNAME_MACHINE}-mingw32
    806813        exit ;;
    807814    i*:PW*:*)
    808815        echo ${UNAME_MACHINE}-pc-pw32
    809816        exit ;;
    810     *:Interix*:[3456]*)
    811         case ${UNAME_MACHINE} in
     817    *:Interix*:*)
     818        case ${UNAME_MACHINE} in
    812819            x86)
    813820                echo i586-pc-interix${UNAME_RELEASE}
    814821                exit ;;
    815             EM64T | authenticamd | genuineintel)
     822            authenticamd | genuineintel | EM64T)
    816823                echo x86_64-unknown-interix${UNAME_RELEASE}
    817824                exit ;;
    818825            IA64)
    … …  
    822829    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
    823830        echo i${UNAME_MACHINE}-pc-mks
    824831        exit ;;
     832    8664:Windows_NT:*)
     833        echo x86_64-pc-mks
     834        exit ;;
    825835    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
    826836        # How do we know it's Interix rather than the generic POSIX subsystem?
    827837        # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
    … …  
    851861    i*86:Minix:*:*)
    852862        echo ${UNAME_MACHINE}-pc-minix
    853863        exit ;;
     864    aarch64:Linux:*:*)
     865        echo ${UNAME_MACHINE}-unknown-linux-gnu
     866        exit ;;
     867    aarch64_be:Linux:*:*)
     868        UNAME_MACHINE=aarch64_be
     869        echo ${UNAME_MACHINE}-unknown-linux-gnu
     870        exit ;;
     871    alpha:Linux:*:*)
     872        case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
     873          EV5)   UNAME_MACHINE=alphaev5 ;;
     874          EV56)  UNAME_MACHINE=alphaev56 ;;
     875          PCA56) UNAME_MACHINE=alphapca56 ;;
     876          PCA57) UNAME_MACHINE=alphapca56 ;;
     877          EV6)   UNAME_MACHINE=alphaev6 ;;
     878          EV67)  UNAME_MACHINE=alphaev67 ;;
     879          EV68*) UNAME_MACHINE=alphaev68 ;;
     880        esac
     881        objdump --private-headers /bin/sh | grep -q ld.so.1
     882        if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
     883        echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
     884        exit ;;
    854885    arm*:Linux:*:*)
    855886        eval $set_cc_for_build
    856887        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
    … …  
    858889        then
    859890            echo ${UNAME_MACHINE}-unknown-linux-gnu
    860891        else
    861             echo ${UNAME_MACHINE}-unknown-linux-gnueabi
     892            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
     893                | grep -q __ARM_PCS_VFP
     894            then
     895                echo ${UNAME_MACHINE}-unknown-linux-gnueabi
     896            else
     897                echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
     898            fi
    862899        fi
    863900        exit ;;
    864901    avr32*:Linux:*:*)
    865902        echo ${UNAME_MACHINE}-unknown-linux-gnu
    866903        exit ;;
    867904    cris:Linux:*:*)
    868         echo cris-axis-linux-gnu
     905        echo ${UNAME_MACHINE}-axis-linux-gnu
    869906        exit ;;
    870907    crisv32:Linux:*:*)
    871         echo crisv32-axis-linux-gnu
     908        echo ${UNAME_MACHINE}-axis-linux-gnu
    872909        exit ;;
    873910    frv:Linux:*:*)
    874         echo frv-unknown-linux-gnu
     911        echo ${UNAME_MACHINE}-unknown-linux-gnu
     912        exit ;;
     913    hexagon:Linux:*:*)
     914        echo ${UNAME_MACHINE}-unknown-linux-gnu
     915        exit ;;
     916    i*86:Linux:*:*)
     917        LIBC=gnu
     918        eval $set_cc_for_build
     919        sed 's/^        //' << EOF >$dummy.c
     920        #ifdef __dietlibc__
     921        LIBC=dietlibc
     922        #endif
     923EOF
     924        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
     925        echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
    875926        exit ;;
    876927    ia64:Linux:*:*)
    877928        echo ${UNAME_MACHINE}-unknown-linux-gnu
    … …  
    882933    m68*:Linux:*:*)
    883934        echo ${UNAME_MACHINE}-unknown-linux-gnu
    884935        exit ;;
    885     mips:Linux:*:*)
     936    mips:Linux:*:* | mips64:Linux:*:*)
    886937        eval $set_cc_for_build
    887938        sed 's/^        //' << EOF >$dummy.c
    888939        #undef CPU
    889         #undef mips
    890         #undef mipsel
     940        #undef ${UNAME_MACHINE}
     941        #undef ${UNAME_MACHINE}el
    891942        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    892         CPU=mipsel
     943        CPU=${UNAME_MACHINE}el
    893944        #else
    894945        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    895         CPU=mips
     946        CPU=${UNAME_MACHINE}
    896947        #else
    897948        CPU=
    898949        #endif
    899950        #endif
    900951EOF
    901         eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    902             /^CPU/{
    903                 s: ::g
    904                 p
    905             }'`"
    906         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    907         ;;
    908     mips64:Linux:*:*)
    909         eval $set_cc_for_build
    910         sed 's/^        //' << EOF >$dummy.c
    911         #undef CPU
    912         #undef mips64
    913         #undef mips64el
    914         #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
    915         CPU=mips64el
    916         #else
    917         #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
    918         CPU=mips64
    919         #else
    920         CPU=
    921         #endif
    922         #endif
    923 EOF
    924         eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    925             /^CPU/{
    926                 s: ::g
    927                 p
    928             }'`"
     952        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
    929953        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    930954        ;;
    931955    or32:Linux:*:*)
    932         echo or32-unknown-linux-gnu
    933         exit ;;
    934     ppc:Linux:*:*)
    935         echo powerpc-unknown-linux-gnu
    936         exit ;;
    937     ppc64:Linux:*:*)
    938         echo powerpc64-unknown-linux-gnu
    939         exit ;;
    940     alpha:Linux:*:*)
    941         case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
    942           EV5)   UNAME_MACHINE=alphaev5 ;;
    943           EV56)  UNAME_MACHINE=alphaev56 ;;
    944           PCA56) UNAME_MACHINE=alphapca56 ;;
    945           PCA57) UNAME_MACHINE=alphapca56 ;;
    946           EV6)   UNAME_MACHINE=alphaev6 ;;
    947           EV67)  UNAME_MACHINE=alphaev67 ;;
    948           EV68*) UNAME_MACHINE=alphaev68 ;;
    949         esac
    950         objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
    951         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
    952         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
     956        echo ${UNAME_MACHINE}-unknown-linux-gnu
    953957        exit ;;
    954958    padre:Linux:*:*)
    955959        echo sparc-unknown-linux-gnu
    956960        exit ;;
     961    parisc64:Linux:*:* | hppa64:Linux:*:*)
     962        echo hppa64-unknown-linux-gnu
     963        exit ;;
    957964    parisc:Linux:*:* | hppa:Linux:*:*)
    958965        # Look for CPU level
    959966        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
    … …  
    962969          *)    echo hppa-unknown-linux-gnu ;;
    963970        esac
    964971        exit ;;
    965     parisc64:Linux:*:* | hppa64:Linux:*:*)
    966         echo hppa64-unknown-linux-gnu
     972    ppc64:Linux:*:*)
     973        echo powerpc64-unknown-linux-gnu
     974        exit ;;
     975    ppc:Linux:*:*)
     976        echo powerpc-unknown-linux-gnu
    967977        exit ;;
    968978    s390:Linux:*:* | s390x:Linux:*:*)
    969979        echo ${UNAME_MACHINE}-ibm-linux
    970980        exit ;;
    971981    sh64*:Linux:*:*)
    972         echo ${UNAME_MACHINE}-unknown-linux-gnu
     982        echo ${UNAME_MACHINE}-unknown-linux-gnu
    973983        exit ;;
    974984    sh*:Linux:*:*)
    975985        echo ${UNAME_MACHINE}-unknown-linux-gnu
    … …  
    977987    sparc:Linux:*:* | sparc64:Linux:*:*)
    978988        echo ${UNAME_MACHINE}-unknown-linux-gnu
    979989        exit ;;
     990    tile*:Linux:*:*)
     991        echo ${UNAME_MACHINE}-unknown-linux-gnu
     992        exit ;;
    980993    vax:Linux:*:*)
    981994        echo ${UNAME_MACHINE}-dec-linux-gnu
    982995        exit ;;
    983996    x86_64:Linux:*:*)
    984         echo x86_64-unknown-linux-gnu
     997        echo ${UNAME_MACHINE}-unknown-linux-gnu
    985998        exit ;;
    986999    xtensa*:Linux:*:*)
    987         echo ${UNAME_MACHINE}-unknown-linux-gnu
     1000        echo ${UNAME_MACHINE}-unknown-linux-gnu
    9881001        exit ;;
    989     i*86:Linux:*:*)
    990         # The BFD linker knows what the default object file format is, so
    991         # first see if it will tell us. cd to the root directory to prevent
    992         # problems with other programs or directories called `ld' in the path.
    993         # Set LC_ALL=C to ensure ld outputs messages in English.
    994         ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
    995                          | sed -ne '/supported targets:/!d
    996                                     s/[         ][      ]*/ /g
    997                                     s/.*supported targets: *//
    998                                     s/ .*//
    999                                     p'`
    1000         case "$ld_supported_targets" in
    1001           elf32-i386)
    1002                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
    1003                 ;;
    1004           a.out-i386-linux)
    1005                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
    1006                 exit ;;
    1007           "")
    1008                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
    1009                 # one that does not give us useful --help.
    1010                 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
    1011                 exit ;;
    1012         esac
    1013         # Determine whether the default compiler is a.out or elf
    1014         eval $set_cc_for_build
    1015         sed 's/^        //' << EOF >$dummy.c
    1016         #include <features.h>
    1017         #ifdef __ELF__
    1018         # ifdef __GLIBC__
    1019         #  if __GLIBC__ >= 2
    1020         LIBC=gnu
    1021         #  else
    1022         LIBC=gnulibc1
    1023         #  endif
    1024         # else
    1025         LIBC=gnulibc1
    1026         # endif
    1027         #else
    1028         #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
    1029         LIBC=gnu
    1030         #else
    1031         LIBC=gnuaout
    1032         #endif
    1033         #endif
    1034         #ifdef __dietlibc__
    1035         LIBC=dietlibc
    1036         #endif
    1037 EOF
    1038         eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    1039             /^LIBC/{
    1040                 s: ::g
    1041                 p
    1042             }'`"
    1043         test x"${LIBC}" != x && {
    1044                 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
    1045                 exit
    1046         }
    1047         test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
    1048         ;;
    10491002    i*86:DYNIX/ptx:4*:*)
    10501003        # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
    10511004        # earlier versions are messed up and put the nodename in both
    … …  
    10531006        echo i386-sequent-sysv4
    10541007        exit ;;
    10551008    i*86:UNIX_SV:4.2MP:2.*)
    1056         # Unixware is an offshoot of SVR4, but it has its own version
    1057         # number series starting with 2...
    1058         # I am not positive that other SVR4 systems won't match this,
     1009        # Unixware is an offshoot of SVR4, but it has its own version
     1010        # number series starting with 2...
     1011        # I am not positive that other SVR4 systems won't match this,
    10591012        # I just have to hope.  -- rms.
    1060         # Use sysv4.2uw... so that sysv4* matches it.
     1013        # Use sysv4.2uw... so that sysv4* matches it.
    10611014        echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
    10621015        exit ;;
    10631016    i*86:OS/2:*:*)
    … …  
    10741027    i*86:syllable:*:*)
    10751028        echo ${UNAME_MACHINE}-pc-syllable
    10761029        exit ;;
    1077     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
     1030    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
    10781031        echo i386-unknown-lynxos${UNAME_RELEASE}
    10791032        exit ;;
    10801033    i*86:*DOS:*:*)
    … …  
    10891042        fi
    10901043        exit ;;
    10911044    i*86:*:5:[678]*)
    1092         # UnixWare 7.x, OpenUNIX and OpenServer 6.
     1045        # UnixWare 7.x, OpenUNIX and OpenServer 6.
    10931046        case `/bin/uname -X | grep "^Machine"` in
    10941047            *486*)           UNAME_MACHINE=i486 ;;
    10951048            *Pentium)        UNAME_MACHINE=i586 ;;
    … …  
    11171070        exit ;;
    11181071    pc:*:*:*)
    11191072        # Left here for compatibility:
    1120         # uname -m prints for DJGPP always 'pc', but it prints nothing about
    1121         # the processor, so we play safe by assuming i586.
     1073        # uname -m prints for DJGPP always 'pc', but it prints nothing about
     1074        # the processor, so we play safe by assuming i586.
    11221075        # Note: whatever this is, it MUST be the same as what config.sub
    11231076        # prints for the "djgpp" host, or else GDB configury will decide that
    11241077        # this is a cross-build.
    11251078        echo i586-pc-msdosdjgpp
    1126         exit ;;
     1079        exit ;;
    11271080    Intel:Mach:3*:*)
    11281081        echo i386-pc-mach3
    11291082        exit ;;
    … …  
    11581111        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
    11591112          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    11601113    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
    1161         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
    1162           && { echo i486-ncr-sysv4; exit; } ;;
     1114        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
     1115          && { echo i486-ncr-sysv4; exit; } ;;
    11631116    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
    11641117        OS_REL='.3'
    11651118        test -r /etc/.relid \
    … …  
    11821135    rs6000:LynxOS:2.*:*)
    11831136        echo rs6000-unknown-lynxos${UNAME_RELEASE}
    11841137        exit ;;
    1185     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
     1138    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
    11861139        echo powerpc-unknown-lynxos${UNAME_RELEASE}
    11871140        exit ;;
    11881141    SM[BE]S:UNIX_SV:*:*)
    … …  
    12021155                echo ns32k-sni-sysv
    12031156        fi
    12041157        exit ;;
    1205     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
    1206                       # says <Richard.M.Bartel@ccMail.Census.GOV>
    1207         echo i586-unisys-sysv4
    1208         exit ;;
     1158    PENTIUM:*:4.0*:*)   # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
     1159                        # says <Richard.M.Bartel@ccMail.Census.GOV>
     1160        echo i586-unisys-sysv4
     1161        exit ;;
    12091162    *:UNIX_System_V:4*:FTX*)
    12101163        # From Gerald Hewes <hewes@openmarket.com>.
    12111164        # How about differentiating between stratus architectures? -djm
    … …  
    12311184        exit ;;
    12321185    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
    12331186        if [ -d /usr/nec ]; then
    1234                 echo mips-nec-sysv${UNAME_RELEASE}
     1187                echo mips-nec-sysv${UNAME_RELEASE}
    12351188        else
    1236                 echo mips-unknown-sysv${UNAME_RELEASE}
     1189                echo mips-unknown-sysv${UNAME_RELEASE}
    12371190        fi
    1238         exit ;;
     1191        exit ;;
    12391192    BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
    12401193        echo powerpc-be-beos
    12411194        exit ;;
    … …  
    12751228    *:Darwin:*:*)
    12761229        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
    12771230        case $UNAME_PROCESSOR in
     1231            i386)
     1232                eval $set_cc_for_build
     1233                if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
     1234                  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
     1235                      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
     1236                      grep IS_64BIT_ARCH >/dev/null
     1237                  then
     1238                      UNAME_PROCESSOR="x86_64"
     1239                  fi
     1240                fi ;;
    12781241            unknown) UNAME_PROCESSOR=powerpc ;;
    12791242        esac
    12801243        echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
    … …  
    12901253    *:QNX:*:4*)
    12911254        echo i386-pc-qnx
    12921255        exit ;;
     1256    NEO-?:NONSTOP_KERNEL:*:*)
     1257        echo neo-tandem-nsk${UNAME_RELEASE}
     1258        exit ;;
    12931259    NSE-?:NONSTOP_KERNEL:*:*)
    12941260        echo nse-tandem-nsk${UNAME_RELEASE}
    12951261        exit ;;
    … …  
    13351301        echo pdp10-unknown-its
    13361302        exit ;;
    13371303    SEI:*:*:SEIUX)
    1338         echo mips-sei-seiux${UNAME_RELEASE}
     1304        echo mips-sei-seiux${UNAME_RELEASE}
    13391305        exit ;;
    13401306    *:DragonFly:*:*)
    13411307        echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    13421308        exit ;;
    13431309    *:*VMS:*:*)
    1344         UNAME_MACHINE=`(uname -p) 2>/dev/null`
     1310        UNAME_MACHINE=`(uname -p) 2>/dev/null`
    13451311        case "${UNAME_MACHINE}" in
    13461312            A*) echo alpha-dec-vms ; exit ;;
    13471313            I*) echo ia64-dec-vms ; exit ;;
    … …  
    13591325    i*86:AROS:*:*)
    13601326        echo ${UNAME_MACHINE}-pc-aros
    13611327        exit ;;
     1328    x86_64:VMkernel:*:*)
     1329        echo ${UNAME_MACHINE}-unknown-esx
     1330        exit ;;
    13621331esac
    13631332
    13641333#echo '(No uname command or uname output not recognized.)' 1>&2
    … …  
    13811350#include <sys/param.h>
    13821351  printf ("m68k-sony-newsos%s\n",
    13831352#ifdef NEWSOS4
    1384           "4"
     1353        "4"
    13851354#else
    1386           ""
     1355        ""
    13871356#endif
    1388          ); exit (0);
     1357        ); exit (0);
    13891358#endif
    13901359#endif
    13911360

  • ufraw-0.19.2/config.sub 

    diff -ru ufraw-0.19.2/config.sub 0.19.2_1/ufraw-0.19.2/config.sub
    old new  
    11#! /bin/sh
    22# Configuration validation subroutine script.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
    5 #   Free Software Foundation, Inc.
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     5#   2011, 2012 Free Software Foundation, Inc.
    66
    7 timestamp='2009-04-17'
     7timestamp='2012-04-18'
    88
    99# This file is (in principle) common to ALL GNU software.
    1010# The presence of a machine in this file suggests that SOME GNU software
    … …  
    2121# GNU General Public License for more details.
    2222#
    2323# You should have received a copy of the GNU General Public License
    24 # along with this program; if not, write to the Free Software
    25 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    26 # 02110-1301, USA.
     24# along with this program; if not, see <http://www.gnu.org/licenses/>.
    2725#
    2826# As a special exception to the GNU General Public License, if you
    2927# distribute this file as part of a program that contains a
    … …  
    3230
    3331
    3432# Please send patches to <config-patches@gnu.org>.  Submit a context
    35 # diff and a properly formatted ChangeLog entry.
     33# diff and a properly formatted GNU ChangeLog entry.
    3634#
    3735# Configuration subroutine to validate and canonicalize a configuration type.
    3836# Supply the specified configuration type as an argument.
    3937# If it is invalid, we print an error message on stderr and exit with code 1.
    4038# Otherwise, we print the canonical config type on stdout and succeed.
    4139
     40# You can get the latest version of this script from:
     41# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
     42
    4243# This file is supposed to be the same for all GNU packages
    4344# and recognize all the CPU types, system types and aliases
    4445# that are meaningful with *any* GNU software.
    … …  
    7273version="\
    7374GNU config.sub ($timestamp)
    7475
    75 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    76 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
     76Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
     772001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
     78Free Software Foundation, Inc.
    7779
    7880This is free software; see the source for copying conditions.  There is NO
    7981warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    … …  
    120122# Here we must recognize all the valid KERNEL-OS combinations.
    121123maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    122124case $maybe_os in
    123   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
    124   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
     125  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
     126  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
     127  knetbsd*-gnu* | netbsd*-gnu* | \
    125128  kopensolaris*-gnu* | \
    126129  storm-chaos* | os2-emx* | rtmk-nova*)
    127130    os=-$maybe_os
    128131    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    129132    ;;
     133  android-linux)
     134    os=-linux-android
     135    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     136    ;;
    130137  *)
    131138    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    132139    if [ $basic_machine != $1 ]
    … …  
    149156        -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
    150157        -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
    151158        -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
    152         -apple | -axis | -knuth | -cray)
     159        -apple | -axis | -knuth | -cray | -microblaze)
    153160                os=
    154161                basic_machine=$1
    155162                ;;
     163        -bluegene*)
     164                os=-cnk
     165                ;;
    156166        -sim | -cisco | -oki | -wec | -winbond)
    157167                os=
    158168                basic_machine=$1
    … …  
    167177                os=-chorusos
    168178                basic_machine=$1
    169179                ;;
    170         -chorusrdb)
    171                 os=-chorusrdb
     180        -chorusrdb)
     181                os=-chorusrdb
    172182                basic_machine=$1
    173                 ;;
     183                ;;
    174184        -hiux*)
    175185                os=-hiuxwe2
    176186                ;;
    … …  
    215225        -isc*)
    216226                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    217227                ;;
     228        -lynx*178)
     229                os=-lynxos178
     230                ;;
     231        -lynx*5)
     232                os=-lynxos5
     233                ;;
    218234        -lynx*)
    219235                os=-lynxos
    220236                ;;
    … …  
    239255        # Some are omitted here because they have special meanings below.
    240256        1750a | 580 \
    241257        | a29k \
     258        | aarch64 | aarch64_be \
    242259        | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
    243260        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
    244261        | am33_2.0 \
    245262        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
     263        | be32 | be64 \
    246264        | bfin \
    247265        | c4x | clipper \
    248266        | d10v | d30v | dlx | dsp16xx \
     267        | epiphany \
    249268        | fido | fr30 | frv \
    250269        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
     270        | hexagon \
    251271        | i370 | i860 | i960 | ia64 \
    252272        | ip2k | iq2000 \
     273        | le32 | le64 \
    253274        | lm32 \
    254275        | m32c | m32r | m32rle | m68000 | m68k | m88k \
    255276        | maxq | mb | microblaze | mcore | mep | metag \
    … …  
    275296        | moxie \
    276297        | mt \
    277298        | msp430 \
     299        | nds32 | nds32le | nds32be \
    278300        | nios | nios2 \
    279301        | ns16k | ns32k \
     302        | open8 \
    280303        | or32 \
    281304        | pdp10 | pdp11 | pj | pjl \
    282         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
     305        | powerpc | powerpc64 | powerpc64le | powerpcle \
    283306        | pyramid \
     307        | rl78 | rx \
    284308        | score \
    285309        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
    286310        | sh64 | sh64le \
    287311        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
    288312        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
    289         | spu | strongarm \
    290         | tahoe | thumb | tic4x | tic80 | tron \
    291         | v850 | v850e \
     313        | spu \
     314        | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
     315        | ubicom32 \
     316        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
    292317        | we32k \
    293         | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
     318        | x86 | xc16x | xstormy16 | xtensa \
    294319        | z8k | z80)
    295320                basic_machine=$basic_machine-unknown
    296321                ;;
    297         m6811 | m68hc11 | m6812 | m68hc12)
    298                 # Motorola 68HC11/12.
     322        c54x)
     323                basic_machine=tic54x-unknown
     324                ;;
     325        c55x)
     326                basic_machine=tic55x-unknown
     327                ;;
     328        c6x)
     329                basic_machine=tic6x-unknown
     330                ;;
     331        m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
    299332                basic_machine=$basic_machine-unknown
    300333                os=-none
    301334                ;;
    … …  
    305338                basic_machine=mt-unknown
    306339                ;;
    307340
     341        strongarm | thumb | xscale)
     342                basic_machine=arm-unknown
     343                ;;
     344        xgate)
     345                basic_machine=$basic_machine-unknown
     346                os=-none
     347                ;;
     348        xscaleeb)
     349                basic_machine=armeb-unknown
     350                ;;
     351
     352        xscaleel)
     353                basic_machine=armel-unknown
     354                ;;
     355
    308356        # We use `pc' rather than `unknown'
    309357        # because (1) that's what they normally are, and
    310358        # (2) the word "unknown" tends to confuse beginning users.
    … …  
    319367        # Recognize the basic CPU types with company name.
    320368        580-* \
    321369        | a29k-* \
     370        | aarch64-* | aarch64_be-* \
    322371        | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
    323372        | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
    324373        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
    325374        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
    326375        | avr-* | avr32-* \
     376        | be32-* | be64-* \
    327377        | bfin-* | bs2000-* \
    328         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
     378        | c[123]* | c30-* | [cjt]90-* | c4x-* \
    329379        | clipper-* | craynv-* | cydra-* \
    330380        | d10v-* | d30v-* | dlx-* \
    331381        | elxsi-* \
    332382        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
    333383        | h8300-* | h8500-* \
    334384        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
     385        | hexagon-* \
    335386        | i*86-* | i860-* | i960-* | ia64-* \
    336387        | ip2k-* | iq2000-* \
     388        | le32-* | le64-* \
    337389        | lm32-* \
    338390        | m32c-* | m32r-* | m32rle-* \
    339391        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
    340         | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
     392        | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
    341393        | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
    342394        | mips16-* \
    343395        | mips64-* | mips64el-* \
    … …  
    359411        | mmix-* \
    360412        | mt-* \
    361413        | msp430-* \
     414        | nds32-* | nds32le-* | nds32be-* \
    362415        | nios-* | nios2-* \
    363416        | none-* | np1-* | ns16k-* | ns32k-* \
     417        | open8-* \
    364418        | orion-* \
    365419        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    366         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
     420        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
    367421        | pyramid-* \
    368         | romp-* | rs6000-* \
     422        | rl78-* | romp-* | rs6000-* | rx-* \
    369423        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
    370424        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
    371425        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
    372426        | sparclite-* \
    373         | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
    374         | tahoe-* | thumb-* \
    375         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
     427        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
     428        | tahoe-* \
     429        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
     430        | tile*-* \
    376431        | tron-* \
    377         | v850-* | v850e-* | vax-* \
     432        | ubicom32-* \
     433        | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
     434        | vax-* \
    378435        | we32k-* \
    379         | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
     436        | x86-* | x86_64-* | xc16x-* | xps100-* \
    380437        | xstormy16-* | xtensa*-* \
    381438        | ymp-* \
    382439        | z8k-* | z80-*)
    … …  
    401458                basic_machine=a29k-amd
    402459                os=-udi
    403460                ;;
    404         abacus)
     461        abacus)
    405462                basic_machine=abacus-unknown
    406463                ;;
    407464        adobe68k)
    … …  
    467524                basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
    468525                os=-linux
    469526                ;;
     527        bluegene*)
     528                basic_machine=powerpc-ibm
     529                os=-cnk
     530                ;;
     531        c54x-*)
     532                basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
     533                ;;
     534        c55x-*)
     535                basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
     536                ;;
     537        c6x-*)
     538                basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
     539                ;;
    470540        c90)
    471541                basic_machine=c90-cray
    472542                os=-unicos
    473543                ;;
    474         cegcc)
     544        cegcc)
    475545                basic_machine=arm-unknown
    476546                os=-cegcc
    477547                ;;
    … …  
    503573                basic_machine=craynv-cray
    504574                os=-unicosmp
    505575                ;;
    506         cr16)
     576        cr16 | cr16-*)
    507577                basic_machine=cr16-unknown
    508578                os=-elf
    509579                ;;
    … …  
    661731        i370-ibm* | ibm*)
    662732                basic_machine=i370-ibm
    663733                ;;
    664 # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
    665734        i*86v32)
    666735                basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
    667736                os=-sysv32
    … …  
    719788                basic_machine=ns32k-utek
    720789                os=-sysv
    721790                ;;
     791        microblaze)
     792                basic_machine=microblaze-xilinx
     793                ;;
    722794        mingw32)
    723795                basic_machine=i386-pc
    724796                os=-mingw32
    … …  
    755827        ms1-*)
    756828                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
    757829                ;;
     830        msys)
     831                basic_machine=i386-pc
     832                os=-msys
     833                ;;
    758834        mvs)
    759835                basic_machine=i370-ibm
    760836                os=-mvs
    761837                ;;
     838        nacl)
     839                basic_machine=le32-unknown
     840                os=-nacl
     841                ;;
    762842        ncr3000)
    763843                basic_machine=i486-ncr
    764844                os=-sysv4
    … …  
    823903        np1)
    824904                basic_machine=np1-gould
    825905                ;;
     906        neo-tandem)
     907                basic_machine=neo-tandem
     908                ;;
     909        nse-tandem)
     910                basic_machine=nse-tandem
     911                ;;
    826912        nsr-tandem)
    827913                basic_machine=nsr-tandem
    828914                ;;
    … …  
    905991                ;;
    906992        power)  basic_machine=power-ibm
    907993                ;;
    908         ppc)    basic_machine=powerpc-unknown
     994        ppc | ppcbe)    basic_machine=powerpc-unknown
    909995                ;;
    910         ppc-*)  basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
     996        ppc-* | ppcbe-*)
     997                basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
    911998                ;;
    912999        ppcle | powerpclittle | ppc-le | powerpc-little)
    9131000                basic_machine=powerpcle-unknown
    … …  
    10011088                basic_machine=i860-stratus
    10021089                os=-sysv4
    10031090                ;;
     1091        strongarm-* | thumb-*)
     1092                basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
     1093                ;;
    10041094        sun2)
    10051095                basic_machine=m68000-sun
    10061096                ;;
    … …  
    10571147                basic_machine=t90-cray
    10581148                os=-unicos
    10591149                ;;
    1060         tic54x | c54x*)
    1061                 basic_machine=tic54x-unknown
    1062                 os=-coff
    1063                 ;;
    1064         tic55x | c55x*)
    1065                 basic_machine=tic55x-unknown
    1066                 os=-coff
    1067                 ;;
    1068         tic6x | c6x*)
    1069                 basic_machine=tic6x-unknown
    1070                 os=-coff
    1071                 ;;
    10721150        tile*)
    1073                 basic_machine=tile-unknown
     1151                basic_machine=$basic_machine-unknown
    10741152                os=-linux-gnu
    10751153                ;;
    10761154        tx39)
    … …  
    11401218        xps | xps100)
    11411219                basic_machine=xps100-honeywell
    11421220                ;;
     1221        xscale-* | xscalee[bl]-*)
     1222                basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
     1223                ;;
    11431224        ymp)
    11441225                basic_machine=ymp-cray
    11451226                os=-unicos
    … …  
    12371318if [ x"$os" != x"" ]
    12381319then
    12391320case $os in
    1240         # First match some system type aliases
    1241         # that might get confused with valid system types.
     1321        # First match some system type aliases
     1322        # that might get confused with valid system types.
    12421323        # -solaris* is a basic system type, with this one exception.
     1324        -auroraux)
     1325                os=-auroraux
     1326                ;;
    12431327        -solaris1 | -solaris1.*)
    12441328                os=`echo $os | sed -e 's|solaris1|sunos4|'`
    12451329                ;;
    … …  
    12601344        # Each alternative MUST END IN A *, to match a version number.
    12611345        # -sysv* is not here because it comes later, after sysvr4.
    12621346        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
    1263               | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
    1264               | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
    1265               | -kopensolaris* \
     1347              | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
     1348              | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
     1349              | -sym* | -kopensolaris* \
    12661350              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
    12671351              | -aos* | -aros* \
    12681352              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
    … …  
    12741358              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
    12751359              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
    12761360              | -chorusos* | -chorusrdb* | -cegcc* \
    1277               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    1278               | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
     1361              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
     1362              | -mingw32* | -linux-gnu* | -linux-android* \
     1363              | -linux-newlib* | -linux-uclibc* \
    12791364              | -uxpv* | -beos* | -mpeix* | -udk* \
    12801365              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
    12811366              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
    … …  
    12831368              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
    12841369              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    12851370              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
    1286               | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
     1371              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
    12871372        # Remember, each alternative MUST END IN *, to match a version number.
    12881373                ;;
    12891374        -qnx*)
    … …  
    13221407        -opened*)
    13231408                os=-openedition
    13241409                ;;
    1325         -os400*)
     1410        -os400*)
    13261411                os=-os400
    13271412                ;;
    13281413        -wince*)
    … …  
    13711456        -sinix*)
    13721457                os=-sysv4
    13731458                ;;
    1374         -tpf*)
     1459        -tpf*)
    13751460                os=-tpf
    13761461                ;;
    13771462        -triton*)
    … …  
    14161501        -dicos*)
    14171502                os=-dicos
    14181503                ;;
     1504        -nacl*)
     1505                ;;
    14191506        -none)
    14201507                ;;
    14211508        *)
    … …  
    14381525# system, and we'll never get to this point.
    14391526
    14401527case $basic_machine in
    1441         score-*)
     1528        score-*)
    14421529                os=-elf
    14431530                ;;
    1444         spu-*)
     1531        spu-*)
    14451532                os=-elf
    14461533                ;;
    14471534        *-acorn)
    … …  
    14531540        arm*-semi)
    14541541                os=-aout
    14551542                ;;
    1456         c4x-* | tic4x-*)
    1457                 os=-coff
     1543        c4x-* | tic4x-*)
     1544                os=-coff
     1545                ;;
     1546        hexagon-*)
     1547                os=-elf
     1548                ;;
     1549        tic54x-*)
     1550                os=-coff
     1551                ;;
     1552        tic55x-*)
     1553                os=-coff
     1554                ;;
     1555        tic6x-*)
     1556                os=-coff
    14581557                ;;
    14591558        # This must come before the *-dec entry.
    14601559        pdp10-*)
    … …  
    14741573                ;;
    14751574        m68000-sun)
    14761575                os=-sunos3
    1477                 # This also exists in the configure program, but was not the
    1478                 # default.
    1479                 # os=-sunos4
    14801576                ;;
    14811577        m68*-cisco)
    14821578                os=-aout
    14831579                ;;
    1484         mep-*)
     1580        mep-*)
    14851581                os=-elf
    14861582                ;;
    14871583        mips*-cisco)
    … …  
    15081604        *-ibm)
    15091605                os=-aix
    15101606                ;;
    1511         *-knuth)
     1607        *-knuth)
    15121608                os=-mmixware
    15131609                ;;
    15141610        *-wec)
    … …  
    16131709                        -sunos*)
    16141710                                vendor=sun
    16151711                                ;;
    1616                         -aix*)
     1712                        -cnk*|-aix*)
    16171713                                vendor=ibm
    16181714                                ;;
    16191715                        -beos*)

  • ufraw-0.19.2/depcomp 

    diff -ru ufraw-0.19.2/depcomp 0.19.2_1/ufraw-0.19.2/depcomp
    old new  
    11#! /bin/sh
    22# depcomp - compile a program generating dependencies as side-effects
    33
    4 scriptversion=2009-04-28.21; # UTC
     4scriptversion=2012-03-27.16; # UTC
    55
    6 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
    7 # Software Foundation, Inc.
     6# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
     7# 2011, 2012 Free Software Foundation, Inc.
    88
    99# This program is free software; you can redistribute it and/or modify
    1010# it under the terms of the GNU General Public License as published by
    … …  
    2828
    2929case $1 in
    3030  '')
    31      echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
     31     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
    3232     exit 1;
    3333     ;;
    3434  -h | --h*)
    … …  
    4040
    4141Environment variables:
    4242  depmode     Dependency tracking mode.
    43   source      Source file read by `PROGRAMS ARGS'.
    44   object      Object file output by `PROGRAMS ARGS'.
     43  source      Source file read by 'PROGRAMS ARGS'.
     44  object      Object file output by 'PROGRAMS ARGS'.
    4545  DEPDIR      directory where to store dependencies.
    4646  depfile     Dependency file to output.
    47   tmpdepfile  Temporary file to use when outputing dependencies.
     47  tmpdepfile  Temporary file to use when outputting dependencies.
    4848  libtool     Whether libtool is used (yes/no).
    4949
    5050Report bugs to <bug-automake@gnu.org>.
    … …  
    5757    ;;
    5858esac
    5959
     60# A tabulation character.
     61tab='   '
     62# A newline character.
     63nl='
     64'
     65
    6066if test -z "$depmode" || test -z "$source" || test -z "$object"; then
    6167  echo "depcomp: Variables source, object and depmode must be set" 1>&2
    6268  exit 1
    … …  
    9096   # This is just like msvisualcpp but w/o cygpath translation.
    9197   # Just convert the backslash-escaped backslashes to single forward
    9298   # slashes to satisfy depend.m4
    93    cygpath_u="sed s,\\\\\\\\,/,g"
     99   cygpath_u='sed s,\\\\,/,g'
    94100   depmode=msvisualcpp
    95101fi
    96102
     103if test "$depmode" = msvc7msys; then
     104   # This is just like msvc7 but w/o cygpath translation.
     105   # Just convert the backslash-escaped backslashes to single forward
     106   # slashes to satisfy depend.m4
     107   cygpath_u='sed s,\\\\,/,g'
     108   depmode=msvc7
     109fi
     110
     111if test "$depmode" = xlc; then
     112   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
     113   gccflag=-qmakedep=gcc,-MF
     114   depmode=gcc
     115fi
     116
    97117case "$depmode" in
    98118gcc3)
    99119## gcc 3 implements dependency tracking that does exactly what
    … …  
    148168## The second -e expression handles DOS-style file names with drive letters.
    149169  sed -e 's/^[^:]*: / /' \
    150170      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
    151 ## This next piece of magic avoids the `deleted header file' problem.
     171## This next piece of magic avoids the "deleted header file" problem.
    152172## The problem is that when a header file which appears in a .P file
    153173## is deleted, the dependency causes make to die (because there is
    154174## typically no way to rebuild the header).  We avoid this by adding
    155175## dummy dependencies for each header file.  Too bad gcc doesn't do
    156176## this for us directly.
    157   tr ' ' '
    158 ' < "$tmpdepfile" |
    159 ## Some versions of gcc put a space before the `:'.  On the theory
     177  tr ' ' "$nl" < "$tmpdepfile" |
     178## Some versions of gcc put a space before the ':'.  On the theory
    160179## that the space means something, we add a space to the output as
    161 ## well.
     180## well.  hp depmode also adds that space, but also prefixes the VPATH
     181## to the object.  Take care to not repeat it in the output.
    162182## Some versions of the HPUX 10.20 sed can't process this invocation
    163183## correctly.  Breaking it into two sed invocations is a workaround.
    164     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
     184    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
     185      | sed -e 's/$/ :/' >> "$depfile"
    165186  rm -f "$tmpdepfile"
    166187  ;;
    167188
    … …  
    193214    # clever and replace this with sed code, as IRIX sed won't handle
    194215    # lines with more than a fixed number of characters (4096 in
    195216    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
    196     # the IRIX cc adds comments like `#:fec' to the end of the
     217    # the IRIX cc adds comments like '#:fec' to the end of the
    197218    # dependency line.
    198     tr ' ' '
    199 ' < "$tmpdepfile" \
     219    tr ' ' "$nl" < "$tmpdepfile" \
    200220    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
    201     tr '
    202 ' ' ' >> "$depfile"
     221    tr "$nl" ' ' >> "$depfile"
    203222    echo >> "$depfile"
    204223
    205224    # The second pass generates a dummy entry for each header file.
    206     tr ' ' '
    207 ' < "$tmpdepfile" \
     225    tr ' ' "$nl" < "$tmpdepfile" \
    208226   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    209227   >> "$depfile"
    210228  else
    … …  
    216234  rm -f "$tmpdepfile"
    217235  ;;
    218236
     237xlc)
     238  # This case exists only to let depend.m4 do its work.  It works by
     239  # looking at the text of this script.  This case will never be run,
     240  # since it is checked for above.
     241  exit 1
     242  ;;
     243
    219244aix)
    220245  # The C for AIX Compiler uses -M and outputs the dependencies
    221246  # in a .u file.  In older versions, this file always lives in the
    222   # current directory.  Also, the AIX compiler puts `$object:' at the
     247  # current directory.  Also, the AIX compiler puts '$object:' at the
    223248  # start of each line; $object doesn't have directory information.
    224249  # Version 6 uses the directory in both cases.
    225250  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    … …  
    249274    test -f "$tmpdepfile" && break
    250275  done
    251276  if test -f "$tmpdepfile"; then
    252     # Each line is of the form `foo.o: dependent.h'.
     277    # Each line is of the form 'foo.o: dependent.h'.
    253278    # Do two passes, one to just change these to
    254     # `$object: dependent.h' and one to simply `dependent.h:'.
     279    # '$object: dependent.h' and one to simply 'dependent.h:'.
    255280    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
    256     # That's a tab and a space in the [].
    257     sed -e 's,^.*\.[a-z]*:[      ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
     281    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    258282  else
    259283    # The sourcefile does not contain any dependencies, so just
    260284    # store a dummy comment line, to avoid errors with the Makefile
    … …  
    265289  ;;
    266290
    267291icc)
    268   # Intel's C compiler understands `-MD -MF file'.  However on
    269   #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
     292  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
     293  # However on
     294  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
    270295  # ICC 7.0 will fill foo.d with something like
    271296  #    foo.o: sub/foo.c
    272297  #    foo.o: sub/foo.h
    273   # which is wrong.  We want:
     298  # which is wrong.  We want
    274299  #    sub/foo.o: sub/foo.c
    275300  #    sub/foo.o: sub/foo.h
    276301  #    sub/foo.c:
    277302  #    sub/foo.h:
    278303  # ICC 7.1 will output
    279304  #    foo.o: sub/foo.c sub/foo.h
    280   # and will wrap long lines using \ :
     305  # and will wrap long lines using '\':
    281306  #    foo.o: sub/foo.c ... \
    282307  #     sub/foo.h ... \
    283308  #     ...
    284 
     309  # tcc 0.9.26 (FIXME still under development at the moment of writing)
     310  # will emit a similar output, but also prepend the continuation lines
     311  # with horizontal tabulation characters.
    285312  "$@" -MD -MF "$tmpdepfile"
    286313  stat=$?
    287314  if test $stat -eq 0; then :
    … …  
    290317    exit $stat
    291318  fi
    292319  rm -f "$depfile"
    293   # Each line is of the form `foo.o: dependent.h',
    294   # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
     320  # Each line is of the form 'foo.o: dependent.h',
     321  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
    295322  # Do two passes, one to just change these to
    296   # `$object: dependent.h' and one to simply `dependent.h:'.
    297   sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
    298   # Some versions of the HPUX 10.20 sed can't process this invocation
    299   # correctly.  Breaking it into two sed invocations is a workaround.
    300   sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
    301     sed -e 's/$/ :/' >> "$depfile"
     323  # '$object: dependent.h' and one to simply 'dependent.h:'.
     324  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
     325    < "$tmpdepfile" > "$depfile"
     326  sed '
     327    s/[ '"$tab"'][ '"$tab"']*/ /g
     328    s/^ *//
     329    s/ *\\*$//
     330    s/^[^:]*: *//
     331    /^$/d
     332    /:$/d
     333    s/$/ :/
     334  ' < "$tmpdepfile" >> "$depfile"
    302335  rm -f "$tmpdepfile"
    303336  ;;
    304337
    … …  
    334367  done
    335368  if test -f "$tmpdepfile"; then
    336369    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
    337     # Add `dependent.h:' lines.
     370    # Add 'dependent.h:' lines.
    338371    sed -ne '2,${
    339372               s/^ *//
    340373               s/ \\*$//
    … …  
    349382
    350383tru64)
    351384   # The Tru64 compiler uses -MD to generate dependencies as a side
    352    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
     385   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    353386   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
    354    # dependencies in `foo.d' instead, so we check for that too.
     387   # dependencies in 'foo.d' instead, so we check for that too.
    355388   # Subdirectories are respected.
    356389   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    357390   test "x$dir" = "x$object" && dir=
    … …  
    397430   done
    398431   if test -f "$tmpdepfile"; then
    399432      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
    400       # That's a tab and a space in the [].
    401       sed -e 's,^.*\.[a-z]*:[    ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
     433      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    402434   else
    403435      echo "#dummy" > "$depfile"
    404436   fi
    405437   rm -f "$tmpdepfile"
    406438   ;;
    407439
     440msvc7)
     441  if test "$libtool" = yes; then
     442    showIncludes=-Wc,-showIncludes
     443  else
     444    showIncludes=-showIncludes
     445  fi
     446  "$@" $showIncludes > "$tmpdepfile"
     447  stat=$?
     448  grep -v '^Note: including file: ' "$tmpdepfile"
     449  if test "$stat" = 0; then :
     450  else
     451    rm -f "$tmpdepfile"
     452    exit $stat
     453  fi
     454  rm -f "$depfile"
     455  echo "$object : \\" > "$depfile"
     456  # The first sed program below extracts the file names and escapes
     457  # backslashes for cygpath.  The second sed program outputs the file
     458  # name when reading, but also accumulates all include files in the
     459  # hold buffer in order to output them again at the end.  This only
     460  # works with sed implementations that can handle large buffers.
     461  sed < "$tmpdepfile" -n '
     462/^Note: including file:  *\(.*\)/ {
     463  s//\1/
     464  s/\\/\\\\/g
     465  p
     466}' | $cygpath_u | sort -u | sed -n '
     467s/ /\\ /g
     468s/\(.*\)/'"$tab"'\1 \\/p
     469s/.\(.*\) \\/\1:/
     470H
     471$ {
     472  s/.*/'"$tab"'/
     473  G
     474  p
     475}' >> "$depfile"
     476  rm -f "$tmpdepfile"
     477  ;;
     478
     479msvc7msys)
     480  # This case exists only to let depend.m4 do its work.  It works by
     481  # looking at the text of this script.  This case will never be run,
     482  # since it is checked for above.
     483  exit 1
     484  ;;
     485
    408486#nosideeffect)
    409487  # This comment above is used by automake to tell side-effect
    410488  # dependency tracking mechanisms from slower ones.
    … …  
    422500    shift
    423501  fi
    424502
    425   # Remove `-o $object'.
     503  # Remove '-o $object'.
    426504  IFS=" "
    427505  for arg
    428506  do
    … …  
    442520  done
    443521
    444522  test -z "$dashmflag" && dashmflag=-M
    445   # Require at least two characters before searching for `:'
     523  # Require at least two characters before searching for ':'
    446524  # in the target name.  This is to cope with DOS-style filenames:
    447   # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
     525  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
    448526  "$@" $dashmflag |
    449     sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
     527    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
    450528  rm -f "$depfile"
    451529  cat < "$tmpdepfile" > "$depfile"
    452   tr ' ' '
    453 ' < "$tmpdepfile" | \
     530  tr ' ' "$nl" < "$tmpdepfile" | \
    454531## Some versions of the HPUX 10.20 sed can't process this invocation
    455532## correctly.  Breaking it into two sed invocations is a workaround.
    456533    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
    … …  
    503580  touch "$tmpdepfile"
    504581  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
    505582  rm -f "$depfile"
    506   cat < "$tmpdepfile" > "$depfile"
    507   sed '1,2d' "$tmpdepfile" | tr ' ' '
    508 ' | \
     583  # makedepend may prepend the VPATH from the source file name to the object.
     584  # No need to regex-escape $object, excess matching of '.' is harmless.
     585  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
     586  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
    509587## Some versions of the HPUX 10.20 sed can't process this invocation
    510588## correctly.  Breaking it into two sed invocations is a workaround.
    511589    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
    … …  
    525603    shift
    526604  fi
    527605
    528   # Remove `-o $object'.
     606  # Remove '-o $object'.
    529607  IFS=" "
    530608  for arg
    531609  do
    … …  
    594672  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
    595673  rm -f "$depfile"
    596674  echo "$object : \\" > "$depfile"
    597   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::      \1 \\:p' >> "$depfile"
    598   echo "        " >> "$depfile"
     675  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
     676  echo "$tab" >> "$depfile"
    599677  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
    600678  rm -f "$tmpdepfile"
    601679  ;;

  • ufraw-0.19.2/install-sh 

    diff -ru ufraw-0.19.2/install-sh 0.19.2_1/ufraw-0.19.2/install-sh
    old new  
    11#!/bin/sh
    22# install - install a program, script, or datafile
    33
    4 scriptversion=2009-04-28.21; # UTC
     4scriptversion=2011-01-19.21; # UTC
    55
    66# This originates from X11R5 (mit/util/scripts/install.sh), which was
    77# later released in X11R6 (xc/config/util/install.sh) with the
    … …  
    156156    -s) stripcmd=$stripprog;;
    157157
    158158    -t) dst_arg=$2
     159        # Protect names problematic for `test' and other utilities.
     160        case $dst_arg in
     161          -* | [=\(\)!]) dst_arg=./$dst_arg;;
     162        esac
    159163        shift;;
    160164
    161165    -T) no_target_directory=true;;
    … …  
    186190    fi
    187191    shift # arg
    188192    dst_arg=$arg
     193    # Protect names problematic for `test' and other utilities.
     194    case $dst_arg in
     195      -* | [=\(\)!]) dst_arg=./$dst_arg;;
     196    esac
    189197  done
    190198fi
    191199
    … …  
    200208fi
    201209
    202210if test -z "$dir_arg"; then
    203   trap '(exit $?); exit' 1 2 13 15
     211  do_exit='(exit $ret); exit $ret'
     212  trap "ret=129; $do_exit" 1
     213  trap "ret=130; $do_exit" 2
     214  trap "ret=141; $do_exit" 13
     215  trap "ret=143; $do_exit" 15
    204216
    205217  # Set umask so as not to create temps with too-generous modes.
    206218  # However, 'strip' requires both read and write access to temps.
    … …  
    228240
    229241for src
    230242do
    231   # Protect names starting with `-'.
     243  # Protect names problematic for `test' and other utilities.
    232244  case $src in
    233     -*) src=./$src;;
     245    -* | [=\(\)!]) src=./$src;;
    234246  esac
    235247
    236248  if test -n "$dir_arg"; then
    … …  
    252264      echo "$0: no destination specified." >&2
    253265      exit 1
    254266    fi
    255 
    256267    dst=$dst_arg
    257     # Protect names starting with `-'.
    258     case $dst in
    259       -*) dst=./$dst;;
    260     esac
    261268
    262269    # If destination is a directory, append the input filename; won't work
    263270    # if double slashes aren't ignored.
    … …  
    385392
    386393      case $dstdir in
    387394        /*) prefix='/';;
    388         -*) prefix='./';;
     395        [-=\(\)!]*) prefix='./';;
    389396        *)  prefix='';;
    390397      esac
    391398
    … …  
    403410
    404411      for d
    405412      do
    406         test -z "$d" && continue
     413        test X"$d" = X && continue
    407414
    408415        prefix=$prefix$d
    409416        if test -d "$prefix"; then

  • ufraw-0.19.2/missing 

    diff -ru ufraw-0.19.2/missing 0.19.2_1/ufraw-0.19.2/missing
    old new  
    11#! /bin/sh
    22# Common stub for a few missing GNU programs while installing.
    33
    4 scriptversion=2009-04-28.21; # UTC
     4scriptversion=2012-01-06.13; # UTC
    55
    66# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
    7 # 2008, 2009 Free Software Foundation, Inc.
     7# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
    88# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
    99
    1010# This program is free software; you can redistribute it and/or modify
    … …  
    8484  help2man     touch the output file
    8585  lex          create \`lex.yy.c', if possible, from existing .c
    8686  makeinfo     touch the output file
    87   tar          try tar, gnutar, gtar, then tar without non-portable flags
    8887  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
    8988
    9089Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
    … …  
    122121    # Not GNU programs, they don't have --version.
    123122    ;;
    124123
    125   tar*)
    126     if test -n "$run"; then
    127        echo 1>&2 "ERROR: \`tar' requires --run"
    128        exit 1
    129     elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
    130        exit 1
    131     fi
    132     ;;
    133 
    134124  *)
    135125    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
    136126       # We have it, but it failed.
    … …  
    226216         \`Bison' from any GNU archive site."
    227217    rm -f y.tab.c y.tab.h
    228218    if test $# -ne 1; then
    229         eval LASTARG="\${$#}"
     219        eval LASTARG=\${$#}
    230220        case $LASTARG in
    231221        *.y)
    232222            SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
    … …  
    256246         \`Flex' from any GNU archive site."
    257247    rm -f lex.yy.c
    258248    if test $# -ne 1; then
    259         eval LASTARG="\${$#}"
     249        eval LASTARG=\${$#}
    260250        case $LASTARG in
    261251        *.l)
    262252            SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
    … …  
    318308    touch $file
    319309    ;;
    320310
    321   tar*)
    322     shift
    323 
    324     # We have already tried tar in the generic part.
    325     # Look for gnutar/gtar before invocation to avoid ugly error
    326     # messages.
    327     if (gnutar --version > /dev/null 2>&1); then
    328        gnutar "$@" && exit 0
    329     fi
    330     if (gtar --version > /dev/null 2>&1); then
    331        gtar "$@" && exit 0
    332     fi
    333     firstarg="$1"
    334     if shift; then
    335         case $firstarg in
    336         *o*)
    337             firstarg=`echo "$firstarg" | sed s/o//`
    338             tar "$firstarg" "$@" && exit 0
    339             ;;
    340         esac
    341         case $firstarg in
    342         *h*)
    343             firstarg=`echo "$firstarg" | sed s/h//`
    344             tar "$firstarg" "$@" && exit 0
    345             ;;
    346         esac
    347     fi
    348 
    349     echo 1>&2 "\
    350 WARNING: I can't seem to be able to run \`tar' with the given arguments.
    351          You may want to install GNU tar or Free paxutils, or check the
    352          command line arguments."
    353     exit 1
    354     ;;
    355 
    356311  *)
    357312    echo 1>&2 "\
    358313WARNING: \`$1' is needed, and is $msg.