From: Gerfried Fuchs <alfie@debian.org>
Date: Wed, 2 Aug 2006 14:15:46 +0000 (-0500)
Subject: Imported Debian patch 0.5.6-1
X-Git-Tag: debian/0.5.6-1^0
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=ec21e25ffd8fe61704ae3588bcad4570de2946ac;hp=-c;p=pkg%2Fabook.git

Imported Debian patch 0.5.6-1
---

ec21e25ffd8fe61704ae3588bcad4570de2946ac
diff --combined config.guess
index ad5281e,ba66165..c38553d
mode 100755,100644..100644
--- a/config.guess
+++ b/config.guess
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Attempt to guess a canonical system name.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -#   Free Software Foundation, Inc.
 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
- timestamp='2005-08-03'
 -timestamp='2001-04-20'
++timestamp='2006-02-23'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
@@@ -17,18 -17,15 +17,18 @@@
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
 +# 02110-1301, USA.
  #
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
 -# Written by Per Bothner <bothner@cygnus.com>.
 -# Please send patches to <config-patches@gnu.org>.
 +
 +# Originally written by Per Bothner <per@bothner.com>.
 +# Please send patches to <config-patches@gnu.org>.  Submit a context
 +# diff and a properly formatted ChangeLog entry.
  #
  # This script attempts to guess a canonical system name similar to
  # config.sub.  If it succeeds, it prints the system name on stdout, and
@@@ -55,7 -52,7 +55,7 @@@ version="
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
 -Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
@@@ -68,11 -65,11 +68,11 @@@ Try \`$me --help' for more information.
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
 -       echo "$timestamp" ; exit 0 ;;
 +       echo "$timestamp" ; exit ;;
      --version | -v )
 -       echo "$version" ; exit 0 ;;
 +       echo "$version" ; exit ;;
      --help | --h* | -h )
 -       echo "$usage"; exit 0 ;;
 +       echo "$usage"; exit ;;
      -- )     # Stop option processing
         shift; break ;;
      - )	# Use stdin as input.
@@@ -90,45 -87,33 +90,45 @@@ if test $# != 0; the
    exit 1
  fi
  
 +trap 'exit 1' 1 2 15
  
 -dummy=dummy-$$
 -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 +# compiler to aid in system detection is discouraged as it requires
 +# temporary files to be created and, as you can see below, it is a
 +# headache to deal with in a portable fashion.
  
 -# CC_FOR_BUILD -- compiler used by this script.
  # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
  # use `HOST_CC' if defined, but it is deprecated.
  
 +# Portable tmp directory creation inspired by the Autoconf team.
 +
 +set_cc_for_build='
 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 +: ${TMPDIR=/tmp} ;
-  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 +dummy=$tmp/dummy ;
 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
  case $CC_FOR_BUILD,$HOST_CC,$CC in
 - ,,)    echo "int dummy(){}" > $dummy.c
 -	for c in cc gcc c89 ; do
 -	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
 -	  if test $? = 0 ; then
 -	     CC_FOR_BUILD="$c"; break
 -	  fi
 -	done
 -	rm -f $dummy.c $dummy.o $dummy.rel
 + ,,)    echo "int x;" > $dummy.c ;
 +	for c in cc gcc c89 c99 ; do
 +	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
 +	     CC_FOR_BUILD="$c"; break ;
 +	  fi ;
 +	done ;
  	if test x"$CC_FOR_BUILD" = x ; then
 -	  CC_FOR_BUILD=no_compiler_found
 +	  CC_FOR_BUILD=no_compiler_found ;
  	fi
  	;;
   ,,*)   CC_FOR_BUILD=$CC ;;
   ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
 -esac
 +esac ; set_cc_for_build= ;'
  
  # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 -# (ghazi@noc.rutgers.edu 8/24/94.)
 +# (ghazi@noc.rutgers.edu 1994-08-24)
  if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
  	PATH=$PATH:/.attbin ; export PATH
  fi
@@@ -142,31 -127,29 +142,31 @@@ UNAME_VERSION=`(uname -v) 2>/dev/null` 
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
      *:NetBSD:*:*)
 -	# Netbsd (nbsd) targets should (where applicable) match one or
 +	# NetBSD (nbsd) targets should (where applicable) match one or
  	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
  	# switched to ELF, *-*-netbsd* would select the old
  	# object file format.  This provides both forward
  	# compatibility and a consistent mechanism for selecting the
  	# object file format.
 -	# Determine the machine/vendor (is the vendor relevant).
 -	case "${UNAME_MACHINE}" in
 -	    amiga) machine=m68k-unknown ;;
 -	    arm32) machine=arm-unknown ;;
 -	    atari*) machine=m68k-atari ;;
 -	    sun3*) machine=m68k-sun ;;
 -	    mac68k) machine=m68k-apple ;;
 -	    macppc) machine=powerpc-apple ;;
 -	    hp3[0-9][05]) machine=m68k-hp ;;
 -	    ibmrt|romp-ibm) machine=romp-ibm ;;
 -	    *) machine=${UNAME_MACHINE}-unknown ;;
 +	#
 +	# Note: NetBSD doesn't particularly care about the vendor
 +	# portion of the name.  We always set it to "unknown".
 +	sysctl="sysctl -n hw.machine_arch"
 +	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
 +	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 +	case "${UNAME_MACHINE_ARCH}" in
 +	    armeb) machine=armeb-unknown ;;
 +	    arm*) machine=arm-unknown ;;
 +	    sh3el) machine=shl-unknown ;;
 +	    sh3eb) machine=sh-unknown ;;
 +	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
  	# to ELF recently, or will in the future.
 -	case "${UNAME_MACHINE}" in
 -	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
 +	case "${UNAME_MACHINE_ARCH}" in
 +	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 +		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
  			| grep __ELF__ >/dev/null
  		then
@@@ -182,125 -165,116 +182,128 @@@
  		;;
  	esac
  	# The OS release
 -	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 +	# Debian GNU/NetBSD machines have a different userland, and
 +	# thus, need a distinct triplet. However, they do not need
 +	# kernel version information, so it can be replaced with a
 +	# suitable tag, in the style of linux-gnu.
 +	case "${UNAME_VERSION}" in
 +	    Debian*)
 +		release='-gnu'
 +		;;
 +	    *)
 +		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 +		;;
 +	esac
  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
  	# contains redundant information, the shorter form:
  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
  	echo "${machine}-${os}${release}"
 -	exit 0 ;;
 +	exit ;;
 +    *:OpenBSD:*:*)
 +	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 +	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 +	exit ;;
 +    *:ekkoBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 +	exit ;;
++    *:SolidBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
++	exit ;;
 +    macppc:MirBSD:*:*)
 +	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 +	exit ;;
 +    *:MirBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 +	exit ;;
      alpha:OSF1:*:*)
 -	if test $UNAME_RELEASE = "V4.0"; then
 +	case $UNAME_RELEASE in
 +	*4.0)
  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 -	fi
 +		;;
 +	*5.*)
 +	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 +		;;
 +	esac
 +	# According to Compaq, /usr/sbin/psrinfo has been available on
 +	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 +	# covers most systems running today.  This code pipes the CPU
 +	# types through head -n 1, so we only detect the type of CPU 0.
 +	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 +	case "$ALPHA_CPU_TYPE" in
 +	    "EV4 (21064)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "EV4.5 (21064)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "LCA4 (21066/21068)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "EV5 (21164)")
 +		UNAME_MACHINE="alphaev5" ;;
 +	    "EV5.6 (21164A)")
 +		UNAME_MACHINE="alphaev56" ;;
 +	    "EV5.6 (21164PC)")
 +		UNAME_MACHINE="alphapca56" ;;
 +	    "EV5.7 (21164PC)")
 +		UNAME_MACHINE="alphapca57" ;;
 +	    "EV6 (21264)")
 +		UNAME_MACHINE="alphaev6" ;;
 +	    "EV6.7 (21264A)")
 +		UNAME_MACHINE="alphaev67" ;;
 +	    "EV6.8CB (21264C)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.8AL (21264B)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.8CX (21264D)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.9A (21264/EV69A)")
 +		UNAME_MACHINE="alphaev69" ;;
 +	    "EV7 (21364)")
 +		UNAME_MACHINE="alphaev7" ;;
 +	    "EV7.9 (21364A)")
 +		UNAME_MACHINE="alphaev79" ;;
 +	esac
 +	# A Pn.n version is a patched version.
  	# A Vn.n version is a released version.
  	# A Tn.n version is a released field test version.
  	# A Xn.n version is an unreleased experimental baselevel.
  	# 1.2 uses "1.2" for uname -r.
 -	cat <<EOF >$dummy.s
 -	.data
 -\$Lformat:
 -	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
 -
 -	.text
 -	.globl main
 -	.align 4
 -	.ent main
 -main:
 -	.frame \$30,16,\$26,0
 -	ldgp \$29,0(\$27)
 -	.prologue 1
 -	.long 0x47e03d80 # implver \$0
 -	lda \$2,-1
 -	.long 0x47e20c21 # amask \$2,\$1
 -	lda \$16,\$Lformat
 -	mov \$0,\$17
 -	not \$1,\$18
 -	jsr \$26,printf
 -	ldgp \$29,0(\$26)
 -	mov 0,\$16
 -	jsr \$26,exit
 -	.end main
 -EOF
 -	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 -	if test "$?" = 0 ; then
 -		case `./$dummy` in
 -			0-0)
 -				UNAME_MACHINE="alpha"
 -				;;
 -			1-0)
 -				UNAME_MACHINE="alphaev5"
 -				;;
 -			1-1)
 -				UNAME_MACHINE="alphaev56"
 -				;;
 -			1-101)
 -				UNAME_MACHINE="alphapca56"
 -				;;
 -			2-303)
 -				UNAME_MACHINE="alphaev6"
 -				;;
 -			2-307)
 -				UNAME_MACHINE="alphaev67"
 -				;;
 -		esac
 -	fi
 -	rm -f $dummy.s $dummy
 -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 -	exit 0 ;;
 +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 +	exit ;;
      Alpha\ *:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# Should we change UNAME_MACHINE based on the output of uname instead
  	# of the specific Alpha model?
  	echo alpha-pc-interix
 -	exit 0 ;;
 +	exit ;;
      21064:Windows_NT:50:3)
  	echo alpha-dec-winnt3.5
 -	exit 0 ;;
 +	exit ;;
      Amiga*:UNIX_System_V:4.0:*)
  	echo m68k-unknown-sysv4
 -	exit 0;;
 -    amiga:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:[Aa]miga[Oo][Ss]:*:*)
  	echo ${UNAME_MACHINE}-unknown-amigaos
 -	exit 0 ;;
 -    arc64:OpenBSD:*:*)
 -	echo mips64el-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    arc:OpenBSD:*:*)
 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    hkmips:OpenBSD:*:*)
 -	echo mips-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    pmax:OpenBSD:*:*)
 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    sgi:OpenBSD:*:*)
 -	echo mips-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    wgrisc:OpenBSD:*:*)
 -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
 +    *:[Mm]orph[Oo][Ss]:*:*)
 +	echo ${UNAME_MACHINE}-unknown-morphos
 +	exit ;;
      *:OS/390:*:*)
  	echo i370-ibm-openedition
 -	exit 0 ;;
 +	exit ;;
 +    *:z/VM:*:*)
 +	echo s390-ibm-zvmoe
 +	exit ;;
 +    *:OS400:*:*)
 +        echo powerpc-ibm-os400
 +	exit ;;
      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
  	echo arm-acorn-riscix${UNAME_RELEASE}
 -	exit 0;;
 +	exit ;;
 +    arm:riscos:*:*|arm:RISCOS:*:*)
 +	echo arm-unknown-riscos
 +	exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
  	echo hppa1.1-hitachi-hiuxmpp
 -	exit 0;;
 +	exit ;;
      Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
  	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
  	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@@ -308,32 -282,25 +311,32 @@@
  	else
  		echo pyramid-pyramid-bsd
  	fi
 -	exit 0 ;;
 +	exit ;;
      NILE*:*:*:dcosx)
  	echo pyramid-pyramid-svr4
 -	exit 0 ;;
 +	exit ;;
 +    DRS?6000:unix:4.0:6*)
 +	echo sparc-icl-nx6
 +	exit ;;
 +    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 +	case `/usr/bin/uname -p` in
 +	    sparc) echo sparc-icl-nx7; exit ;;
 +	esac ;;
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
 +	exit ;;
      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
 +	exit ;;
      i86pc:SunOS:5.*:*)
  	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
 +	exit ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
  	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
  	# it's likely to be more like Solaris than SunOS4.
  	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
 +	exit ;;
      sun4*:SunOS:*:*)
  	case "`/usr/bin/arch -k`" in
  	    Series*|S4*)
