[Pkg-wmaker-commits] [wmfire] 10/61: Imported Debian patch 1.2.2-1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 03:38:50 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmfire.
commit deb90202eeccc55a0f498c6a63f27449e82a493b
Merge: 6ee9c7a e8b51ac
Author: Charles Fry <debian at frogcircus.org>
Date: Thu Sep 29 08:08:03 2005 -0400
Imported Debian patch 1.2.2-1
ChangeLog | 9 +
Makefile.am | 2 +
Makefile.in | 80 +-
README | 8 +-
config.guess | 600 ++++++--------
config.sub | 312 +++----
configure | 2 +-
configure.in | 2 +-
debian/changelog | 7 +
debian/compat | 1 +
debian/control | 4 +-
debian/patches/00list | 3 +
debian/patches/01_config.dpatch | 1648 +++++++++++++++++++++++++++++++++++++
debian/patches/02_resource.dpatch | 74 ++
debian/patches/03_gtk20.dpatch | 28 +
debian/rules | 85 +-
debian/watch | 2 +
debian/wmfire.1 | 65 --
src/.deps/session.Po | 466 -----------
src/.deps/wmfire.Po | 556 -------------
src/wmfire.c | 94 ++-
wmfire.1 | 119 +++
22 files changed, 2417 insertions(+), 1750 deletions(-)
diff --cc debian/changelog
index 48bd8e2,0000000..2445a34
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,145 -1,0 +1,152 @@@
++wmfire (1.2.2-1) unstable; urgency=low
++
++ * New upstream release. (Closes: #328475)
++ * Moved to CDBS and dpatch.
++
++ -- Charles Fry <debian at frogcircus.org> Thu, 29 Sep 2005 08:08:03 -0400
++
+wmfire (1.2.1-6) unstable; urgency=low
+
+ * New maintainer. (Closes: #326779)
+ * Previous NMU was succesfully performed. (Closes: #326575)
+
+ -- Charles Fry <debian at frogcircus.org> Wed, 7 Sep 2005 01:23:45 -0400
+
+wmfire (1.2.1-5) unstable; urgency=low
+
+ * Orphan package and set maintainer to Debian QA Group
+ * Bump standards version to 3.6.2 (no change required)
+ * Update FSF address
+ * Bump libgtop2-dev build-dep to get a version past the soname change.
+ (Closes: #316764, #322524)
+ * Break build-dependencies for the xorg transition.
+ - Remove xlibs-dev build-dep.
+ - Add libxt-dev build-dep (for the AC_PATH_X macro to detect X), upstream
+ should specialize the macro call if they don't need this lib.
+ - Add libx11-dev build-dep.
+ - Add libxext-dev build-dep.
+
+ -- Loic Minier <lool at dooz.org> Sun, 4 Sep 2005 10:06:12 +0200
+
+wmfire (1.2.1-4) unstable; urgency=low
+
+ * applied the patch from Alan Swanson (see #250937) (Closes: #250937,
+ #256782)
+ * adjusted mandir to be FHS 2.1 compatible
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Tue, 17 Aug 2004 15:49:00 +0000
+
+wmfire (1.2.1-3) unstable; urgency=low
+
+ * Changed Build-Depends: libgtop2-dev (>=2.6.0-4) (Closes: #252189)
+ * sponsored by Martin Wuertele <maxx at debian.org>
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Sat, 12 Jun 2004 13:27:21 +0200
+
+wmfire (1.2.1-2) unstable; urgency=low
+
+ * recompile against libgtop-2.2 (Closes: #252189)
+ * sponsored by Martin Wuertele <maxx at debian.org>
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Sun, 6 Jun 2004 13:55:52 +0000
+
+wmfire (1.2.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #242536)
+ * manually applied the patch from Christof Douma (see #228357)
+ * some very small changes in wmfire.menu
+ * sponsored by Martin Wuertele <maxx at debian.org>
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Sun, 9 May 2004 20:37:58 +0200
+
+wmfire (1.1.99-5) unstable; urgency=low
+
+ * corrected the manpage section
+ * applied a patch from Christof Douma to manually set the X resource name (Closes: #228357)
+ * formating fixes to the manpage
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Sun, 18 Jan 2004 19:25:55 +0100
+
+wmfire (1.1.99-4) unstable; urgency=low
+
+ * New maintainer (really, this time)
+ * rm config.{log,cache,status} in build-stamp target to clean up upstream cruft
+ * updated config.sub and config.guess
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Fri, 2 Jan 2004 14:09:20 +0100
+
+wmfire (1.1.99-3) unstable; urgency=low
+
+ * New Maintainer (Closes: #210794)
+ * created wmfire.menu
+
+ -- Christoph Siess (CHS) <chs at geekhost.info> Fri, 2 Jan 2004 11:41:38 +0100
+
+wmfire (1.1.99-2) unstable; urgency=low
+
+ * Fix missing build-depends on libgtop2-dev (closes: Bug#225225).
+
+ -- Søren Boll Overgaard <boll at debian.org> Sun, 28 Dec 2003 15:34:32 +0000
+
+wmfire (1.1.99-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Søren Boll Overgaard <boll at debian.org> Sun, 21 Dec 2003 22:37:20 +0000
+
+wmfire (1.0.0-3) unstable; urgency=low
+
+ * Fix manpage (closes: Bug#165589).
+
+ -- Søren Boll Overgaard <boll at debian.org> Sun, 20 Oct 2002 18:17:47 +0200
+
+wmfire (1.0.0-2) unstable; urgency=low
+
+ * Fix build-deps (closes: Bug#165437).
+
+ -- Søren Boll Overgaard <boll at debian.org> Sat, 19 Oct 2002 11:20:00 +0200
+
+wmfire (1.0.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * New maintaner (closes: Bug#164989).
+ * New upstream maintainer.
+ * Install manpage for wmfire (closes: Bug#87084).
+ * Add build-depends/depends, to support now and improved[TM] code.
+ * Dont leave processes hanging (closes: Bug#98391).
+
+ -- Søren Boll Overgaard <boll at debian.org> Fri, 18 Oct 2002 10:31:15 +0200
+
+wmfire (0.0.3.9pre4-2) unstable; urgency=low
+
+ * typo. closes: #125490
+ * install wmfire to /usr/bin not /usr/X11R6/bin.
+ * Remove 'undocumented manpage'. closes: #87084
+
+ -- Ryuichi Arafune <arafune at debian.org> Sat, 22 Dec 2001 14:46:20 +0900
+
+wmfire (0.0.3.9pre4-1) unstable; urgency=low
+
+ * New upstream version: closes #46005, #61321
+
+ -- Ryuichi Arafune <arafune at debian.org> Mon, 3 Apr 2000 20:18:50 +0900
+
+wmfire (0.0.3.8-3) unstable; urgency=low
+
+ * Readme.Debian (empgy file) removed. (Bug#54371)
+
+ -- Ryuichi Arafune <arafune at debian.org> Sat, 8 Jan 2000 09:29:04 +0900
+
+wmfire (0.0.3.8-2) unstable; urgency=low
+
+ * /usr/doc -> /usr/share/doc/ (Use debhelper 2.0.40).
+ * lintian free
+
+ -- Ryuichi Arafune <arafune at debian.org> Tue, 7 Sep 1999 20:31:51 +0900
+
+wmfire (0.0.3.8-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Ryuichi Arafune <arafune at debian.org> Fri, 27 Aug 1999 12:33:40 +0900
+
diff --cc debian/compat
index 0000000,0000000..b8626c4
new file mode 100644
--- /dev/null
+++ b/debian/compat
@@@ -1,0 -1,0 +1,1 @@@
++4
diff --cc debian/control
index d566d62,0000000..9123e50
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,0 +1,15 @@@
+Source: wmfire
+Section: x11
+Priority: optional
+Maintainer: Charles Fry <debian at frogcircus.org>
- Build-Depends: debhelper (>=4.0.0), libgtop2-dev (>= 2.10.0-1), libgtk2.0-dev, libgnome-dev, libxt-dev, libx11-dev
++Build-Depends: debhelper (>=4.0.0), libgtop2-dev (>= 2.10.0-1), libgtk2.0-dev, libxt-dev, libx11-dev, dpatch, cdbs
+Standards-Version: 3.6.2
+
+Package: wmfire
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: very cool fiery way of showing your CPU usage
+ A windowmaker (or similar) dockapp, which shows your current CPU usage as
+ a roaring fire.
++ .
++ Homepage: http://www.swanson.ukfsn.org/#wmfire
diff --cc debian/patches/00list
index 0000000,0000000..4055027
new file mode 100644
--- /dev/null
+++ b/debian/patches/00list
@@@ -1,0 -1,0 +1,3 @@@
++01_config
++02_resource
++03_gtk20
diff --cc debian/patches/01_config.dpatch
index 0000000,0000000..31d9ec3
new file mode 100644
--- /dev/null
+++ b/debian/patches/01_config.dpatch
@@@ -1,0 -1,0 +1,1648 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 01_config.dpatch by <debian at frogcircus.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Update config.guess and config.sub
++
++ at DPATCH@
++diff -urNad --exclude=CVS --exclude=.svn ./config.guess /tmp/dpep-work.8vdLCO/wmfire/config.guess
++--- ./config.guess 2004-06-27 16:18:20.000000000 -0400
+++++ /tmp/dpep-work.8vdLCO/wmfire/config.guess 2005-09-29 08:07:05.674051011 -0400
++@@ -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 Free Software Foundation, Inc.
++
++-timestamp='2001-08-21'
+++timestamp='2003-10-07'
++
++ # 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
++@@ -24,8 +24,9 @@
++ # 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 at cygnus.com>.
++-# Please send patches to <config-patches at gnu.org>.
+++# Originally written by Per Bothner <per at bothner.com>.
+++# Please send patches to <config-patches at 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
++@@ -87,30 +88,42 @@
++ 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.
++
++-set_cc_for_build='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
+++# 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" ; } ||
+++ { 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 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 ;
++- rm -f $dummy.c $dummy.o $dummy.rel ;
++ if test x"$CC_FOR_BUILD" = x ; then
++ CC_FOR_BUILD=no_compiler_found ;
++ fi
++ ;;
++ ,,*) CC_FOR_BUILD=$CC ;;
++ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
++-esac'
+++esac ;'
++
++ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
++ # (ghazi at noc.rutgers.edu 1994-08-24)
++@@ -123,43 +136,34 @@
++ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
++ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
++
++-case "${UNAME_MACHINE}" in
++- i?86)
++- test -z "$VENDOR" && VENDOR=pc
++- ;;
++- *)
++- test -z "$VENDOR" && VENDOR=unknown
++- ;;
++-esac
++-test -f /etc/SuSE-release && VENDOR=suse
++-
++ # Note: order is significant - the case branches are not exclusive.
++
++ 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
++@@ -176,75 +180,112 @@
++ ;;
++ 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 ;;
+++ amiga:OpenBSD:*:*)
+++ echo m68k-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ arc:OpenBSD:*:*)
+++ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ hp300:OpenBSD:*:*)
+++ echo m68k-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ mac68k:OpenBSD:*:*)
+++ echo m68k-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ macppc:OpenBSD:*:*)
+++ echo powerpc-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 ;;
+++ mvmeppc:OpenBSD:*:*)
+++ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ pmax:OpenBSD:*:*)
+++ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ sgi:OpenBSD:*:*)
+++ echo mipseb-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ sun3:OpenBSD:*:*)
+++ echo m68k-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ wgrisc:OpenBSD:*:*)
+++ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
+++ *:OpenBSD:*:*)
+++ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+++ exit 0 ;;
++ alpha:OSF1:*:*)
++ if test $UNAME_RELEASE = "V4.0"; then
++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
++ fi
+++ # 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 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
++- eval $set_cc_for_build
++- $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"
++- ;;
++- 2-1307)
++- UNAME_MACHINE="alphaev68"
++- ;;
++- esac
++- fi
++- rm -f $dummy.s $dummy
++ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++ exit 0 ;;
+++ Alpha*:OpenVMS:*:*)
+++ echo alpha-hp-vms
+++ exit 0 ;;
++ 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
++@@ -257,29 +298,11 @@
++ Amiga*:UNIX_System_V:4.0:*)
++ echo m68k-unknown-sysv4
++ exit 0;;
++- amiga:OpenBSD:*:*)
++- echo m68k-unknown-openbsd${UNAME_RELEASE}
++- exit 0 ;;
++ *:[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}
+++ *:[Mm]orph[Oo][Ss]:*:*)
+++ echo ${UNAME_MACHINE}-unknown-morphos
++ exit 0 ;;
++ *:OS/390:*:*)
++ echo i370-ibm-openedition
++@@ -301,6 +324,13 @@
++ NILE*:*:*:dcosx)
++ echo pyramid-pyramid-svr4
++ exit 0 ;;
+++ DRS?6000:unix:4.0:6*)
+++ echo sparc-icl-nx6
+++ exit 0 ;;
+++ DRS?6000:UNIX_SV:4.2*:7*)
+++ case `/usr/bin/uname -p` in
+++ sparc) echo sparc-icl-nx7 && exit 0 ;;
+++ esac ;;
++ sun4H:SunOS:5.*:*)
++ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ exit 0 ;;
++@@ -329,7 +359,7 @@
++ echo m68k-sun-sunos${UNAME_RELEASE}
++ exit 0 ;;
++ 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)
++@@ -343,12 +373,6 @@
++ aushp:SunOS:*:*)
++ echo sparc-auspex-sunos${UNAME_RELEASE}
++ exit 0 ;;
++- sparc*:NetBSD:*)
++- echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
++- exit 0 ;;
++- atari*:OpenBSD:*:*)
++- echo m68k-unknown-openbsd${UNAME_RELEASE}
++- exit 0 ;;
++ # 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
++@@ -375,18 +399,6 @@
++ *:*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 ;;
++ powerpc:machten:*:*)
++ echo powerpc-apple-machten${UNAME_RELEASE}
++ exit 0 ;;
++@@ -403,6 +415,7 @@
++ echo clipper-intergraph-clix${UNAME_RELEASE}
++ exit 0 ;;
++ mips:*:*:UMIPS | mips:*:*:RISCos)
+++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __cplusplus
++ #include <stdio.h> /* for printf() prototype */
++@@ -424,16 +437,20 @@
++ exit (-1);
++ }
++ EOF
++- eval $set_cc_for_build
++- $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 \
+++ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+++ && exit 0
++ echo mips-mips-riscos${UNAME_RELEASE}
++ exit 0 ;;
++ Motorola:PowerMAX_OS:*:*)
++ echo powerpc-motorola-powermax
++ exit 0 ;;
+++ Motorola:*:4.3:PL8-*)
+++ echo powerpc-harris-powermax
+++ exit 0 ;;
+++ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+++ echo powerpc-harris-powermax
+++ exit 0 ;;
++ Night_Hawk:Power_UNIX:*:*)
++ echo powerpc-harris-powerunix
++ exit 0 ;;
++@@ -494,6 +511,7 @@
++ exit 0 ;;
++ *: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>
++
++@@ -505,9 +523,7 @@
++ exit(0);
++ }
++ EOF
++- eval $set_cc_for_build
++- $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 && $dummy && exit 0
++ echo rs6000-ibm-aix3.2.5
++ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
++ echo rs6000-ibm-aix3.2.4
++@@ -516,7 +532,7 @@
++ fi
++ exit 0 ;;
++ *: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
++@@ -556,10 +572,8 @@
++ 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
++@@ -568,12 +582,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>
++@@ -606,12 +621,21 @@
++ exit (0);
++ }
++ EOF
++- eval $set_cc_for_build
++- (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
+++ # avoid double evaluation of $set_cc_for_build
+++ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+++ then
+++ HP_ARCH="hppa2.0w"
+++ else
+++ HP_ARCH="hppa64"
+++ fi
+++ fi
++ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
++ exit 0 ;;
++ ia64:HP-UX:*:*)
++@@ -619,6 +643,7 @@
++ echo ia64-hp-hpux${HPUX_REV}
++ exit 0 ;;
++ 3050*:HI-UX:*:*)
+++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #include <unistd.h>
++ int
++@@ -644,9 +669,7 @@
++ exit (0);
++ }
++ EOF
++- eval $set_cc_for_build
++- $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 && $dummy && exit 0
++ echo unknown-hitachi-hiuxwe2
++ exit 0 ;;
++ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
++@@ -674,9 +697,6 @@
++ parisc*:Lites*:*:*)
++ echo hppa1.1-hp-lites
++ exit 0 ;;
++- hppa*:OpenBSD:*:*)
++- echo hppa-unknown-openbsd
++- exit 0 ;;
++ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
++ echo c1-convex-bsd
++ exit 0 ;;
++@@ -695,9 +715,6 @@
++ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
++ echo c4-convex-bsd
++ exit 0 ;;
++- CRAY*X-MP:*:*:*)
++- echo xmp-cray-unicos
++- exit 0 ;;
++ CRAY*Y-MP:*:*:*)
++ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ exit 0 ;;
++@@ -710,27 +727,21 @@
++ 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 ;;
++ CRAY*T3E:*:*:*)
++ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ exit 0 ;;
++ CRAY*SV1:*:*:*)
++ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++ exit 0 ;;
++- CRAY-2:*:*:*)
++- echo cray2-cray-unicos
++- exit 0 ;;
+++ *:UNICOS/mp:*:*)
+++ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+++ exit 0 ;;
++ 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 ;;
++ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
++ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
++ exit 0 ;;
++@@ -741,10 +752,21 @@
++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++ exit 0 ;;
++ *: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/[-_].*/\./'`
+++ # Determine whether the default compiler uses glibc.
+++ eval $set_cc_for_build
+++ sed 's/^ //' << EOF >$dummy.c
+++ #include <features.h>
+++ #if __GLIBC__ >= 2
+++ LIBC=gnu
+++ #else
+++ LIBC=
+++ #endif
+++EOF
+++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+++ # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+++ # FreeBSD's kernel, but not the complete OS.
+++ case ${LIBC} in gnu) kernel_only='k' ;; esac
+++ echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
++ exit 0 ;;
++ i*:CYGWIN*:*)
++ echo ${UNAME_MACHINE}-pc-cygwin
++@@ -755,11 +777,17 @@
++ i*:PW*:*)
++ echo ${UNAME_MACHINE}-pc-pw32
++ exit 0 ;;
+++ x86:Interix*:[34]*)
+++ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+++ exit 0 ;;
+++ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+++ echo i${UNAME_MACHINE}-pc-mks
+++ exit 0 ;;
++ 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
+++ echo i586-pc-interix
++ exit 0 ;;
++ i*:UWIN*:*)
++ echo ${UNAME_MACHINE}-pc-uwin
++@@ -771,31 +799,68 @@
++ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ exit 0 ;;
++ *:GNU:*:*)
+++ # the GNU system
++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++ exit 0 ;;
+++ *: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 0 ;;
++ i*86:Minix:*:*)
++ echo ${UNAME_MACHINE}-pc-minix
++ exit 0 ;;
++ arm*:Linux:*:*)
++- echo ${UNAME_MACHINE}-${VENDOR}-linux
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+++ exit 0 ;;
+++ cris:Linux:*:*)
+++ echo cris-axis-linux-gnu
++ exit 0 ;;
++ ia64:Linux:*:*)
++- echo ${UNAME_MACHINE}-${VENDOR}-linux
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit 0 ;;
++ m68*:Linux:*:*)
++- echo ${UNAME_MACHINE}-${VENDOR}-linux
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit 0 ;;
++ mips:Linux:*:*)
++- case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
++- big) echo mips-${VENDOR}-linux && exit 0 ;;
++- little) echo mipsel-${VENDOR}-linux && exit 0 ;;
++- esac
++- case `sed -n '/^system type/s/^.*: \([^ ]*\).*/\1/p' < /proc/cpuinfo` in
++- SGI|sgi) echo mips-${VENDOR}-linux-gnu && exit 0 ;;
++- esac
+++ 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=`
+++ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++ ;;
++- ppc:Linux:*:*|ppc64:Linux:*:*)
++- echo powerpc-${VENDOR}-linux
+++ 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=`
+++ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+++ ;;
+++ ppc:Linux:*:*)
+++ echo powerpc-unknown-linux-gnu
++ exit 0 ;;
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++@@ -812,36 +877,40 @@
++ esac
++ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++- echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit 0 ;;
++ parisc:Linux:*:* | hppa:Linux:*:*)
++ # Look for CPU level
++ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++- PA7*) echo hppa1.1-${VENDOR}-linux ;;
++- PA8*) echo hppa2.0-${VENDOR}-linux ;;
++- *) echo hppa-${VENDOR}-linux ;;
+++ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+++ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+++ *) echo hppa-unknown-linux-gnu ;;
++ esac
++ exit 0 ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++- echo hppa64-${VENDOR}-linux
+++ echo hppa64-unknown-linux-gnu
++ exit 0 ;;
++ s390:Linux:*:* | s390x:Linux:*:*)
++ echo ${UNAME_MACHINE}-ibm-linux
++ exit 0 ;;
+++ sh64*:Linux:*:*)
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+++ exit 0 ;;
++ sh*:Linux:*:*)
++- echo ${UNAME_MACHINE}-${VENDOR}-linux
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit 0 ;;
++ sparc:Linux:*:* | sparc64:Linux:*:*)
++- echo ${UNAME_MACHINE}-${VENDOR}-linux
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit 0 ;;
++ x86_64:Linux:*:*)
++- echo x86_64-${VENDOR}-linux
+++ echo x86_64-unknown-linux-gnu
++ exit 0 ;;
++ 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_targets=`cd /; ld --help 2>&1 \
+++ # 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 targets: *//
++@@ -849,48 +918,47 @@
++ p'`
++ case "$ld_supported_targets" in
++ elf32-i386)
++- TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+++ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++ ;;
++ a.out-i386-linux)
++- echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
++- exit 0 ;;
+++ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+++ exit 0 ;;
++ coff-i386)
++- echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
+++ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++ exit 0 ;;
++ "")
++- # Either a pre-BFD a.out linker (linuxoldld) or
+++ # Either a pre-BFD a.out linker (linux-gnuoldld) or
++ # one that does not give us useful --help.
++- echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
+++ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++ exit 0 ;;
++ 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\n", argv[1]);
++-# else
++- printf ("%s-${VENDOR}-linuxlibc1\n", argv[1]);
++-# endif
++-# else
++- printf ("%s-${VENDOR}-linuxlibc1\n", argv[1]);
++-# endif
++-#else
++- printf ("%s-${VENDOR}-linuxaout\n", argv[1]);
++-#endif
++- return 0;
++-}
++-EOF
++ eval $set_cc_for_build
++- $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
+++ 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
+++ 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=`
+++ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
++ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++ ;;
++ i*86:DYNIX/ptx:4*:*)
++@@ -907,6 +975,23 @@
++ # Use sysv4.2uw... so that sysv4* matches it.
++ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
++ 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 ;;
+++ i*86:XTS-300:*:STOP)
+++ echo ${UNAME_MACHINE}-unknown-stop
+++ exit 0 ;;
+++ i*86:atheos:*:*)
+++ echo ${UNAME_MACHINE}-unknown-atheos
+++ exit 0 ;;
+++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+++ echo i386-unknown-lynxos${UNAME_RELEASE}
+++ exit 0 ;;
+++ i*86:*DOS:*:*)
+++ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+++ exit 0 ;;
++ 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
++@@ -928,22 +1013,19 @@
++ 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 ;;
++ pc:*:*:*)
++ # Left here for compatibility:
++ # uname -m prints for DJGPP always 'pc', but it prints nothing about
++@@ -967,9 +1049,15 @@
++ # "miniframe"
++ echo m68010-convergent-sysv
++ exit 0 ;;
+++ mc68k:UNIX:SYSTEM5:3.51m)
+++ echo m68k-convergent-sysv
+++ exit 0 ;;
+++ M680?0:D-NIX:5.3:*)
+++ echo m68k-diab-dnix
+++ 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)
+++ 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)
++ OS_REL=''
++ test -r /etc/.relid \
++ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
++@@ -986,9 +1074,6 @@
++ 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 ;;
++ TSUNAMI:LynxOS:2.*:*)
++ echo sparc-unknown-lynxos${UNAME_RELEASE}
++ exit 0 ;;
++@@ -1060,6 +1145,9 @@
++ SX-5:SUPER-UX:*:*)
++ echo sx5-nec-superux${UNAME_RELEASE}
++ exit 0 ;;
+++ SX-6:SUPER-UX:*:*)
+++ echo sx6-nec-superux${UNAME_RELEASE}
+++ exit 0 ;;
++ Power*:Rhapsody:*:*)
++ echo powerpc-apple-rhapsody${UNAME_RELEASE}
++ exit 0 ;;
++@@ -1067,18 +1155,24 @@
++ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++ exit 0 ;;
++ *:Darwin:*:*)
++- echo `uname -p`-apple-darwin${UNAME_RELEASE}
+++ case `uname -p` in
+++ *86) UNAME_PROCESSOR=i686 ;;
+++ powerpc) UNAME_PROCESSOR=powerpc ;;
+++ esac
+++ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++ exit 0 ;;
++ *: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
+++ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++ exit 0 ;;
++ *:QNX:*:4*)
++ echo i386-pc-qnx
++ exit 0 ;;
++- NSR-[KW]:NONSTOP_KERNEL:*:*)
+++ NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
++ echo nsr-tandem-nsk${UNAME_RELEASE}
++ exit 0 ;;
++ *:NonStop-UX:*:*)
++@@ -1101,11 +1195,6 @@
++ 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 ;;
++ *:TOPS-10:*:*)
++ echo pdp10-unknown-tops10
++ exit 0 ;;
++@@ -1124,14 +1213,15 @@
++ *:ITS:*:*)
++ echo pdp10-unknown-its
++ exit 0 ;;
++- i*86:XTS-300:*:STOP)
++- echo ${UNAME_MACHINE}-unknown-stop
+++ SEI:*:*:SEIUX)
+++ echo mips-sei-seiux${UNAME_RELEASE}
++ exit 0 ;;
++ 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>
++@@ -1246,9 +1336,7 @@
++ }
++ EOF
++
++-eval $set_cc_for_build
++-$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 && $dummy && exit 0
++
++ # Apollos put the system type in the environment.
++
++diff -urNad --exclude=CVS --exclude=.svn ./config.sub /tmp/dpep-work.8vdLCO/wmfire/config.sub
++--- ./config.sub 2004-06-27 16:18:20.000000000 -0400
+++++ /tmp/dpep-work.8vdLCO/wmfire/config.sub 2005-09-29 08:07:05.676050741 -0400
++@@ -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 Free Software Foundation, Inc.
++
++-timestamp='2001-08-13'
+++timestamp='2003-10-07'
++
++ # This file is (in principle) common to ALL GNU software.
++ # The presence of a machine in this file suggests that SOME GNU software
++@@ -29,7 +29,8 @@
++ # 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 at gnu.org>.
+++# Please send patches to <config-patches at 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.
++@@ -117,7 +118,7 @@
++ # 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* | storm-chaos* | os2-emx* | windows32-*)
+++ nto-qnx* | linux-gnu* | linux-dietlibc | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
++ os=-$maybe_os
++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++ ;;
++@@ -226,31 +227,46 @@
++ 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 \
++ | c4x | clipper \
++- | d10v | d30v | dsp16xx \
++- | fr30 \
+++ | d10v | d30v | dlx | dsp16xx \
+++ | fr30 | frv \
++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | i370 | i860 | i960 | ia64 \
+++ | ip2k | iq2000 \
++ | m32r | m68000 | m68k | m88k | mcore \
++- | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
++- | mips64vr4100 | mips64vr4100el | mips64vr4300 \
++- | mips64vr4300el | mips64vr5000 | mips64vr5000el \
++- | mipsbe | mipsel | mipsle | mipstx39 | mipstx39el \
+++ | mips | mipsbe | mipseb | mipsel | mipsle \
+++ | mips16 \
+++ | mips64 | mips64el \
+++ | mips64vr | mips64vrel \
+++ | mips64orion | mips64orionel \
+++ | mips64vr4100 | mips64vr4100el \
+++ | mips64vr4300 | mips64vr4300el \
+++ | mips64vr5000 | mips64vr5000el \
+++ | mipsisa32 | mipsisa32el \
+++ | mipsisa32r2 | mipsisa32r2el \
+++ | mipsisa64 | mipsisa64el \
+++ | mipsisa64r2 | mipsisa64r2el \
+++ | mipsisa64sb1 | mipsisa64sb1el \
+++ | mipsisa64sr71k | mipsisa64sr71kel \
+++ | mipstx39 | mipstx39el \
++ | mn10200 | mn10300 \
+++ | msp430 \
++ | ns16k | ns32k \
++- | openrisc \
+++ | openrisc | or32 \
++ | pdp10 | pdp11 | pj | pjl \
++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++ | pyramid \
++- | s390 | s390x \
++- | sh | sh[34] | sh[34]eb | shbe | shle \
++- | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
+++ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+++ | sh64 | sh64le \
+++ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
++ | strongarm \
++- | tahoe | thumb | tic80 | tron \
++- | v850 \
+++ | tahoe | thumb | tic4x | tic80 | tron \
+++ | v850 | v850e \
++ | we32k \
++- | x86 | xscale \
+++ | x86 | xscale | xstormy16 | xtensa \
++ | z8k)
++ basic_machine=$basic_machine-unknown
++ ;;
++@@ -277,38 +293,56 @@
++ 580-* \
++ | a29k-* \
++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++- | alphapca5[67]-* | arc-* \
++- | arm-* | armbe-* | armle-* | armv*-* \
+++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+++ | avr-* \
++ | bs2000-* \
++- | c[123]* | c30-* | [cjt]90-* | c54x-* \
++- | clipper-* | cray2-* | cydra-* \
++- | d10v-* | d30v-* \
+++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+++ | clipper-* | cydra-* \
+++ | d10v-* | d30v-* | dlx-* \
++ | elxsi-* \
++- | f30[01]-* | f700-* | fr30-* | fx80-* \
+++ | 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-* \
++- | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
+++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
++ | m88110-* | m88k-* | mcore-* \
++- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
++- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
++- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \
++- | mipsle-* | mipstx39-* | mipstx39el-* \
++- | none-* | np1-* | ns16k-* | ns32k-* \
+++ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+++ | mips16-* \
+++ | mips64-* | mips64el-* \
+++ | mips64vr-* | mips64vrel-* \
+++ | mips64orion-* | mips64orionel-* \
+++ | mips64vr4100-* | mips64vr4100el-* \
+++ | mips64vr4300-* | mips64vr4300el-* \
+++ | mips64vr5000-* | mips64vr5000el-* \
+++ | mipsisa32-* | mipsisa32el-* \
+++ | mipsisa32r2-* | mipsisa32r2el-* \
+++ | mipsisa64-* | mipsisa64el-* \
+++ | mipsisa64r2-* | mipsisa64r2el-* \
+++ | mipsisa64sb1-* | mipsisa64sb1el-* \
+++ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+++ | mipstx39-* | mipstx39el-* \
+++ | msp430-* \
+++ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
++ | orion-* \
++ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++ | pyramid-* \
++ | romp-* | rs6000-* \
++- | s390-* | s390x-* \
++- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
++- | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
++- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \
++- | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
++- | v850-* | vax-* \
+++ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+++ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+++ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+++ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+++ | tahoe-* | thumb-* \
+++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+++ | tron-* \
+++ | v850-* | v850e-* | vax-* \
++ | we32k-* \
++- | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
+++ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+++ | xtensa-* \
++ | ymp-* \
++ | z8k-*)
++ ;;
++@@ -342,6 +376,9 @@
++ basic_machine=a29k-none
++ os=-bsd
++ ;;
+++ amd64)
+++ basic_machine=x86_64-pc
+++ ;;
++ amdahl)
++ basic_machine=580-amdahl
++ os=-sysv
++@@ -373,6 +410,10 @@
++ basic_machine=ns32k-sequent
++ os=-dynix
++ ;;
+++ c90)
+++ basic_machine=c90-cray
+++ os=-unicos
+++ ;;
++ convex-c1)
++ basic_machine=c1-convex
++ os=-bsd
++@@ -393,16 +434,8 @@
++ basic_machine=c38-convex
++ os=-bsd
++ ;;
++- cray | ymp)
++- basic_machine=ymp-cray
++- os=-unicos
++- ;;
++- cray2)
++- basic_machine=cray2-cray
++- os=-unicos
++- ;;
++- [cjt]90)
++- basic_machine=${basic_machine}-cray
+++ cray | j90)
+++ basic_machine=j90-cray
++ os=-unicos
++ ;;
++ crds | unos)
++@@ -417,6 +450,14 @@
++ 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
++@@ -597,12 +638,6 @@
++ basic_machine=m68k-atari
++ os=-mint
++ ;;
++- mipsel*-linux*)
++- basic_machine=mipsel-unknown
++- ;;
++- mips*-linux*)
++- basic_machine=mips-unknown
++- ;;
++ mips3*-*)
++ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
++ ;;
++@@ -617,6 +652,10 @@
++ basic_machine=m68k-rom68k
++ os=-coff
++ ;;
+++ morphos)
+++ basic_machine=powerpc-unknown
+++ os=-morphos
+++ ;;
++ msdos)
++ basic_machine=i386-pc
++ os=-msdos
++@@ -689,6 +728,10 @@
++ np1)
++ basic_machine=np1-gould
++ ;;
+++ nv1)
+++ basic_machine=nv1-cray
+++ os=-unicosmp
+++ ;;
++ nsr-tandem)
++ basic_machine=nsr-tandem
++ ;;
++@@ -696,6 +739,10 @@
++ basic_machine=hppa1.1-oki
++ os=-proelf
++ ;;
+++ or32 | or32-*)
+++ basic_machine=or32-unknown
+++ os=-coff
+++ ;;
++ OSE68000 | ose68000)
++ basic_machine=m68000-ericsson
++ os=-ose
++@@ -718,51 +765,55 @@
++ pbb)
++ basic_machine=m68k-tti
++ ;;
++- pc532 | pc532-*)
+++ pc532 | pc532-*)
++ basic_machine=ns32k-pc532
++ ;;
++- pentium | p5 | k5 | k6 | nexgen)
+++ 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
++- ;;
++- ppc64) 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/^[^-]*-//'`
++ ;;
++@@ -783,10 +834,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
++ ;;
++@@ -794,7 +861,10 @@
++ basic_machine=sh-hitachi
++ os=-hms
++ ;;
++- sparclite-wrs)
+++ sh64)
+++ basic_machine=sh64-unknown
+++ ;;
+++ sparclite-wrs | simso-wrs)
++ basic_machine=sparclite-wrs
++ os=-vxworks
++ ;;
++@@ -861,19 +931,35 @@
++ 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
++ ;;
++@@ -898,8 +984,8 @@
++ os=-vms
++ ;;
++ vpp*|vx|vx-*)
++- basic_machine=f301-fujitsu
++- ;;
+++ basic_machine=f301-fujitsu
+++ ;;
++ vxworks960)
++ basic_machine=i960-wrs
++ os=-vxworks
++@@ -920,17 +1006,13 @@
++ basic_machine=hppa1.1-winbond
++ os=-proelf
++ ;;
++- windows32)
++- basic_machine=i386-pc
++- os=-windows32-msvcrt
+++ xps | xps100)
+++ basic_machine=xps100-honeywell
++ ;;
++- xmp)
++- basic_machine=xmp-cray
+++ ymp)
+++ basic_machine=ymp-cray
++ os=-unicos
++ ;;
++- xps | xps100)
++- basic_machine=xps100-honeywell
++- ;;
++ z8k-*-coff)
++ basic_machine=z8k-unknown
++ os=-sim
++@@ -951,16 +1033,6 @@
++ op60c)
++ basic_machine=hppa1.1-oki
++ ;;
++- mips)
++- case $os in
++- linux*)
++- basic_machine=mips-unknown
++- ;;
++- *)
++- basic_machine=mips-mips
++- ;;
++- esac
++- ;;
++ romp)
++ basic_machine=romp-ibm
++ ;;
++@@ -980,13 +1052,16 @@
++ we32k)
++ basic_machine=we32k-att
++ ;;
++- sh3 | sh4 | sh3eb | sh4eb)
+++ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
++ basic_machine=sh-unknown
++ ;;
+++ sh64)
+++ basic_machine=sh64-unknown
+++ ;;
++ sparc | sparcv9 | sparcv9b)
++ basic_machine=sparc-sun
++ ;;
++- cydra)
+++ cydra)
++ basic_machine=cydra-cydrome
++ ;;
++ orion)
++@@ -1001,10 +1076,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.
++ ;;
++@@ -1060,17 +1131,19 @@
++ | -aos* \
++ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
++ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
++- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+++ | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -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* | -uxpv* | -beos* | -mpeix* | -udk* \
++- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+++ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+++ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++- | -os2* | -vos*)
+++ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+++ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
++ # Remember, each alternative MUST END IN *, to match a version number.
++ ;;
++ -qnx*)
++@@ -1082,8 +1155,10 @@
++ ;;
++ 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* \
++@@ -1092,6 +1167,12 @@
++ -mac*)
++ os=`echo $os | sed -e 's|mac|macos|'`
++ ;;
+++ -linux-dietlibc)
+++ os=-linux-dietlibc
+++ ;;
+++ -linux*)
+++ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+++ ;;
++ -sunos5*)
++ os=`echo $os | sed -e 's|sunos5|solaris2|'`
++ ;;
++@@ -1119,14 +1200,20 @@
++ -acis*)
++ os=-aos
++ ;;
+++ -atheos*)
+++ os=-atheos
+++ ;;
++ -386bsd)
++ os=-bsd
++ ;;
++ -ctix* | -uts*)
++ os=-sysv
++ ;;
+++ -nova*)
+++ os=-rtmk-nova
+++ ;;
++ -ns2 )
++- os=-nextstep2
+++ os=-nextstep2
++ ;;
++ -nsk*)
++ os=-nsk
++@@ -1165,8 +1252,14 @@
++ -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
++ ;;
++ -none)
++ ;;
++@@ -1199,10 +1292,14 @@
++ arm*-semi)
++ os=-aout
++ ;;
+++ c4x-* | tic4x-*)
+++ os=-coff
+++ ;;
+++ # This must come before the *-dec entry.
++ pdp10-*)
++ os=-tops20
++ ;;
++- pdp11-*)
+++ pdp11-*)
++ os=-none
++ ;;
++ *-dec | vax-*)
++@@ -1229,6 +1326,9 @@
++ mips*-*)
++ os=-elf
++ ;;
+++ or32-*)
+++ os=-coff
+++ ;;
++ *-tti) # must be before sparc entry or we get the wrong os.
++ os=-sysv3
++ ;;
++@@ -1292,19 +1392,19 @@
++ *-next)
++ os=-nextstep3
++ ;;
++- *-gould)
+++ *-gould)
++ os=-sysv
++ ;;
++- *-highlevel)
+++ *-highlevel)
++ os=-bsd
++ ;;
++ *-encore)
++ os=-bsd
++ ;;
++- *-sgi)
+++ *-sgi)
++ os=-irix
++ ;;
++- *-siemens)
+++ *-siemens)
++ os=-sysv4
++ ;;
++ *-masscomp)
++@@ -1376,7 +1476,7 @@
++ -ptx*)
++ vendor=sequent
++ ;;
++- -vxsim* | -vxworks*)
+++ -vxsim* | -vxworks* | -windiss*)
++ vendor=wrs
++ ;;
++ -aux*)
diff --cc debian/patches/02_resource.dpatch
index 0000000,0000000..a89c1fd
new file mode 100644
--- /dev/null
+++ b/debian/patches/02_resource.dpatch
@@@ -1,0 -1,0 +1,74 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 01_resource.dpatch by <debian at frogcircus.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: add -r option to specify resource name
++
++ at DPATCH@
++diff -urNad --exclude=CVS --exclude=.svn ./src/wmfire.c /tmp/dpep-work.9JzguN/wmfire/src/wmfire.c
++--- ./src/wmfire.c 2004-08-01 10:06:42.000000000 -0400
+++++ /tmp/dpep-work.9JzguN/wmfire/src/wmfire.c 2005-09-14 23:17:38.226063079 -0400
++@@ -133,6 +133,7 @@
++ int cpu_id = 0;
++ int cpu_nice = 1;
++ char net_dev[16] = "ppp0";
+++char resource_name[64] = "wmfire";
++ int net_spd = 0;
++ char *file_name = NULL;
++ int file_max = 100;
++@@ -568,12 +569,12 @@
++
++ attr.width = 64;
++ attr.height = 64;
++- attr.title = "wmfire";
+++ attr.title = resource_name;
++ attr.event_mask = MASK;
++ attr.wclass = GDK_INPUT_OUTPUT;
++ attr.visual = gdk_visual_get_system();
++ attr.colormap = gdk_colormap_get_system();
++- attr.wmclass_name = "wmfire";
+++ attr.wmclass_name = resource_name;
++ attr.wmclass_class = "wmfire";
++ attr.window_type = GDK_WINDOW_TOPLEVEL;
++
++@@ -650,7 +651,7 @@
++ bm.flame = fire[cmap].data;
++
++ /* Parse command options */
++- while ((i = getopt(argc, argv, "c:mni:s:xF:H:L:pf:lbhg:S:")) != -1) {
+++ while ((i = getopt(argc, argv, "c:mni:r:s:xF:H:L:pf:lbhg:S:")) != -1) {
++ switch (i) {
++ case 'S':
++ if (optarg)
++@@ -681,6 +682,10 @@
++ if (optarg)
++ strncpy(net_dev, optarg, sizeof (net_dev));
++ break;
+++ case 'r':
+++ if(optarg)
+++ strcpy(resource_name, optarg);
+++ break;
++ case 's':
++ if (optarg)
++ net_spd = atoi(optarg);
++@@ -760,5 +765,6 @@
++ fprintf(stderr, "%d:%s ", i + 1, fire[i].text);
++ fprintf(stderr, "\n\t-l\t\t\tlock flame colour and monitor\n");
++ fprintf(stderr, "\t-b\t\t\tactivate broken window manager fix\n");
+++ fprintf(stderr, "\t-r [...]\t\tchange resource name (default:%s)\n", resource_name);
++ fprintf(stderr, "\t-h\t\t\tprints this help\n");
++ }
++diff -urNad --exclude=CVS --exclude=.svn ./wmfire.1 /tmp/dpep-work.9JzguN/wmfire/wmfire.1
++--- ./wmfire.1 2004-06-28 15:27:52.000000000 -0400
+++++ /tmp/dpep-work.9JzguN/wmfire/wmfire.1 2005-09-14 23:18:23.250972034 -0400
++@@ -93,6 +93,10 @@
++ .B -p
++ Fire effect only (no monitoring)
++ .TP
+++.B -r
+++.RI [ ... ]
+++Change resource name (default:wmfire)
+++.TP
++ .B -s [...][K|M]
++ Change the network speed (Automatic preset values for interfaces: ppp=56K
++ eth=100M)
diff --cc debian/patches/03_gtk20.dpatch
index 0000000,0000000..64a386e
new file mode 100644
--- /dev/null
+++ b/debian/patches/03_gtk20.dpatch
@@@ -1,0 -1,0 +1,28 @@@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 02_gtk20.dpatch by Charles Fry <debian at frogcircus.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Revert changes dependent on GTK 2.4 for now
++
++ at DPATCH@
++diff -urNad --exclude=CVS --exclude=.svn ./src/wmfire.c /tmp/dpep-work.DbPli8/wmfire/src/wmfire.c
++--- ./src/wmfire.c 2004-08-01 10:06:42.000000000 -0400
+++++ /tmp/dpep-work.DbPli8/wmfire/src/wmfire.c 2005-09-28 13:48:47.858959118 -0400
++@@ -607,6 +607,7 @@
++ wmhints.icon_y = 0;
++ wmhints.window_group = win;
++ wmhints.flags = StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
+++ XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++
++ bm.gc = gdk_gc_new(bm.win);
++
++@@ -629,9 +630,6 @@
++
++ gdk_window_show(bm.win);
++
++- /* Moved after gdk_window_show due to change in GTK 2.4 */
++- XSetWMNormalHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++-
++ if (bm.x > 0 || bm.y > 0)
++ gdk_window_move(bm.win, bm.x, bm.y);
++ #undef MASK
diff --cc debian/rules
index 5b4efaa,0000000..a56f453
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,84 -1,0 +1,9 @@@
+#!/usr/bin/make -f
+#-*- makefile -*-
- # Made with the aid of dh_make, by Craig Small
- # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
- # Some lines taken from debmake, by Christoph Lameter.
+
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
- export DH_COMPAT=4
++include /usr/share/cdbs/1/rules/debhelper.mk
++include /usr/share/cdbs/1/class/autotools.mk
++include /usr/share/cdbs/1/rules/dpatch.mk
+
- CFLAGS = -Wall -g
-
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- else
- CFLAGS += -O2
- endif
-
- build: build-stamp
- build-stamp:
- dh_testdir
- rm -f config.status config.log config.status
- ./configure --prefix=/usr --mandir=/usr/share/man
- # Add here commands to compile the package.
- $(MAKE)
-
- touch build-stamp
-
- clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp install-stamp
-
- # Add here commands to clean up after the build process.
- -$(MAKE) distclean
-
- dh_clean
-
- install: install-stamp
- install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp.
- $(MAKE) install prefix=$(CURDIR)/debian/wmfire/usr/
- touch install-stamp
-
- # Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
-
- # Build architecture-dependent files here.
- binary-arch: build install
- # dh_testversion
- dh_testdir
- dh_testroot
- dh_installdocs
- # dh_installexamples
- dh_installmenu
- # dh_installemacsen
- # dh_installinit
- # dh_installcron
- dh_installman debian/wmfire.1
- # dh_undocumented fireload_cpu.1 fireload_file.1
- dh_installchangelogs ChangeLog
- # dh_link
- dh_strip
- dh_compress
- dh_fixperms
- # dh_makeshlibs
- dh_installdeb
- # dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
- source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
- binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary
++# allow dpatch-edit-patch to work (since dpatch.mk is broken, see bug #284231)
++unpatch: deapply-dpatches
diff --cc debian/watch
index 0000000,0000000..1824672
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,2 @@@
++version=3
++http://www.swanson.ukfsn.org/wmfire/wmfire-([\d\.]+).tar.gz debian svn-upgrade
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmfire.git
More information about the Pkg-wmaker-commits
mailing list