@@@ -342,12 -309,12 +345,12 @@@
  	esac
  	# Japanese Language versions have a version number like `4.1.3-JL'.
  	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
 -	exit 0 ;;
 +	exit ;;
      sun3*:SunOS:*:*)
  	echo m68k-sun-sunos${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      sun*:*:4.2BSD:*)
 -	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 +	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
  	case "`/bin/arch`" in
  	    sun3)
@@@ -357,10 -324,13 +360,10 @@@
  		echo sparc-sun-sunos${UNAME_RELEASE}
  		;;
  	esac
 -	exit 0 ;;
 +	exit ;;
      aushp:SunOS:*:*)
  	echo sparc-auspex-sunos${UNAME_RELEASE}
 -	exit 0 ;;
 -    atari*:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      # The situation for MiNT is a little confusing.  The machine name
      # can be virtually everything (everything which is not
      # "atarist" or "atariste" at least should have a processor
@@@ -371,42 -341,50 +374,42 @@@
      # be no problem.
      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
  	echo m68k-atari-mint${UNAME_RELEASE}
 -        exit 0 ;;
 +        exit ;;
      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
          echo m68k-atari-mint${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
          echo m68k-milan-mint${UNAME_RELEASE}
 -        exit 0 ;;
 +        exit ;;
      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
          echo m68k-hades-mint${UNAME_RELEASE}
 -        exit 0 ;;
 +        exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
          echo m68k-unknown-mint${UNAME_RELEASE}
 -        exit 0 ;;
 -    sun3*:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    mac68k:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    mvme68k:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 -    mvme88k:OpenBSD:*:*)
 -	echo m88k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 +        exit ;;
 +    m68k:machten:*:*)
 +	echo m68k-apple-machten${UNAME_RELEASE}
 +	exit ;;
      powerpc:machten:*:*)
  	echo powerpc-apple-machten${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      RISC*:Mach:*:*)
  	echo mips-dec-mach_bsd4.3
 -	exit 0 ;;
 +	exit ;;
      RISC*:ULTRIX:*:*)
  	echo mips-dec-ultrix${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      VAX*:ULTRIX*:*:*)
  	echo vax-dec-ultrix${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      2020:CLIX:*:* | 2430:CLIX:*:*)
  	echo clipper-intergraph-clix${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      mips:*:*:UMIPS | mips:*:*:RISCos)
 +	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  #ifdef __cplusplus
  #include <stdio.h>  /* for printf() prototype */
@@@ -428,33 -406,27 +431,33 @@@
  	  exit (-1);
  	}
  EOF
 -	$CC_FOR_BUILD $dummy.c -o $dummy \
 -	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
 -	  && rm -f $dummy.c $dummy && exit 0
 -	rm -f $dummy.c $dummy
 +	$CC_FOR_BUILD -o $dummy $dummy.c &&
 +	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
 +	  SYSTEM_NAME=`$dummy $dummyarg` &&
 +	    { echo "$SYSTEM_NAME"; exit; }
  	echo mips-mips-riscos${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      Motorola:PowerMAX_OS:*:*)
  	echo powerpc-motorola-powermax
 -	exit 0 ;;
 +	exit ;;
 +    Motorola:*:4.3:PL8-*)
 +	echo powerpc-harris-powermax
 +	exit ;;
 +    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 +	echo powerpc-harris-powermax
 +	exit ;;
      Night_Hawk:Power_UNIX:*:*)
  	echo powerpc-harris-powerunix
 -	exit 0 ;;
 +	exit ;;
      m88k:CX/UX:7*:*)
  	echo m88k-harris-cxux7
 -	exit 0 ;;
 +	exit ;;
      m88k:*:4*:R4*)
  	echo m88k-motorola-sysv4
 -	exit 0 ;;
 +	exit ;;
      m88k:*:3*:R3*)
  	echo m88k-motorola-sysv3
 -	exit 0 ;;
 +	exit ;;
      AViiON:dgux:*:*)
          # DG/UX returns AViiON for all architectures
          UNAME_PROCESSOR=`/usr/bin/uname -p`
@@@ -470,29 -442,29 +473,29 @@@
  	else
  	    echo i586-dg-dgux${UNAME_RELEASE}
  	fi
 - 	exit 0 ;;
 + 	exit ;;
      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
  	echo m88k-dolphin-sysv3
 -	exit 0 ;;
 +	exit ;;
      M88*:*:R3*:*)
  	# Delta 88k system running SVR3
  	echo m88k-motorola-sysv3
 -	exit 0 ;;
 +	exit ;;
      XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
  	echo m88k-tektronix-sysv3
 -	exit 0 ;;
 +	exit ;;
      Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
  	echo m68k-tektronix-bsd
 -	exit 0 ;;
 +	exit ;;
      *:IRIX*:*:*)
  	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 -	exit 0 ;;
 +	exit ;;
      ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
 -	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
 -	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
 +	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
 +	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
      i*86:AIX:*:*)
  	echo i386-ibm-aix
 -	exit 0 ;;
 +	exit ;;
      ia64:AIX:*:*)
  	if [ -x /usr/bin/oslevel ] ; then
  		IBM_REV=`/usr/bin/oslevel`
@@@ -500,10 -472,9 +503,10 @@@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
 -	exit 0 ;;
 +	exit ;;
      *:AIX:2:3)
  	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 +		eval $set_cc_for_build
  		sed 's/^		//' << EOF >$dummy.c
  		#include <sys/systemcfg.h>
  
@@@ -515,20 -486,17 +518,20 @@@
  			exit(0);
  			}
  EOF
 -		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 -		rm -f $dummy.c $dummy
 -		echo rs6000-ibm-aix3.2.5
 +		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
 +		then
 +			echo "$SYSTEM_NAME"
 +		else
 +			echo rs6000-ibm-aix3.2.5
 +		fi
  	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
  		echo rs6000-ibm-aix3.2.4
  	else
  		echo rs6000-ibm-aix3.2
  	fi
 -	exit 0 ;;
 +	exit ;;
      *:AIX:*:[45])
 -	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
 +	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
  	else
@@@ -540,36 -508,38 +543,36 @@@
  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
  	fi
  	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 -	exit 0 ;;
 +	exit ;;
      *:AIX:*:*)
  	echo rs6000-ibm-aix
 -	exit 0 ;;
 +	exit ;;
      ibmrt:4.4BSD:*|romp-ibm:BSD:*)
  	echo romp-ibm-bsd4.4
 -	exit 0 ;;
 +	exit ;;
      ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
  	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 -	exit 0 ;;                           # report: romp-ibm BSD 4.3
 +	exit ;;                             # report: romp-ibm BSD 4.3
      *:BOSX:*:*)
  	echo rs6000-bull-bosx
 -	exit 0 ;;
 +	exit ;;
      DPX/2?00:B.O.S.:*:*)
  	echo m68k-bull-sysv3
 -	exit 0 ;;
 +	exit ;;
      9000/[34]??:4.3bsd:1.*:*)
  	echo m68k-hp-bsd
 -	exit 0 ;;
 +	exit ;;
      hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
  	echo m68k-hp-bsd4.4
 -	exit 0 ;;
 +	exit ;;
      9000/[34678]??:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	case "${UNAME_MACHINE}" in
  	    9000/31? )            HP_ARCH=m68000 ;;
  	    9000/[34]?? )         HP_ARCH=m68k ;;
  	    9000/[678][0-9][0-9])
 -              case "${HPUX_REV}" in
 -                11.[0-9][0-9])
 -                  if [ -x /usr/bin/getconf ]; then
 -                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 +		if [ -x /usr/bin/getconf ]; then
 +		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                      sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                      case "${sc_cpu_version}" in
                        523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
@@@ -578,13 -548,12 +581,13 @@@
                          case "${sc_kernel_bits}" in
                            32) HP_ARCH="hppa2.0n" ;;
                            64) HP_ARCH="hppa2.0w" ;;
 +			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                          esac ;;
                      esac
 -                  fi ;;
 -              esac
 -              if [ "${HP_ARCH}" = "" ]; then
 -              sed 's/^              //' << EOF >$dummy.c
 +		fi
 +		if [ "${HP_ARCH}" = "" ]; then
 +		    eval $set_cc_for_build
 +		    sed 's/^              //' << EOF >$dummy.c
  
                #define _HPUX_SOURCE
                #include <stdlib.h>
@@@ -617,39 -586,18 +620,39 @@@
                    exit (0);
                }
  EOF
 -	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
 -	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
 -	rm -f $dummy.c $dummy
 -	fi ;;
 +		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 +		    test -z "$HP_ARCH" && HP_ARCH=hppa
 +		fi ;;
  	esac
 +	if [ ${HP_ARCH} = "hppa2.0w" ]
 +	then
 +	    eval $set_cc_for_build
 +
 +	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
 +	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
 +	    # generating 64-bit code.  GNU and HP use different nomenclature:
 +	    #
 +	    # $ CC_FOR_BUILD=cc ./config.guess
 +	    # => hppa2.0w-hp-hpux11.23
 +	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 +	    # => hppa64-hp-hpux11.23
 +
 +	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
 +		grep __LP64__ >/dev/null
 +	    then
 +		HP_ARCH="hppa2.0w"
 +	    else
 +		HP_ARCH="hppa64"
 +	    fi
 +	fi
  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 -	exit 0 ;;
 +	exit ;;
      ia64:HP-UX:*:*)
  	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
  	echo ia64-hp-hpux${HPUX_REV}
 -	exit 0 ;;
 +	exit ;;
      3050*:HI-UX:*:*)
 +	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  	#include <unistd.h>
  	int
@@@ -675,227 -623,239 +678,246 @@@
  	  exit (0);
  	}
  EOF
 -	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
 -	rm -f $dummy.c $dummy
 +	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
 +		{ echo "$SYSTEM_NAME"; exit; }
  	echo unknown-hitachi-hiuxwe2
 -	exit 0 ;;
 +	exit ;;
      9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
  	echo hppa1.1-hp-bsd
 -	exit 0 ;;
 +	exit ;;
      9000/8??:4.3bsd:*:*)
  	echo hppa1.0-hp-bsd
 -	exit 0 ;;
 -    *9??*:MPE/iX:*:*)
 +	exit ;;
 +    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
  	echo hppa1.0-hp-mpeix
 -	exit 0 ;;
 +	exit ;;
      hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
  	echo hppa1.1-hp-osf
 -	exit 0 ;;
 +	exit ;;
      hp8??:OSF1:*:*)
  	echo hppa1.0-hp-osf
 -	exit 0 ;;
 +	exit ;;
      i*86:OSF1:*:*)
  	if [ -x /usr/sbin/sysversion ] ; then
  	    echo ${UNAME_MACHINE}-unknown-osf1mk
  	else
  	    echo ${UNAME_MACHINE}-unknown-osf1
  	fi
 -	exit 0 ;;
 +	exit ;;
      parisc*:Lites*:*:*)
  	echo hppa1.1-hp-lites
 -	exit 0 ;;
 -    hppa*:OpenBSD:*:*)
 -	echo hppa-unknown-openbsd
 -	exit 0 ;;
 +	exit ;;
      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
  	echo c1-convex-bsd
 -        exit 0 ;;
 +        exit ;;
      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
  	if getsysinfo -f scalar_acc
  	then echo c32-convex-bsd
  	else echo c2-convex-bsd
  	fi
 -        exit 0 ;;
 +        exit ;;
      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
  	echo c34-convex-bsd
 -        exit 0 ;;
 +        exit ;;
      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
  	echo c38-convex-bsd
 -        exit 0 ;;
 +        exit ;;
      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
  	echo c4-convex-bsd
 -        exit 0 ;;
 -    CRAY*X-MP:*:*:*)
 -	echo xmp-cray-unicos
 -        exit 0 ;;
 +        exit ;;
      CRAY*Y-MP:*:*:*)
 -	echo ymp-cray-unicos${UNAME_RELEASE}
 -	exit 0 ;;
 +	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
      CRAY*[A-Z]90:*:*:*)
  	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
  	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 -	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 -	exit 0 ;;
 +	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 +	      -e 's/\.[^.]*$/.X/'
 +	exit ;;
      CRAY*TS:*:*:*)
  	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 -	exit 0 ;;
 -    CRAY*T3D:*:*:*)
 -	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 -	exit 0 ;;
 +	exit ;;
      CRAY*T3E:*:*:*)
  	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 -	exit 0 ;;
 +	exit ;;
      CRAY*SV1:*:*:*)
  	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 -	exit 0 ;;
 -    CRAY-2:*:*:*)
 -	echo cray2-cray-unicos
 -        exit 0 ;;
 +	exit ;;
 +    *:UNICOS/mp:*:*)
 +	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
  	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
          FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 -        exit 0 ;;
 -    hp300:OpenBSD:*:*)
 -	echo m68k-unknown-openbsd${UNAME_RELEASE}
 -	exit 0 ;;
 +        exit ;;
 +    5000:UNIX_System_V:4.*:*)
 +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 +        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 +        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +	exit ;;
      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      sparc*:BSD/OS:*:*)
  	echo sparc-unknown-bsdi${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:BSD/OS:*:*)
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:FreeBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 -	exit 0 ;;
 -    *:OpenBSD:*:*)
 -	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 -	exit 0 ;;
++	case ${UNAME_MACHINE} in
++	    pc98)
++		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
 +	exit ;;
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
 -	exit 0 ;;
 +	exit ;;
      i*:MINGW*:*)
  	echo ${UNAME_MACHINE}-pc-mingw32
 -	exit 0 ;;
 +	exit ;;
++    i*:MSYS_NT-*:*:*)
++	echo ${UNAME_MACHINE}-pc-mingw32
++	exit ;;
 +    i*:windows32*:*)
 +    	# uname -m includes "-pc" on this system.
 +    	echo ${UNAME_MACHINE}-mingw32
 +	exit ;;
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
 -	exit 0 ;;
 +	exit ;;
-     x86:Interix*:[34]*)
- 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
++    x86:Interix*:[345]*)
++	echo i586-pc-interix${UNAME_RELEASE}
++	exit ;;
++    EM64T:Interix*:[345]*)
++	echo x86_64-unknown-interix${UNAME_RELEASE}
 +	exit ;;
 +    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 +	echo i${UNAME_MACHINE}-pc-mks
 +	exit ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
  	# UNAME_MACHINE based on the output of uname instead of i386?
 -	echo i386-pc-interix
 -	exit 0 ;;
 +	echo i586-pc-interix
 +	exit ;;
      i*:UWIN*:*)
  	echo ${UNAME_MACHINE}-pc-uwin
 -	exit 0 ;;
 +	exit ;;
 +    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 +	echo x86_64-unknown-cygwin
 +	exit ;;
      p*:CYGWIN*:*)
  	echo powerpcle-unknown-cygwin
 -	exit 0 ;;
 +	exit ;;
      prep*:SunOS:5.*:*)
  	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 -	exit 0 ;;
 +	exit ;;
      *:GNU:*:*)
 +	# the GNU system
  	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 -	exit 0 ;;
 +	exit ;;
 +    *:GNU/*:*:*)
 +	# other systems with GNU libc and userland
 +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 +	exit ;;
      i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
 -	exit 0 ;;
 +	exit ;;
      arm*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
 +    cris:Linux:*:*)
 +	echo cris-axis-linux-gnu
 +	exit ;;
 +    crisv32:Linux:*:*)
 +	echo crisv32-axis-linux-gnu
 +	exit ;;
 +    frv:Linux:*:*)
 +    	echo frv-unknown-linux-gnu
 +	exit ;;
      ia64:Linux:*:*)
 -	echo ${UNAME_MACHINE}-unknown-linux
 -	exit 0 ;;
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
 +    m32r*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
      mips:Linux:*:*)
 -	cat >$dummy.c <<EOF
 -#ifdef __cplusplus
 -#include <stdio.h>  /* for printf() prototype */
 -int main (int argc, char *argv[]) {
 -#else
 -int main (argc, argv) int argc; char *argv[]; {
 -#endif
 -#ifdef __MIPSEB__
 -  printf ("%s-unknown-linux-gnu\n", argv[1]);
 -#endif
 -#ifdef __MIPSEL__
 -  printf ("%sel-unknown-linux-gnu\n", argv[1]);
 -#endif
 -  return 0;
 -}
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#undef CPU
 +	#undef mips
 +	#undef mipsel
 +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 +	CPU=mipsel
 +	#else
 +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 +	CPU=mips
 +	#else
 +	CPU=
 +	#endif
 +	#endif
  EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 -	rm -f $dummy.c $dummy
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
 -    ppc:Linux:*:*)
 -	# Determine Lib Version
 -	cat >$dummy.c <<EOF
 -#include <features.h>
 -#if defined(__GLIBC__)
 -extern char __libc_version[];
 -extern char __libc_release[];
 -#endif
 -main(argc, argv)
 -     int argc;
 -     char *argv[];
 -{
 -#if defined(__GLIBC__)
 -  printf("%s %s\n", __libc_version, __libc_release);
 -#else
 -  printf("unknown\n");
 -#endif
 -  return 0;
 -}
 +    mips64:Linux:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#undef CPU
 +	#undef mips64
 +	#undef mips64el
 +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 +	CPU=mips64el
 +	#else
 +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 +	CPU=mips64
 +	#else
 +	CPU=
 +	#endif
 +	#endif
  EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
 -	LIBC=""
 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
 -	if test "$?" = 0 ; then
 -		./$dummy | grep 1\.99 > /dev/null
 -		if test "$?" = 0 ; then LIBC="libc1" ; fi
 -	fi
 -	rm -f $dummy.c $dummy
 -	echo powerpc-unknown-linux-gnu${LIBC}
 -	exit 0 ;;
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^CPU/{
++		s: ::g
++		p
++	    }'`"
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 +	;;
 +    or32:Linux:*:*)
 +	echo or32-unknown-linux-gnu
 +	exit ;;
 +    ppc:Linux:*:*)
 +	echo powerpc-unknown-linux-gnu
 +	exit ;;
 +    ppc64:Linux:*:*)
 +	echo powerpc64-unknown-linux-gnu
 +	exit ;;
      alpha:Linux:*:*)
 -	cat <<EOF >$dummy.s
 -	  .data
 -	  \$Lformat:
 -		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
 -	   .text
 -		.globl main
 -		.align 4
 -		.ent main
 -	    main:
 -		.frame \$30,16,\$26,0
 -		ldgp \$29,0(\$27)
 -		.prologue 1
 -		.long 0x47e03d80 # implver \$0
 -		lda \$2,-1
 -		.long 0x47e20c21 # amask \$2,\$1
 -		lda \$16,\$Lformat
 -		mov \$0,\$17
 -		not \$1,\$18
 -		jsr \$26,printf
 -		ldgp \$29,0(\$26)
 -		mov 0,\$16
 -		jsr \$26,exit
 -		.end main
 -EOF
 -	LIBC=""
 -	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 -	if test "$?" = 0 ; then
 -		case `./$dummy` in
 -		0-0)	UNAME_MACHINE="alpha" ;;
 -		1-0)	UNAME_MACHINE="alphaev5" ;;
 -		1-1)    UNAME_MACHINE="alphaev56" ;;
 -		1-101)	UNAME_MACHINE="alphapca56" ;;
 -		2-303)	UNAME_MACHINE="alphaev6" ;;
 -		2-307)	UNAME_MACHINE="alphaev67" ;;
 -		esac
 -		objdump --private-headers $dummy | \
 -		  grep ld.so.1 > /dev/null
 -		if test "$?" = 0 ; then
 -			LIBC="libc1"
 -		fi
 -	fi
 -	rm -f $dummy.s $dummy
 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
 +	  EV56)  UNAME_MACHINE=alphaev56 ;;
 +	  PCA56) UNAME_MACHINE=alphapca56 ;;
 +	  PCA57) UNAME_MACHINE=alphapca56 ;;
 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
 +        esac
 +	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 +	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
  	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 -	exit 0 ;;
 +	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@@ -903,90 -863,93 +925,97 @@@
  	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
  	  *)    echo hppa-unknown-linux-gnu ;;
  	esac
 -	exit 0 ;;
 +	exit ;;
      parisc64:Linux:*:* | hppa64:Linux:*:*)
  	echo hppa64-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo ${UNAME_MACHINE}-ibm-linux
 -	exit 0 ;;
 +	exit ;;
 +    sh64*:Linux:*:*)
 +    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +	exit ;;
      sh*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
++    vax:Linux:*:*)
++	echo ${UNAME_MACHINE}-dec-linux-gnu
++	exit ;;
      x86_64:Linux:*:*)
  	echo x86_64-unknown-linux-gnu
 -	exit 0 ;;
 +	exit ;;
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
  	# first see if it will tell us. cd to the root directory to prevent
  	# problems with other programs or directories called `ld' in the path.
 -	ld_supported_emulations=`cd /; ld --help 2>&1 \
 -			 | sed -ne '/supported emulations:/!d
 +	# Set LC_ALL=C to ensure ld outputs messages in English.
 +	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
 +			 | sed -ne '/supported targets:/!d
  				    s/[ 	][ 	]*/ /g
 -				    s/.*supported emulations: *//
 +				    s/.*supported targets: *//
  				    s/ .*//
  				    p'`
 -        case "$ld_supported_emulations" in
 -	  i*86linux)
 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 -		exit 0
 -		;;
 -	  elf_i*86)
 +        case "$ld_supported_targets" in
 +	  elf32-i386)
  		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
  		;;
 -	  i*86coff)
 +	  a.out-i386-linux)
 +		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 +		exit ;;
 +	  coff-i386)
  		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 -		exit 0
 -		;;
 -	esac
 -	# Either a pre-BFD a.out linker (linux-gnuoldld)
 -	# or one that does not give us useful --help.
 -	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
 -	# If ld does not provide *any* "supported emulations:"
 -	# that means it is gnuoldld.
 -	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
 -	case "${UNAME_MACHINE}" in
 -	i*86)
 -	  VENDOR=pc;
 -	  ;;
 -	*)
 -	  VENDOR=unknown;
 -	  ;;
 +		exit ;;
 +	  "")
 +		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 +		# one that does not give us useful --help.
 +		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 +		exit ;;
  	esac
  	# Determine whether the default compiler is a.out or elf
 -	cat >$dummy.c <<EOF
 -#include <features.h>
 -#ifdef __cplusplus
 -#include <stdio.h>  /* for printf() prototype */
 -	int main (int argc, char *argv[]) {
 -#else
 -	int main (argc, argv) int argc; char *argv[]; {
 -#endif
 -#ifdef __ELF__
 -# ifdef __GLIBC__
 -#  if __GLIBC__ >= 2
 -    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
 -#  else
 -    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
 -#  endif
 -# else
 -   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
 -# endif
 -#else
 -  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
 -#endif
 -  return 0;
 -}
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#include <features.h>
 +	#ifdef __ELF__
 +	# ifdef __GLIBC__
 +	#  if __GLIBC__ >= 2
 +	LIBC=gnu
 +	#  else
 +	LIBC=gnulibc1
 +	#  endif
 +	# else
 +	LIBC=gnulibc1
 +	# endif
 +	#else
- 	#ifdef __INTEL_COMPILER
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 +	LIBC=gnu
 +	#else
 +	LIBC=gnuaout
 +	#endif
 +	#endif
 +	#ifdef __dietlibc__
 +	LIBC=dietlibc
 +	#endif
  EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
 -	rm -f $dummy.c $dummy
 -	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
++	    /^LIBC/{
++		s: ::g
++		p
++	    }'`"
 +	test x"${LIBC}" != x && {
 +		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 +		exit
 +	}
 +	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
  	;;
 -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 -# are messed up and put the nodename in both sysname and nodename.
      i*86:DYNIX/ptx:4*:*)
 +	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 +	# earlier versions are messed up and put the nodename in both
 +	# sysname and nodename.
  	echo i386-sequent-sysv4
 -	exit 0 ;;
 +	exit ;;
      i*86:UNIX_SV:4.2MP:2.*)
          # Unixware is an offshoot of SVR4, but it has its own version
          # number series starting with 2...
@@@ -994,27 -957,7 +1023,27 @@@
  	# I just have to hope.  -- rms.
          # Use sysv4.2uw... so that sysv4* matches it.
  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 -	exit 0 ;;
 +	exit ;;
 +    i*86:OS/2:*:*)
 +	# If we were able to find `uname', then EMX Unix compatibility
 +	# is probably installed.
 +	echo ${UNAME_MACHINE}-pc-os2-emx
 +	exit ;;
 +    i*86:XTS-300:*:STOP)
 +	echo ${UNAME_MACHINE}-unknown-stop
 +	exit ;;
 +    i*86:atheos:*:*)
 +	echo ${UNAME_MACHINE}-unknown-atheos
 +	exit ;;
 +    i*86:syllable:*:*)
 +	echo ${UNAME_MACHINE}-pc-syllable
 +	exit ;;
 +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 +	echo i386-unknown-lynxos${UNAME_RELEASE}
 +	exit ;;
 +    i*86:*DOS:*:*)
 +	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 +	exit ;;
      i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
  	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
  	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@@ -1022,100 -965,100 +1051,100 @@@
  	else
  		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
  	fi
 -	exit 0 ;;
 -    i*86:*:5:7*)
 -        # Fixed at (any) Pentium or better
 -        UNAME_MACHINE=i586
 -        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
 -	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
 -	else
 -	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
 -	fi
 -	exit 0 ;;
 +	exit ;;
 +    i*86:*:5:[678]*)
 +    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 +	case `/bin/uname -X | grep "^Machine"` in
 +	    *486*)	     UNAME_MACHINE=i486 ;;
 +	    *Pentium)	     UNAME_MACHINE=i586 ;;
 +	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 +	esac
 +	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 +	exit ;;
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
  		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
  		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
  	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 -		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
 -		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 -		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 +		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 +		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
 +		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
  			&& UNAME_MACHINE=i586
 -		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 +		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
  			&& UNAME_MACHINE=i686
 -		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 +		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
  			&& UNAME_MACHINE=i686
  		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
  	else
  		echo ${UNAME_MACHINE}-pc-sysv32
  	fi
 -	exit 0 ;;
 -    i*86:*DOS:*:*)
 -	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 -	exit 0 ;;
 +	exit ;;
      pc:*:*:*)
  	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
          # the processor, so we play safe by assuming i386.
  	echo i386-pc-msdosdjgpp
 -        exit 0 ;;
 +        exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
 -	exit 0 ;;
 +	exit ;;
      paragon:*:*:*)
  	echo i860-intel-osf1
 -	exit 0 ;;
 +	exit ;;
      i860:*:4.*:*) # i860-SVR4
  	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
  	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
  	else # Add other i860-SVR4 vendors below as they are discovered.
  	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
  	fi
 -	exit 0 ;;
 +	exit ;;
      mini*:CTIX:SYS*5:*)
  	# "miniframe"
  	echo m68010-convergent-sysv
 -	exit 0 ;;
 -    M68*:*:R3V[567]*:*)
 -	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
 -    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
 +	exit ;;
 +    mc68k:UNIX:SYSTEM5:3.51m)
 +	echo m68k-convergent-sysv
 +	exit ;;
 +    M680?0:D-NIX:5.3:*)
 +	echo m68k-diab-dnix
 +	exit ;;
 +    M68*:*:R3V[5678]*:*)
 +	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
 +    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
  	OS_REL=''
  	test -r /etc/.relid \
  	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 -	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
 +	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 -	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
 +	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 -          && echo i486-ncr-sysv4 && exit 0 ;;
 +          && { echo i486-ncr-sysv4; exit; } ;;
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      mc68030:UNIX_System_V:4.*:*)
  	echo m68k-atari-sysv4
 -	exit 0 ;;
 -    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 -	echo i386-unknown-lynxos${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      TSUNAMI:LynxOS:2.*:*)
  	echo sparc-unknown-lynxos${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      SM[BE]S:UNIX_SV:*:*)
  	echo mips-dde-sysv${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      RM*:ReliantUNIX-*:*:*)
  	echo mips-sni-sysv4
 -	exit 0 ;;
 +	exit ;;
      RM*:SINIX-*:*:*)
  	echo mips-sni-sysv4
 -	exit 0 ;;
 +	exit ;;
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@@ -1123,99 -1066,78 +1152,98 @@@
  	else
  		echo ns32k-sni-sysv
  	fi
 -	exit 0 ;;
 -    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 -                           # says <Richard.M.Bartel@ccMail.Census.GOV>
 +	exit ;;
 +    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 +                      # says <Richard.M.Bartel@ccMail.Census.GOV>
          echo i586-unisys-sysv4
 -        exit 0 ;;
 +        exit ;;
      *:UNIX_System_V:4*:FTX*)
  	# From Gerald Hewes <hewes@openmarket.com>.
  	# How about differentiating between stratus architectures? -djm
  	echo hppa1.1-stratus-sysv4
 -	exit 0 ;;
 +	exit ;;
      *:*:*:FTX*)
  	# From seanf@swdc.stratus.com.
  	echo i860-stratus-sysv4
 -	exit 0 ;;
 +	exit ;;
 +    i*86:VOS:*:*)
 +	# From Paul.Green@stratus.com.
 +	echo ${UNAME_MACHINE}-stratus-vos
 +	exit ;;
 +    *:VOS:*:*)
 +	# From Paul.Green@stratus.com.
 +	echo hppa1.1-stratus-vos
 +	exit ;;
      mc68*:A/UX:*:*)
  	echo m68k-apple-aux${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      news*:NEWS-OS:6*:*)
  	echo mips-sony-newsos6
 -	exit 0 ;;
 +	exit ;;
      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
  	if [ -d /usr/nec ]; then
  	        echo mips-nec-sysv${UNAME_RELEASE}
  	else
  	        echo mips-unknown-sysv${UNAME_RELEASE}
  	fi
 -        exit 0 ;;
 +        exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  	echo powerpc-be-beos
 -	exit 0 ;;
 +	exit ;;
      BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
  	echo powerpc-apple-beos
 -	exit 0 ;;
 +	exit ;;
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
 -	exit 0 ;;
 +	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      SX-5:SUPER-UX:*:*)
  	echo sx5-nec-superux${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
 +    SX-6:SUPER-UX:*:*)
 +	echo sx6-nec-superux${UNAME_RELEASE}
 +	exit ;;
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:Rhapsody:*:*)
  	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:Darwin:*:*)
 -	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 -	exit 0 ;;
 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 +	case $UNAME_PROCESSOR in
- 	    *86) UNAME_PROCESSOR=i686 ;;
 +	    unknown) UNAME_PROCESSOR=powerpc ;;
 +	esac
 +	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 +	exit ;;
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
 -	if test "${UNAME_MACHINE}" = "x86pc"; then
 +	UNAME_PROCESSOR=`uname -p`
 +	if test "$UNAME_PROCESSOR" = "x86"; then
 +		UNAME_PROCESSOR=i386
  		UNAME_MACHINE=pc
  	fi
 -	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
 -	exit 0 ;;
 +	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
 +	exit ;;
      *:QNX:*:4*)
  	echo i386-pc-qnx
 -	exit 0 ;;
 -    NSR-[KW]:NONSTOP_KERNEL:*:*)
 +	exit ;;
 +    NSE-?:NONSTOP_KERNEL:*:*)
 +	echo nse-tandem-nsk${UNAME_RELEASE}
 +	exit ;;
 +    NSR-?:NONSTOP_KERNEL:*:*)
  	echo nsr-tandem-nsk${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:NonStop-UX:*:*)
  	echo mips-compaq-nonstopux
 -	exit 0 ;;
 +	exit ;;
      BS2000:POSIX*:*:*)
  	echo bs2000-siemens-sysv
 -	exit 0 ;;
 +	exit ;;
      DS/*:UNIX_System_V:*:*)
  	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 -	exit 0 ;;
 +	exit ;;
      *:Plan9:*:*)
  	# "uname -m" is not consistent, so use $cputype instead. 386
  	# is converted to i386 for consistency with other x86
@@@ -1226,50 -1148,35 +1254,53 @@@
  	    UNAME_MACHINE="$cputype"
  	fi
  	echo ${UNAME_MACHINE}-unknown-plan9
 -	exit 0 ;;
 -    i*86:OS/2:*:*)
 -	# If we were able to find `uname', then EMX Unix compatibility
 -	# is probably installed.
 -	echo ${UNAME_MACHINE}-pc-os2-emx
 -	exit 0 ;;
 +	exit ;;
      *:TOPS-10:*:*)
  	echo pdp10-unknown-tops10
 -	exit 0 ;;
 +	exit ;;
      *:TENEX:*:*)
  	echo pdp10-unknown-tenex
 -	exit 0 ;;
 +	exit ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  	echo pdp10-dec-tops20
 -	exit 0 ;;
 +	exit ;;
      XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
  	echo pdp10-xkl-tops20
 -	exit 0 ;;
 +	exit ;;
      *:TOPS-20:*:*)
  	echo pdp10-unknown-tops20
 -	exit 0 ;;
 +	exit ;;
      *:ITS:*:*)
  	echo pdp10-unknown-its
 -	exit 0 ;;
 +	exit ;;
 +    SEI:*:*:SEIUX)
 +        echo mips-sei-seiux${UNAME_RELEASE}
 +	exit ;;
 +    *:DragonFly:*:*)
 +	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 +	exit ;;
 +    *:*VMS:*:*)
 +    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +	case "${UNAME_MACHINE}" in
 +	    A*) echo alpha-dec-vms ; exit ;;
 +	    I*) echo ia64-dec-vms ; exit ;;
 +	    V*) echo vax-dec-vms ; exit ;;
 +	esac ;;
 +    *:XENIX:*:SysV)
 +	echo i386-pc-xenix
 +	exit ;;
 +    i*86:skyos:*:*)
 +	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 +	exit ;;
++    i*86:rdos:*:*)
++	echo ${UNAME_MACHINE}-pc-rdos
++	exit ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
  #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
  
 +eval $set_cc_for_build
  cat >$dummy.c <<EOF
  #ifdef _SEQUENT_
  # include <sys/types.h>
@@@ -1295,7 -1202,7 +1326,7 @@@ main (
  #endif
  
  #if defined (__arm) && defined (__acorn) && defined (__unix)
 -  printf ("arm-acorn-riscix"); exit (0);
 +  printf ("arm-acorn-riscix\n"); exit (0);
  #endif
  
  #if defined (hp300) && !defined (hpux)
@@@ -1384,12 -1291,12 +1415,12 @@@
  }
  EOF
  
 -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
 -rm -f $dummy.c $dummy
 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
 +	{ echo "$SYSTEM_NAME"; exit; }
  
  # Apollos put the system type in the environment.
  
 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
 +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
  
  # Convex versions that predate uname can use getsysinfo(1)
  
@@@ -1398,22 -1305,22 +1429,22 @@@ the
      case `getsysinfo -f cpu_type` in
      c1*)
  	echo c1-convex-bsd
 -	exit 0 ;;
 +	exit ;;
      c2*)
  	if getsysinfo -f scalar_acc
  	then echo c32-convex-bsd
  	else echo c2-convex-bsd
  	fi
 -	exit 0 ;;
 +	exit ;;
      c34*)
  	echo c34-convex-bsd
 -	exit 0 ;;
 +	exit ;;
      c38*)
  	echo c38-convex-bsd
 -	exit 0 ;;
 +	exit ;;
      c4*)
  	echo c4-convex-bsd
 -	exit 0 ;;
 +	exit ;;
      esac
  fi
  
@@@ -1424,9 -1331,7 +1455,9 @@@ This script, last modified $timestamp, 
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
 -    ftp://ftp.gnu.org/pub/gnu/config/
 +  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 +and
 +  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
diff --combined config.sub
index 1c366df,a06a480..ad9f395
mode 100755,100644..100644
--- a/config.sub
+++ b/config.sub
@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Configuration validation subroutine script.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -#   Free Software Foundation, Inc.
 +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
- timestamp='2005-07-08'
 -timestamp='2001-04-20'
++timestamp='2006-02-23'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@@ -21,17 -21,15 +21,17 @@@
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place - Suite 330,
 -# Boston, MA 02111-1307, USA.
 -
 +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
 +# 02110-1301, USA.
 +#
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
  # configuration script generated by Autoconf, you may include it under
  # the same distribution terms that you use for the rest of that program.
  
 -# Please send patches to <config-patches@gnu.org>.
 +
 +# Please send patches to <config-patches@gnu.org>.  Submit a context
 +# diff and a properly formatted ChangeLog entry.
  #
  # Configuration subroutine to validate and canonicalize a configuration type.
  # Supply the specified configuration type as an argument.
@@@ -71,7 -69,7 +71,7 @@@ Report bugs and patches to <config-patc
  version="\
  GNU config.sub ($timestamp)
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  Free Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
@@@ -84,11 -82,11 +84,11 @@@ Try \`$me --help' for more information.
  while test $# -gt 0 ; do
    case $1 in
      --time-stamp | --time* | -t )
 -       echo "$timestamp" ; exit 0 ;;
 +       echo "$timestamp" ; exit ;;
      --version | -v )
 -       echo "$version" ; exit 0 ;;
 +       echo "$version" ; exit ;;
      --help | --h* | -h )
 -       echo "$usage"; exit 0 ;;
 +       echo "$usage"; exit ;;
      -- )     # Stop option processing
         shift; break ;;
      - )	# Use stdin as input.
@@@ -100,7 -98,7 +100,7 @@@
      *local*)
         # First pass through any local machine types.
         echo $1
 -       exit 0;;
 +       exit ;;
  
      * )
         break ;;
@@@ -119,8 -117,7 +119,9 @@@ esa
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
-   nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-   kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
 -  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++  storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
@@@ -146,7 -143,7 +147,7 @@@ case $os i
  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
 -	-apple | -axis)
 +	-apple | -axis | -knuth | -cray)
  		os=
  		basic_machine=$1
  		;;
@@@ -160,17 -157,9 +161,21 @@@
  		os=-vxworks
  		basic_machine=$1
  		;;
 +	-chorusos*)
 +		os=-chorusos
 +		basic_machine=$1
 +		;;
 + 	-chorusrdb)
 + 		os=-chorusrdb
 +		basic_machine=$1
 + 		;;
  	-hiux*)
  		os=-hiuxwe2
  		;;
++	-sco6)
++		os=-sco5v6
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
  	-sco5)
  		os=-sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@@ -187,6 -176,6 +192,10 @@@
  		# Don't forget version if it is 3.2v4 or newer.
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
++	-sco5v6*)
++		# Don't forget version if it is 3.2v4 or newer.
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
  	-sco*)
  		os=-sco3.2v2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@@ -226,57 -215,26 +235,58 @@@ esa
  case $basic_machine in
  	# Recognize the basic CPU types without company name.
  	# Some are omitted here because they have special meanings below.
 -	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
 -	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
 -		| pyramid | mn10200 | mn10300 | tron | a29k \
 -		| 580 | i960 | h8300 \
 -		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
 -		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
 -		| hppa64 \
 -		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
 -		| alphaev6[78] \
 -		| we32k | ns16k | clipper | i370 | sh | sh[34] \
 -		| powerpc | powerpcle \
 -		| 1750a | dsp16xx | pdp10 | pdp11 \
 -		| mips16 | mips64 | mipsel | mips64el \
 -		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 -		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
 -		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
 -		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
 -		| v850 | c4x \
 -		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
 -		| pj | pjl | h8500)
 +	1750a | 580 \
 +	| a29k \
 +	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 +	| am33_2.0 \
 +	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 +	| bfin \
 +	| c4x | clipper \
 +	| d10v | d30v | dlx | dsp16xx \
 +	| fr30 | frv \
 +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| i370 | i860 | i960 | ia64 \
 +	| ip2k | iq2000 \
- 	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 +	| mips | mipsbe | mipseb | mipsel | mipsle \
 +	| mips16 \
 +	| mips64 | mips64el \
 +	| mips64vr | mips64vrel \
 +	| mips64orion | mips64orionel \
 +	| mips64vr4100 | mips64vr4100el \
 +	| mips64vr4300 | mips64vr4300el \
 +	| mips64vr5000 | mips64vr5000el \
 +	| mips64vr5900 | mips64vr5900el \
 +	| mipsisa32 | mipsisa32el \
 +	| mipsisa32r2 | mipsisa32r2el \
 +	| mipsisa64 | mipsisa64el \
 +	| mipsisa64r2 | mipsisa64r2el \
 +	| mipsisa64sb1 | mipsisa64sb1el \
 +	| mipsisa64sr71k | mipsisa64sr71kel \
 +	| mipstx39 | mipstx39el \
 +	| mn10200 | mn10300 \
- 	| ms1 \
++	| mt \
 +	| msp430 \
++	| nios | nios2 \
 +	| ns16k | ns32k \
 +	| or32 \
 +	| pdp10 | pdp11 | pj | pjl \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 +	| pyramid \
 +	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh64 | sh64le \
 +	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
 +	| sparcv8 | sparcv9 | sparcv9b \
 +	| strongarm \
 +	| tahoe | thumb | tic4x | tic80 | tron \
 +	| v850 | v850e \
 +	| we32k \
 +	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 +	| z8k)
 +		basic_machine=$basic_machine-unknown
 +		;;
 +	m32c)
  		basic_machine=$basic_machine-unknown
  		;;
  	m6811 | m68hc11 | m6812 | m68hc12)
@@@ -284,8 -242,8 +294,11 @@@
  		basic_machine=$basic_machine-unknown
  		os=-none
  		;;
 -	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 +		;;
++	ms1)
++		basic_machine=mt-unknown
+ 		;;
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
@@@ -299,67 -257,31 +312,68 @@@
  		exit 1
  		;;
  	# Recognize the basic CPU types with company name.
 -	# FIXME: clean up the formatting here.
 -	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 -	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
 -	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
 -	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 -	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 -	      | xmp-* | ymp-* \
 -	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
 -	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
 -	      | hppa2.0n-* | hppa64-* \
 -	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
 -	      | alphaev6[78]-* \
 -	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 -	      | clipper-* | orion-* \
 -	      | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
 -	      | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
 -	      | mips16-* | mips64-* | mipsel-* \
 -	      | mips64el-* | mips64orion-* | mips64orionel-* \
 -	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
 -	      | mipstx39-* | mipstx39el-* | mcore-* \
 -	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
 -	      | [cjt]90-* \
 -	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
 -	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
 -	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
 +	580-* \
 +	| a29k-* \
 +	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 +	| avr-* \
 +	| bfin-* | bs2000-* \
 +	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 +	| clipper-* | craynv-* | cydra-* \
 +	| d10v-* | d30v-* | dlx-* \
 +	| elxsi-* \
 +	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 +	| h8300-* | h8500-* \
 +	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 +	| i*86-* | i860-* | i960-* | ia64-* \
 +	| ip2k-* | iq2000-* \
 +	| m32r-* | m32rle-* \
 +	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 +	| m88110-* | m88k-* | maxq-* | mcore-* \
 +	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 +	| mips16-* \
 +	| mips64-* | mips64el-* \
 +	| mips64vr-* | mips64vrel-* \
 +	| mips64orion-* | mips64orionel-* \
 +	| mips64vr4100-* | mips64vr4100el-* \
 +	| mips64vr4300-* | mips64vr4300el-* \
 +	| mips64vr5000-* | mips64vr5000el-* \
 +	| mips64vr5900-* | mips64vr5900el-* \
 +	| mipsisa32-* | mipsisa32el-* \
 +	| mipsisa32r2-* | mipsisa32r2el-* \
 +	| mipsisa64-* | mipsisa64el-* \
 +	| mipsisa64r2-* | mipsisa64r2el-* \
 +	| mipsisa64sb1-* | mipsisa64sb1el-* \
 +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 +	| mipstx39-* | mipstx39el-* \
 +	| mmix-* \
- 	| ms1-* \
++	| mt-* \
 +	| msp430-* \
++	| nios-* | nios2-* \
 +	| none-* | np1-* | ns16k-* | ns32k-* \
 +	| orion-* \
 +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 +	| pyramid-* \
 +	| romp-* | rs6000-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
 +	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 +	| tahoe-* | thumb-* \
 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tron-* \
 +	| v850-* | v850e-* | vax-* \
 +	| we32k-* \
 +	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
 +	| xstormy16-* | xtensa-* \
 +	| ymp-* \
 +	| z8k-*)
 +		;;
 +	m32c-*)
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
@@@ -377,9 -299,6 +391,9 @@@
  		basic_machine=a29k-amd
  		os=-udi
  		;;
 +    	abacus)
 +		basic_machine=abacus-unknown
 +		;;
  	adobe68k)
  		basic_machine=m68010-adobe
  		os=-scout
@@@ -394,12 -313,6 +408,12 @@@
  		basic_machine=a29k-none
  		os=-bsd
  		;;
 +	amd64)
 +		basic_machine=x86_64-pc
 +		;;
 +	amd64-*)
 +		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
  	amdahl)
  		basic_machine=580-amdahl
  		os=-sysv
@@@ -431,10 -344,6 +445,10 @@@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
 +	c90)
 +		basic_machine=c90-cray
 +		os=-unicos
 +		;;
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
@@@ -455,45 -364,30 +469,45 @@@
  		basic_machine=c38-convex
  		os=-bsd
  		;;
 -	cray | ymp)
 -		basic_machine=ymp-cray
 +	cray | j90)
 +		basic_machine=j90-cray
  		os=-unicos
  		;;
 -	cray2)
 -		basic_machine=cray2-cray
 -		os=-unicos
 +	craynv)
 +		basic_machine=craynv-cray
 +		os=-unicosmp
  		;;
 -	[cjt]90)
 -		basic_machine=${basic_machine}-cray
 -		os=-unicos
 +	cr16c)
 +		basic_machine=cr16c-unknown
 +		os=-elf
  		;;
  	crds | unos)
  		basic_machine=m68k-crds
  		;;
 +	crisv32 | crisv32-* | etraxfs*)
 +		basic_machine=crisv32-axis
 +		;;
  	cris | cris-* | etrax*)
  		basic_machine=cris-axis
  		;;
 +	crx)
 +		basic_machine=crx-unknown
 +		os=-elf
 +		;;
  	da30 | da30-*)
  		basic_machine=m68k-da30
  		;;
  	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
  		basic_machine=mips-dec
  		;;
 +	decsystem10* | dec10*)
 +		basic_machine=pdp10-dec
 +		os=-tops10
 +		;;
 +	decsystem20* | dec20*)
 +		basic_machine=pdp10-dec
 +		os=-tops20
 +		;;
  	delta | 3300 | motorola-3300 | motorola-delta \
  	      | 3300-motorola | delta-motorola)
  		basic_machine=m68k-motorola
@@@ -502,10 -396,6 +516,10 @@@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
 +	djgpp)
 +		basic_machine=i586-pc
 +		os=-msdosdjgpp
 +		;;
  	dpx20 | dpx20-*)
  		basic_machine=rs6000-bull
  		os=-bosx
@@@ -678,24 -568,32 +692,27 @@@
  		basic_machine=m68k-atari
  		os=-mint
  		;;
 -	mipsel*-linux*)
 -		basic_machine=mipsel-unknown
 -		os=-linux-gnu
 -		;;
 -	mips*-linux*)
 -		basic_machine=mips-unknown
 -		os=-linux-gnu
 -		;;
  	mips3*-*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  		;;
  	mips3*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
  		;;
 -	mmix*)
 -		basic_machine=mmix-knuth
 -		os=-mmixware
 -		;;
  	monitor)
  		basic_machine=m68k-rom68k
  		os=-coff
  		;;
 +	morphos)
 +		basic_machine=powerpc-unknown
 +		os=-morphos
 +		;;
  	msdos)
  		basic_machine=i386-pc
  		os=-msdos
  		;;
++	ms1-*)
++		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++		;;
  	mvs)
  		basic_machine=i370-ibm
  		os=-mvs
@@@ -771,13 -669,6 +788,13 @@@
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
 +	openrisc | openrisc-*)
 +		basic_machine=or32-unknown
 +		;;
 +	os400)
 +		basic_machine=powerpc-ibm
 +		os=-os400
 +		;;
  	OSE68000 | ose68000)
  		basic_machine=m68000-ericsson
  		os=-ose
@@@ -800,58 -691,42 +817,64 @@@
  	pbb)
  		basic_machine=m68k-tti
  		;;
 -        pc532 | pc532-*)
 +	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
 -	pentium | p5 | k5 | k6 | nexgen)
++	pc98)
++		basic_machine=i386-pc
++		;;
++	pc98-*)
++		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
 +	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
 -	pentiumpro | p6 | 6x86 | athlon)
 +	pentiumpro | p6 | 6x86 | athlon | athlon_*)
  		basic_machine=i686-pc
  		;;
 -	pentiumii | pentium2)
 +	pentiumii | pentium2 | pentiumiii | pentium3)
  		basic_machine=i686-pc
  		;;
 -	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
 +	pentium4)
 +		basic_machine=i786-pc
 +		;;
 +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
  		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	pentiumpro-* | p6-* | 6x86-* | athlon-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
 -	pentiumii-* | pentium2-*)
 +	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
  		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
 +	pentium4-*)
 +		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
  	pn)
  		basic_machine=pn-gould
  		;;
  	power)	basic_machine=power-ibm
  		;;
  	ppc)	basic_machine=powerpc-unknown
 -	        ;;
 +		;;
  	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
 -	        ;;
 +		;;
  	ppcle-* | powerpclittle-*)
  		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
  		;;
 +	ppc64)	basic_machine=powerpc64-unknown
 +		;;
 +	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 +		basic_machine=powerpc64le-unknown
 +		;;
 +	ppc64le-* | powerpc64little-*)
 +		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
  	ps2)
  		basic_machine=i386-ibm
  		;;
@@@ -859,6 -734,6 +882,10 @@@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
++	rdos)
++		basic_machine=i386-pc
++		os=-rdos
++		;;
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
@@@ -869,26 -744,10 +896,26 @@@
  	rtpc | rtpc-*)
  		basic_machine=romp-ibm
  		;;
 +	s390 | s390-*)
 +		basic_machine=s390-ibm
 +		;;
 +	s390x | s390x-*)
 +		basic_machine=s390x-ibm
 +		;;
  	sa29200)
  		basic_machine=a29k-amd
  		os=-udi
  		;;
 +	sb1)
 +		basic_machine=mipsisa64sb1-unknown
 +		;;
 +	sb1el)
 +		basic_machine=mipsisa64sb1el-unknown
 +		;;
 +	sei)
 +		basic_machine=mips-sei
 +		os=-seiux
 +		;;
  	sequent)
  		basic_machine=i386-sequent
  		;;
@@@ -896,10 -755,7 +923,10 @@@
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
 -	sparclite-wrs)
 +	sh64)
 +		basic_machine=sh64-unknown
 +		;;
 +	sparclite-wrs | simso-wrs)
  		basic_machine=sparclite-wrs
  		os=-vxworks
  		;;
@@@ -966,42 -822,22 +993,42 @@@
  		os=-dynix
  		;;
  	t3e)
 -		basic_machine=t3e-cray
 +		basic_machine=alphaev5-cray
 +		os=-unicos
 +		;;
 +	t90)
 +		basic_machine=t90-cray
  		os=-unicos
  		;;
  	tic54x | c54x*)
  		basic_machine=tic54x-unknown
  		os=-coff
  		;;
 +	tic55x | c55x*)
 +		basic_machine=tic55x-unknown
 +		os=-coff
 +		;;
 +	tic6x | c6x*)
 +		basic_machine=tic6x-unknown
 +		os=-coff
 +		;;
  	tx39)
  		basic_machine=mipstx39-unknown
  		;;
  	tx39el)
  		basic_machine=mipstx39el-unknown
  		;;
 +	toad1)
 +		basic_machine=pdp10-xkl
 +		os=-tops20
 +		;;
  	tower | tower-32)
  		basic_machine=m68k-ncr
  		;;
 +	tpf)
 +		basic_machine=s390x-ibm
 +		os=-tpf
 +		;;
  	udi29k)
  		basic_machine=a29k-amd
  		os=-udi
@@@ -1023,8 -859,8 +1050,8 @@@
  		os=-vms
  		;;
  	vpp*|vx|vx-*)
 -               basic_machine=f301-fujitsu
 -               ;;
 +		basic_machine=f301-fujitsu
 +		;;
  	vxworks960)
  		basic_machine=i960-wrs
  		os=-vxworks
@@@ -1045,17 -881,13 +1072,17 @@@
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
 -	xmp)
 -		basic_machine=xmp-cray
 -		os=-unicos
 +	xbox)
 +		basic_machine=i686-pc
 +		os=-mingw32
  		;;
 -        xps | xps100)
 +	xps | xps100)
  		basic_machine=xps100-honeywell
  		;;
 +	ymp)
 +		basic_machine=ymp-cray
 +		os=-unicos
 +		;;
  	z8k-*-coff)
  		basic_machine=z8k-unknown
  		os=-sim
@@@ -1076,12 -908,16 +1103,12 @@@
  	op60c)
  		basic_machine=hppa1.1-oki
  		;;
 -	mips)
 -		if [ x$os = x-linux-gnu ]; then
 -			basic_machine=mips-unknown
 -		else
 -			basic_machine=mips-mips
 -		fi
 -		;;
  	romp)
  		basic_machine=romp-ibm
  		;;
 +	mmix)
 +		basic_machine=mmix-knuth
 +		;;
  	rs6000)
  		basic_machine=rs6000-ibm
  		;;
@@@ -1098,13 -934,13 +1125,13 @@@
  	we32k)
  		basic_machine=we32k-att
  		;;
 -	sh3 | sh4)
 +	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
  		basic_machine=sh-unknown
  		;;
 -	sparc | sparcv9 | sparcv9b)
 +	sparc | sparcv8 | sparcv9 | sparcv9b)
  		basic_machine=sparc-sun
  		;;
 -        cydra)
 +	cydra)
  		basic_machine=cydra-cydrome
  		;;
  	orion)
@@@ -1119,6 -955,10 +1146,6 @@@
  	pmac | pmac-mpw)
  		basic_machine=powerpc-apple
  		;;
 -	c4x*)
 -		basic_machine=c4x-none
 -		os=-coff
 -		;;
  	*-unknown)
  		# Make sure to match an already-canonicalized machine name.
  		;;
@@@ -1174,21 -1014,15 +1201,23 @@@ case $os i
  	      | -aos* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 -	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 -	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
++	      | -openbsd* | -solidbsd* \
 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 +	      | -chorusos* | -chorusrdb* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 -	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 -	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
++	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -uxpv* | -beos* | -mpeix* | -udk* \
 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 -	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
 +	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 +	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- 	      | -skyos* | -haiku*)
++	      | -skyos* | -haiku* | -rdos*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
@@@ -1200,21 -1034,16 +1229,21 @@@
  			;;
  		esac
  		;;
 +	-nto-qnx*)
 +		;;
  	-nto*)
 -		os=-nto-qnx
 +		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 -	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 +	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
  		os=`echo $os | sed -e 's|mac|macos|'`
  		;;
 +	-linux-dietlibc)
 +		os=-linux-dietlibc
 +		;;
  	-linux*)
  		os=`echo $os | sed -e 's|linux|linux-gnu|'`
  		;;
@@@ -1227,9 -1056,6 +1256,9 @@@
  	-opened*)
  		os=-openedition
  		;;
 +        -os400*)
 +		os=-os400
 +		;;
  	-wince*)
  		os=-wince
  		;;
@@@ -1248,23 -1074,14 +1277,23 @@@
  	-acis*)
  		os=-aos
  		;;
 +	-atheos*)
 +		os=-atheos
 +		;;
 +	-syllable*)
 +		os=-syllable
 +		;;
  	-386bsd)
  		os=-bsd
  		;;
  	-ctix* | -uts*)
  		os=-sysv
  		;;
 +	-nova*)
 +		os=-rtmk-nova
 +		;;
  	-ns2 )
 -	        os=-nextstep2
 +		os=-nextstep2
  		;;
  	-nsk*)
  		os=-nsk
@@@ -1276,9 -1093,6 +1305,9 @@@
  	-sinix*)
  		os=-sysv4
  		;;
 +        -tpf*)
 +		os=-tpf
 +		;;
  	-triton*)
  		os=-sysv3
  		;;
@@@ -1306,17 -1120,8 +1335,17 @@@
  	-xenix)
  		os=-xenix
  		;;
 -        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 -	        os=-mint
 +	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +		os=-mint
 +		;;
 +	-aros*)
 +		os=-aros
 +		;;
 +	-kaos*)
 +		os=-kaos
 +		;;
 +	-zvmoe)
 +		os=-zvmoe
  		;;
  	-none)
  		;;
@@@ -1349,14 -1154,10 +1378,14 @@@ case $basic_machine i
  	arm*-semi)
  		os=-aout
  		;;
 +    c4x-* | tic4x-*)
 +        os=-coff
 +        ;;
 +	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
  		;;
 -        pdp11-*)
 +	pdp11-*)
  		os=-none
  		;;
  	*-dec | vax-*)
@@@ -1383,9 -1184,6 +1412,9 @@@
  	mips*-*)
  		os=-elf
  		;;
 +	or32-*)
 +		os=-coff
 +		;;
  	*-tti)	# must be before sparc entry or we get the wrong os.
  		os=-sysv3
  		;;
@@@ -1395,15 -1193,9 +1424,15 @@@
  	*-be)
  		os=-beos
  		;;
 +	*-haiku)
 +		os=-haiku
 +		;;
  	*-ibm)
  		os=-aix
  		;;
 +    	*-knuth)
 +		os=-mmixware
 +		;;
  	*-wec)
  		os=-proelf
  		;;
@@@ -1455,19 -1247,19 +1484,19 @@@
  	*-next)
  		os=-nextstep3
  		;;
 -        *-gould)
 +	*-gould)
  		os=-sysv
  		;;
 -        *-highlevel)
 +	*-highlevel)
  		os=-bsd
  		;;
  	*-encore)
  		os=-bsd
  		;;
 -        *-sgi)
 +	*-sgi)
  		os=-irix
  		;;
 -        *-siemens)
 +	*-siemens)
  		os=-sysv4
  		;;
  	*-masscomp)
@@@ -1536,16 -1328,10 +1565,16 @@@ case $basic_machine i
  			-mvs* | -opened*)
  				vendor=ibm
  				;;
 +			-os400*)
 +				vendor=ibm
 +				;;
  			-ptx*)
  				vendor=sequent
  				;;
 -			-vxsim* | -vxworks*)
 +			-tpf*)
 +				vendor=ibm
 +				;;
 +			-vxsim* | -vxworks* | -windiss*)
  				vendor=wrs
  				;;
  			-aux*)
@@@ -1560,16 -1346,13 +1589,16 @@@
  			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
  				vendor=atari
  				;;
 +			-vos*)
 +				vendor=stratus
 +				;;
  		esac
  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
  		;;
  esac
  
  echo $basic_machine$os
 -exit 0
 +exit
  
  # Local variables:
  # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --combined debian/changelog
index dfdb5b8,0000000..41ea460
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,253 -1,0 +1,267 @@@
++abook (0.5.6-1) unstable; urgency=low
++
++  * New upstream release.
++  * Updated config.{guess,sub}.
++  * Bumped Standards-Version to 3.7.2, no changes needed.
++  * Used debconf for mutt query inclusion instead of outdated upgrade note
++    that would only affect upgrades from oldstable (woody) (closes: #377633).
++  * new debconf translations: Romanian by Eddy Petrişor (closes: #380505),
++    Czech by Miroslav Kure, Brazilian Portuguese by Felipe Augusto van de
++    Wiel, Vietnamese by Clytie Siddall, Hungarian by Attila Szervñc, German by
++    myself.
++
++ -- Gerfried Fuchs <alfie@debian.org>  Wed, 02 Aug 2006 09:15:46 -0500
++
 +abook (0.5.5-1) unstable; urgency=low
 +
 +  * New upstream release.
 +  * New debconf translation:
 +    - Spanish by César Gómez Martín (closes: #333758)
 +  * Applied patch to fix some incorrect entries in the help screen.
 +  * Updated config.sub and config.guess.
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 12 Dec 2005 12:35:38 +0100
 +
 +abook (0.5.4-3) unstable; urgency=low
 +
 +  * Added alternative for debconf-2.0 (closes: #331730)
 +  * Removed article from synopsis.
 +  * New debconf translation:
 +    - Swedish by Daniel Nylander (closes: #331292)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 10 Oct 2005 13:17:09 +0200
 +
 +abook (0.5.4-2) unstable; urgency=low
 +
 +  * The "lintian bugs R us" release:
 +    - Moved menu file from /usr/lib/menu to /usr/share/menu.
 +    - Removed bashism in postrm and config.
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 05 Sep 2005 12:33:49 +0200
 +
 +abook (0.5.4-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #314611)
 +  * Bumped standards version, no changes needed.
 +  * New debconf translation:
 +    - Vietnamese by Clytie Siddall (closes: #313019)
 +    - Italian by Luca Bruno (closes: #316911)
 +  * Changed Build-Depends from libreadline4-dev to
 +    libreadline5-dev | libreadline-dev (closes: #326392)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 05 Sep 2005 12:17:19 +0200
 +
 +abook (0.5.3-3) unstable; urgency=high
 +
 +  * New debconf translation:
 +    - Finnish by Matti Pöllä (closes: #303820)
 +    - Vietnamese by Clytie Siddall (closes: #307595)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Tue, 10 May 2005 12:42:58 +0200
 +
 +abook (0.5.3-2) unstable; urgency=low
 +
 +  * Updated config.sub and config.guess (closes: #299212)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 14 Mar 2005 14:38:39 +0100
 +
 +abook (0.5.3-1) unstable; urgency=medium
 +
 +  * New upstream release: fixes import from mutt aliases (closes: #254969)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 11 Oct 2004 10:19:14 +0200
 +
 +abook (0.5.2-3) unstable; urgency=medium
 +
 +  * Switched to libncursesw5-dev instead to support utf8 properly
 +    (closes: #271626)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Fri, 17 Sep 2004 16:02:51 +0200
 +
 +abook (0.5.2-2) unstable; urgency=low
 +
 +  * Updated watch file -- hope it works longer this time.
 +  * New debconf translations:
 +    - Catalan by Josep Monés i Teixidor (closes: #247151)
 +    - Czech by Ondra Kudlik (closes: #260615)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon,  3 May 2004 17:26:28 +0200
 +
 +abook (0.5.2-1) unstable; urgency=low
 +
 +  * New upstream release:
 +    - five custom fields added (closes: #158428)
 +    - abookrc manual page update (closes: #231909)
 +  * debian/menu: Quoted all the values
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 19 Apr 2004 20:27:48 +0200
 +
 +abook (0.5.1-2) unstable; urgency=low
 +
 +  *  Added patch from Jaakko Heinonen to fix segfault in memory handling
 +     (closes: #226581)
 +  * Two new po-debconf translations:
 +    - Japanese done by Hideki Yamane (closes: #227389)
 +    - Danish done by Morten Brix Pedersen (closes: #227789)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 26 Jan 2004 13:53:34 +0000
 +
 +abook (0.5.1-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #224901)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Thu, 25 Dec 2003 17:12:51 +0000
 +
 +abook (0.5.0-4) unstable; urgency=low
 +
 +  * Added Portuguese po-debconf translation,
 +    done by Bruno Rodrigues (closes: #216257)
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Thu, 30 Oct 2003 11:15:32 +0000
 +
 +abook (0.5.0-3) unstable; urgency=low
 +
 +  * Added po-debconf translations:
 +    - Dutch by Michiel Sikkes (closes: #214001)
 +    - Russian by Ilgiz Kalmetev (closes: #214353)
 +    Thanks to you all.
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon,  6 Oct 2003 08:52:34 +0000
 +
 +abook (0.5.0-2) unstable; urgency=low
 +
 +  * Added po-debconf translations:
 +    - Polish by Bartosz Zapalowski (closes: #208953)
 +    - Frensh by Pierre Machard (closes: #205120)
 +    - Brazilian Portuguese by Andre Luis Lopes (closes: #205838)
 +  * Updated to policy 3.6.1 (no changes needed).
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Mon, 22 Sep 2003 10:42:44 +0000
 +
 +abook (0.5.0-1) unstable; urgency=low
 +
 +  * New upstream release (closes: #201836)
 +  * Updated to policy 3.6.0.
 +  * Build-Depends on libreadline4-dev now (closes: #136230, #163268)
 +    To get the old data simply press cursor up.
 +  * Added debconf hint message that old addressbook must be imported and
 +    can be deleted afterwards, location and format change.
 +  * de-debhelper-ized the package: DEB_BUILD_OPTIONS noopt and nostrip should
 +    be supported now, too.
 +  * removed emacs cruft from end of this file.
 +  * Add vim script into binary distribution, to contrib directory.
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Thu, 07 Aug 2003 23:49:52 +0200
 +
 +abook (0.4.17-1) unstable; urgency=low
 +
 +  * New maintainer.
 +  * New upstream release (closes: #131309) which closes: #152905
 +  * debian/control:
 +    -) Removed fullstop from short description.
 +    -) Updated to policy 3.5.9
 +  * debian/rules:
 +    -) moved compat level into debian/compat
 +    -) moved example files into debian/examples
 +    -) removed comented out dh_ lines that never will make it into the package
 +  * debian/menu:
 +    -) added longtitle
 +  * added debian/watch file
 +
 + -- Gerfried Fuchs <alfie@debian.org>  Fri, 28 Mar 2003 11:52:20 +0100
 +
 +abook (0.4.16-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Closes: #129867, #133482
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun, 17 Mar 2002 14:51:50 +0000
 +
 +abook (0.4.15-1) unstable; urgency=low
 +
 +  * New upstream release. Closes: #131309
 +  * Added some contrib files in /usr/share/doc/abook/
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun,  4 Nov 2001 14:50:38 +0000
 +
 +abook (0.4.14-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sat, 29 Sep 2001 22:49:00 +0100
 +
 +abook (0.4.13-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Wed, 20 Jun 2001 22:16:42 +0100
 +
 +abook (0.4.12-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Tue, 20 Mar 2001 21:51:22 +0000
 +
 +abook (0.4.11-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Tue,  2 Jan 2001 17:08:46 +0000
 +
 +abook (0.4.10-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Fixes segfault bug. Closes: #70083
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sat, 16 Sep 2000 09:52:19 +0100
 +
 +abook (0.4.9-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Thu, 27 Jul 2000 23:00:07 +0100
 +
 +abook (0.4.8-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Wed, 21 Jun 2000 16:33:48 +0100
 +
 +abook (0.4.7-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun, 28 May 2000 16:10:59 +0100
 +
 +abook (0.4.6-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Makes fields less US-specific. Closes: #62797
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Thu, 11 May 2000 20:03:40 +0100
 +
 +abook (0.4.5-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Removed generic INSTALL from doc directory. Closes: #62789
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Fri, 21 Apr 2000 11:50:59 +0100
 +
 +abook (0.4.4-1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Fixes segfault bug. Closes: #62022
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun,  9 Apr 2000 10:39:06 +0100
 +
 +abook (0.4.3-1) unstable; urgency=low
 +
 +  * New upstream release
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sun,  2 Apr 2000 12:06:23 +0100
 +
 +abook (0.4.2-1) unstable; urgency=low
 +
 +  * Initial Release.
 +
 + -- Alan Ford <alan@whirlnet.co.uk>  Sat, 18 Mar 2000 12:38:34 +0000
diff --combined debian/config
index 05bb732,0000000..5a2484f
mode 100644,000000..100644
--- a/debian/config
+++ b/debian/config
@@@ -1,17 -1,0 +1,16 @@@
 +#!/bin/sh -e
 +# config script for abook
 +
 +action=$1
 +version=$2
 +
 +# Source debconf library.
 +. /usr/share/debconf/confmodule
 +
- if [ "$action" = "configure" ] && [ -n "$version" ]; then
- 	if dpkg --compare-versions "$version" lt "0.5.0"; then
- 		db_input medium abook/files_moved || true
- 		db_go
- 	fi
- fi
++db_unregister abook/files_moved || true
++
++# create the /etc/Muttrc.d/ snippet?
++db_input medium abook/muttrc.d || true
++db_go
 +
 +exit 0
diff --combined debian/control
index aa525a9,0000000..27d24ca
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,0 +1,15 @@@
 +Source: abook
 +Section: mail
 +Priority: optional
 +Maintainer: Gerfried Fuchs <alfie@debian.org>
- Standards-Version: 3.6.2
++Standards-Version: 3.7.2
 +Build-Depends: libncursesw5-dev, libreadline5-dev | libreadline-dev, po-debconf
 +
 +Package: abook
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 0.5) | debconf-2.0
 +Enhances: mutt
 +Description: text-based ncurses address book application
 + abook is a text-based ncurses address book application. It provides many
 + different fields of user info. abook is designed for use with mutt, but 
 + can be used independently.
diff --combined debian/po/cs.po
index 0f6ae31,0000000..9825e31
mode 100644,000000..100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@@ -1,43 -1,0 +1,36 @@@
- # Translators, if you are not familiar with the PO format, gettext
- # documentation is worth reading, especially sections dedicated to
- # this format, e.g. by running:
- # info -n '(gettext)PO Files'
- # info -n '(gettext)Header Entry'
- # Some information specific to po-debconf are available at
- # /usr/share/doc/po-debconf/README-trans
- # or http://www.debian.org/intl/l10n/po-debconf/README-trans
- # Developers do not need to manually edit POT or PO files.
- # , fuzzy
- # Kepi <kepi@orthank.net>, 2004.
- # 
- # 
++# Czech translation of abook debconf templates.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the abook package.
++# Miroslav Kure <kurem@debian.cz>, 2006.
++#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: abook 0.5.2-1\n"
++"Project-Id-Version: abook\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
- "PO-Revision-Date: 2004-07-21 14:02+0200\n"
- "Last-Translator: Ondra Kudlik <kepi@orthank.net>\n"
- "Language-Team: Czech <provoz@debian.cz>\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:24-0500\n"
++"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
++"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
- msgstr "Místo uložení adresáře se změnilo, je potřeba importovat starý."
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Chcete celosystémově povolit v muttu podporu abooku?"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
- "Od verze 0.5.0 používá abook k uložení seznamu adres a konfiguračního "
- "souboru adresář začínající tečkou ve vašem domovském adresáři. Předchozí "
- "seznam adres také změnil formát, takže je potřeba po aktualizaci v programu "
- "importovat váš starý soubor."
++"abook je možné používat rovnou z muttu jako úložiště kontaktů. Odpovíte-li "
++"kladně, balík vytvoří soubor /etc/Muttrc.d/abook.rc, ve kterém se povolí "
++"dotazování do databáze abooku a také možnost přidávání nových adres klávesou "
++"\"A\" z prohlížecího režimu."
diff --combined debian/po/de.po
index 3e621fc,0000000..8c23eca
mode 100644,000000..100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@@ -1,45 -1,0 +1,45 @@@
 +#
 +#    Translators, if you are not familiar with the PO format, gettext
 +#    documentation is worth reading, especially sections dedicated to
 +#    this format, e.g. by running:
 +#         info -n '(gettext)PO Files'
 +#         info -n '(gettext)Header Entry'
 +#
 +#    Some information specific to po-debconf are available at
 +#            /usr/share/doc/po-debconf/README-trans
 +#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
 +#
 +#    Developers do not need to manually edit POT or PO files.
 +#
 +msgid ""
 +msgstr ""
 +"Project-Id-Version: abook 0.5.0\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
- "PO-Revision-Date: 2003-08-07 21:50+0200\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:24-0500\n"
 +"Last-Translator: Gerfried Fuchs <alfie@debian.org>\n"
 +"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=ISO-8859-15\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
- msgstr ""
- "Der Ort der addressbook-Datei hat sich geändert, die alte muss importiert "
- "werden."
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Wollen Sie abook Systemweit in mutt aktivieren?"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
- "Seit Version 0.5.0 verwendet abook ein Punkt-Verzeichnis in Ihrem Heimat-"
- "Verzeichnis, um seine addressbook und abookrc Dateien zu speichern. Es hat "
- "sich auch das Format der ersten Datei geändert, daher müssen Sie Ihre alte "
- "Datei importieren, wenn Sie abook nach der Aktualisierung starten."
++"abook bietet die Möglichkeit, als externe Adressenabfrage in mutt verwendet "
++"zu werden. Falls Sie dieser Frage zustimmen, wird das Paket eine /etc/Muttrc."
++"d/abook.rc-Datei erstellen, die die Abfrage der abook-Datenbank und das "
++"Hinzufügen von Adressen in abook durch Drücken von »A« im Pager-Modus "
++"aktiviert."
diff --combined debian/po/hu.po
index 0000000,0000000..9998bfb
new file mode 100644
--- /dev/null
+++ b/debian/po/hu.po
@@@ -1,0 -1,0 +1,34 @@@
++msgid ""
++msgstr ""
++"Project-Id-Version: \n"
++"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:24-0500\n"
++"Last-Translator: SZERVÑC Attila <sas@321.hu>\n"
++"Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=utf-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=1; plural=0;\n"
++"X-Poedit-Language: Hungarian\n"
++"X-Poedit-Country: HUNGARY\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Engedélyezed az abook rendszer-szintű elérését a mutt számára?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
++msgstr ""
++"Az abook lehetővé teszi, hogy a mutt lekérdező motornak használja. Ha "
++"jóváhagyod e kérdést, a csomag létrehoz egy /etc/Muttrc.d/abook.rc fájlt, "
++"mely lehetővé teszi az abook adatbázis lekérdezését és email-címek "
++"hozzáadását az \"A\" gomb leütésével a lapozó módban."
diff --combined debian/po/pt_BR.po
index 6706661,0000000..3b55e9e
mode 100644,000000..100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@@ -1,45 -1,0 +1,37 @@@
- #
- #    Translators, if you are not familiar with the PO format, gettext
- #    documentation is worth reading, especially sections dedicated to
- #    this format, e.g. by running:
- #         info -n '(gettext)PO Files'
- #         info -n '(gettext)Header Entry'
- #
- #    Some information specific to po-debconf are available at
- #            /usr/share/doc/po-debconf/README-trans
- #         or http://www.debian.org/intl/l10n/po-debconf/README-trans
- #
- #    Developers do not need to manually edit POT or PO files.
++# abook Brazilian Portuguese translation 
++# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the abook package.
++# Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>, 2006.
 +#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: abook_0.5.0-1\n"
++"Project-Id-Version: abook\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
- "PO-Revision-Date: 2003-08-16 21:12-0300\n"
- "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
- "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:24-0500\n"
++"Last-Translator: Felipe Augusto van de Wiel (faw) <faw@cathedrallabs.org>\n"
++"Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 +"MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Type: text/plain; charset=UTF-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
++"pt_BR UTF-8\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
- msgstr ""
- "A localização do livro de endereços mudou, necessário importar o livro antigo"
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Você gostaria de ativar o abook para o mutt em todo o sistema?"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
- "A partir da versão 0.5.0 o abook começou a utilizar um diretório iniciado "
- "por um ponto no diretório pessoal dos usuários para armazenar seu livro de "
- "endereço e o arquivo abookrc. O livro de endereços mudou seu formato, "
- "portanto é preciso importar seu arquivo antigo quando você iniciar o abook "
- "após a atualização."
++"abook oferece a possibilidade de ser usado como catálogo de consulta a "
++"partir do mutt. Se você aceitar esta opção, o pacote criará um arquivo /etc/"
++"Muttrc.d/abook.rc que ativará a consulta à base de dados abook e permitirá a "
++"adição de endereços de e-mail ao abook pressionando \"A\" no modo \"pager\"."
diff --combined debian/po/ro.po
index 0000000,0000000..a10123b
new file mode 100644
--- /dev/null
+++ b/debian/po/ro.po
@@@ -1,0 -1,0 +1,37 @@@
++# Romanian translation
++# This file is distributed under the same license as the abook package.
++#
++# Eddy Petrisor <eddy_petrisor@yahoo.com>, 2006.
++msgid ""
++msgstr ""
++"Project-Id-Version: abook\n"
++"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:25-0500\n"
++"Last-Translator: Eddy Petrişor <eddy.petrisor@gmail.com>\n"
++"Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.11.2\n"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Doriţi să activaţi abook pentru mutt pe întregul sistem?"
++
++#. Type: boolean
++#. Description
++#: ../templates:1001
++msgid ""
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
++msgstr ""
++"abook oferă posibilitatea să fie folosit ca suport pentru interogări din "
++"mutt. Dacă răspundeţi afirmativ la această întrebare, pachetul va crea un "
++"fişier /etc/Muttrc.d/abook.rc care activează interogările asupra bazei de "
++"date abook şi care adaugă adresele de poştă electronică în abook la apăsarea "
++"tastei „A” din modul de paginaţie."
diff --combined debian/po/templates.pot
index fbfff2d,0000000..7f4a6b8
mode 100644,000000..100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@@ -1,40 -1,0 +1,33 @@@
- #
- #    Translators, if you are not familiar with the PO format, gettext
- #    documentation is worth reading, especially sections dedicated to
- #    this format, e.g. by running:
- #         info -n '(gettext)PO Files'
- #         info -n '(gettext)Header Entry'
- #
- #    Some information specific to po-debconf are available at
- #            /usr/share/doc/po-debconf/README-trans
- #         or http://www.debian.org/intl/l10n/po-debconf/README-trans
- #
- #    Developers do not need to manually edit POT or PO files.
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the abook package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 +#
 +#, fuzzy
 +msgid ""
 +msgstr ""
- "Project-Id-Version: abook 0.5.4-1\n"
++"Project-Id-Version: abook VERSION\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
 +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 +"Language-Team: LANGUAGE <LL@li.org>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=CHARSET\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
 +msgstr ""
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
diff --combined debian/po/vi.po
index d43ff92,0000000..e5bd15b
mode 100644,000000..100644
--- a/debian/po/vi.po
+++ b/debian/po/vi.po
@@@ -1,35 -1,0 +1,37 @@@
- # Vietnamese Translation for abook.
- # Copyright © 2005 Free Software Foundation, Inc.
- # Clytie Siddall <clytie@riverland.net.au>, 2005.
++# Vietnamese translation for abook (debconf).
++# Copyright © 2006 Free Software Foundation, Inc.
++# Clytie Siddall <clytie@riverland.net.au>, 2006.
 +#
 +msgid ""
 +msgstr ""
- "Project-Id-Version: abook 0.5.3-2\n"
++"Project-Id-Version: abook\n"
 +"Report-Msgid-Bugs-To: abook@packages.debian.org\n"
- "POT-Creation-Date: 2004-06-09 18:46+0200\n"
- "PO-Revision-Date: 2005-05-04 14:27+0930\n"
++"POT-Creation-Date: 2006-07-30 06:46-0500\n"
++"PO-Revision-Date: 2006-08-02 07:25-0500\n"
 +"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
- "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
++"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 +"MIME-Version: 1.0\n"
 +"Content-Type: text/plain; charset=utf-8\n"
 +"Content-Transfer-Encoding: 8bit\n"
 +"Plural-Forms: nplurals=1; plural=0\n"
++"X-Generator: LocFactoryEditor 1.6b36\n"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
- msgid "Place of addressbook file changed, need to import the old one."
- msgstr "Đã thay đổi vị trí tập tin sổ địa chỉ nên cần phải nạp sổ cũ."
++#: ../templates:1001
++msgid "Do you want to enable abook system wide for mutt?"
++msgstr "Bạn có muốn bật chạy abook cho mutt trên toàn bộ hệ thống không?"
 +
- #. Type: note
++#. Type: boolean
 +#. Description
- #: ../templates:3
++#: ../templates:1001
 +msgid ""
- "From version 0.5.0 on abook uses a dot directory in your home directory to "
- "store its addressbook and abookrc file. The former even changed its format "
- "so you need to import your old file when you start abook after the upgrade."
++"abook offers the posibility to be used as query backend from within mutt.  "
++"If you acknowledge this question the package will create an /etc/Muttrc.d/"
++"abook.rc file that enables querying the abook database and adding mail "
++"addresses to abook with pressing \"A\" from pager mode."
 +msgstr ""
- "Trong phiên bản 0.5.0 và sau, trình abook sử dụng một thư mục «chấm» trong "
- "thư mục chính của bạn, để cất giữ sổ địa chỉ và tập tin abookrc (tài nguyên) "
- "của nó. Đã thay đổi dạng sổ địa chỉ nên bạn cần phải nạp tập tin cũ khi khởi "
- "chạy abook sau khi nâng cấp."
++"Trình abook cung cấp khả năng chạy nó như là hậu phương truy vấn từ bên "
++"trong « mutt ». Nếu bạn đồng ý, gói này sẽ tạo tập tin tài nguyên </etc/"
++"Muttrc.d/abook.rc> sẽ cho bạn có khả năng truy vấn co sở dữ liệu abook, cũng "
++"thêm địa chỉ thư vào abook bằng cách bấm « A » trong chế độ máy nhắn tin."
diff --combined debian/postinst
index 0d8063c,0000000..fc02555
mode 100644,000000..100644
--- a/debian/postinst
+++ b/debian/postinst
@@@ -1,15 -1,0 +1,50 @@@
 +#!/bin/sh -e
 +# postinst for abook
 +
 +# Source debconf library.
 +if [ -e /usr/share/debconf/confmodule ]; then
 +	. /usr/share/debconf/confmodule
 +fi
 +
- if [ "$1" != configure ]; then
- 	exit 0
++action=$1
++if [ "${DEBCONF_RECONFIGURE}" = "1" ]; then
++	# workaround until reconfigure is really available
++	action=reconfigure
 +fi
++version=$2
 +
- if [ -x /usr/bin/update-menus ]; then
++# if we got reinstalled after a remove, enable the config snippet again
++if [ "$action" = 'configure' ] && [ -e /etc/Muttrc.d/abook.rc.removed ] && [ ! -e /etc/Muttrc.d/abook.rc ]; then
++	mv /etc/Muttrc.d/abook.rc.removed /etc/Muttrc.d/abook.rc || true
++fi
++
++# only on new install, upgrade from < 0.5.6 or reconfigure
++if dpkg --compare-versions "$version" lt "0.5.6" || [ "$action" = "reconfigure" ]; then
++	mutt=true
++	if [ -e /usr/share/debconf/confmodule ]; then
++		db_get abook/muttrc.d
++		mutt="$RET"
++	fi
++
++	case "$mutt" in
++	    true)
++		if [ ! -e /etc/Muttrc.d/abook.rc ] ; then
++			mkdir /etc/Muttrc.d 2> /dev/null || true
++			cat > /etc/Muttrc.d/abook.rc << EOF
++set query_command="abook --mutt-query '%s'"
++macro pager A |'abook --add-email'\n
++EOF
++		fi
++		;;
++	    false)
++		rm /etc/Muttrc.d/abook.rc 2> /dev/null || true
++		rmdir /etc/Muttrc.d 2> /dev/null || true
++		;;
++	esac
++fi
++
++
++# menu entry
++if [ "$action" = 'configure' ] && [ -x /usr/bin/update-menus ]; then
 +	update-menus
 +fi
diff --combined debian/postrm
index e6df067,0000000..76b3870
mode 100644,000000..100644
--- a/debian/postrm
+++ b/debian/postrm
@@@ -1,11 -1,0 +1,27 @@@
 +#!/bin/sh -e
 +# postrm for abook
 +
 +if [ -x "`which update-menus 2>/dev/null`" ]; then
 +	update-menus
 +fi
 +
- if [ "$1" = 'purge' ] && [ -e /usr/share/debconf/confmodule ]; then
- 	. /usr/share/debconf/confmodule
- 	db_purge
- fi
++action=$1
++
++case "$action" in
++    remove)
++	if [ ! -e /etc/Muttrc.d/abook.rc.removed ]; then
++		# only disable the config snippet
++		mv /etc/Muttrc.d/abook.rc /etc/Muttrc.d/abook.rc.removed || true
++	fi
++	;;
++    purge)
++	rm /etc/Muttrc.d/abook.rc.removed 2> /dev/null || true
++	rm /etc/Muttrc.d/abook.rc 2> /dev/null || true
++	rmdir /etc/Muttrc.d 2> /dev/null || true
++	# remove debconf data on purge
++	if [ -e /usr/share/debconf/confmodule ]; then
++		. /usr/share/debconf/confmodule
++		db_purge
++	fi
++	;;
++esac
diff --combined debian/templates
index eed02dd,0000000..8493ba5
mode 100644,000000..100644
--- a/debian/templates
+++ b/debian/templates
@@@ -1,6 -1,0 +1,8 @@@
- Template: abook/files_moved
- Type: note
- _Description: Place of addressbook file changed, need to import the old one.
-  From version 0.5.0 on abook uses a dot directory in your home directory to
-  store its addressbook and abookrc file. The former even changed its format so
-  you need to import your old file when you start abook after the upgrade.
++Template: abook/muttrc.d
++Type: boolean
++Default: true
++_Description: Do you want to enable abook system wide for mutt?
++ abook offers the posibility to be used as query backend from within mutt.  If
++ you acknowledge this question the package will create an
++ /etc/Muttrc.d/abook.rc file that enables querying the abook database and
++ adding mail addresses to abook with pressing "A" from pager mode.