[Glibc-bsd-commits] r1726 - in trunk/web/patches: . debian-only

Petr Salinger ps-guest at alioth.debian.org
Fri Nov 17 20:45:04 CET 2006


Author: ps-guest
Date: 2006-11-17 20:45:04 +0100 (Fri, 17 Nov 2006)
New Revision: 1726

Removed:
   trunk/web/patches/debian-only/directfb.diff
   trunk/web/patches/debian-only/libdrm.diff
   trunk/web/patches/debian-only/pam.diff
   trunk/web/patches/debian-only/postgresql.bash
   trunk/web/patches/debian-only/xfonts-utils.diff
   trunk/web/patches/debian-only/xorg-macros_kbsd-gnu.diff
   trunk/web/patches/debian-only/xutils-dev.diff
   trunk/web/patches/debian-only/xutils.diff
   trunk/web/patches/directfb.diff
   trunk/web/patches/gst-plugins-base0.10.diff
   trunk/web/patches/mpich.diff
   trunk/web/patches/qemu.diff
   trunk/web/patches/totem.diff
   trunk/web/patches/xemacs21.diff
Log:
* drop some obsolete patches



Deleted: trunk/web/patches/debian-only/directfb.diff
===================================================================
--- trunk/web/patches/debian-only/directfb.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/debian-only/directfb.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,99 +0,0 @@
-
-Status: in BTS
-
-diff -ur -x Makefile.in -x config.guess -x config.sub -x configure -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x INSTALL -x aclocal.m4 -x config.h.in -x changelog directfb-0.9.24.old/debian/libdirectfb-0.9-24-udeb.install directfb-0.9.24/debian/libdirectfb-0.9-24-udeb.install
---- directfb-0.9.24.old/debian/libdirectfb-0.9-24-udeb.install	2006-04-19 12:57:49.000000000 +0200
-+++ directfb-0.9.24/debian/libdirectfb-0.9-24-udeb.install	2006-04-19 13:20:43.000000000 +0200
-@@ -2,11 +2,5 @@
- usr/lib/directfb-*/interfaces/IDirectFBFont/lib*_default.so
- usr/lib/directfb-*/interfaces/IDirectFBFont/lib*_ft2.so
- usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*_png.so
--usr/lib/directfb-*/gfxdrivers/libdirectfb_*.so
--usr/lib/directfb-*/inputdrivers/libdirectfb_linux_input.so
--usr/lib/directfb-*/inputdrivers/libdirectfb_keyboard.so
--usr/lib/directfb-*/inputdrivers/libdirectfb_ps2mouse.so
--usr/lib/directfb-*/inputdrivers/libdirectfb_serialmouse.so
--usr/lib/directfb-*/systems/libdirectfb_fbdev.so
- usr/lib/directfb-*/wm/libdirectfbwm_*.so
- usr/share/directfb*/
-diff -ur -x Makefile.in -x config.guess -x config.sub -x configure -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x INSTALL -x aclocal.m4 -x config.h.in -x changelog directfb-0.9.24.old/debian/libdirectfb-0.9-24.install directfb-0.9.24/debian/libdirectfb-0.9-24.install
---- directfb-0.9.24.old/debian/libdirectfb-0.9-24.install	2006-04-19 12:57:49.000000000 +0200
-+++ directfb-0.9.24/debian/libdirectfb-0.9-24.install	2006-04-19 13:22:39.000000000 +0200
-@@ -2,9 +2,5 @@
- usr/lib/directfb-*/interfaces/IDirectFBFont/lib*_default.so
- usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*_gif.so
- usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*_mpeg2.so
--usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/lib*_v4l.so
--usr/lib/directfb-*/gfxdrivers/libdirectfb_*.so
--usr/lib/directfb-*/inputdrivers/libdirectfb_*.so
--usr/lib/directfb-*/systems/libdirectfb_fbdev.so
- usr/lib/directfb-*/wm/libdirectfbwm_*.so
- usr/share/directfb-*/
-diff -ur -x Makefile.in -x config.guess -x config.sub -x configure -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x INSTALL -x aclocal.m4 -x config.h.in -x changelog directfb-0.9.24.old/debian/libdirectfb-dev.install directfb-0.9.24/debian/libdirectfb-dev.install
---- directfb-0.9.24.old/debian/libdirectfb-dev.install	2006-04-19 12:57:49.000000000 +0200
-+++ directfb-0.9.24/debian/libdirectfb-dev.install	2006-04-19 13:31:58.000000000 +0200
-@@ -9,14 +9,6 @@
- usr/lib/directfb-*/interfaces/IDirectFBFont/lib*.la
- usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*.a
- usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*.la
--usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/lib*.a
--usr/lib/directfb-*/interfaces/IDirectFBVideoProvider/lib*.la
--usr/lib/directfb-*/gfxdrivers/libdirectfb_*.a
--usr/lib/directfb-*/gfxdrivers/libdirectfb_*.la
--usr/lib/directfb-*/inputdrivers/libdirectfb_*.a
--usr/lib/directfb-*/inputdrivers/libdirectfb_*.la
--usr/lib/directfb-*/systems/libdirectfb_*.a
--usr/lib/directfb-*/systems/libdirectfb_*.la
- usr/lib/directfb-*/wm/libdirectfbwm_*.a
- usr/lib/directfb-*/wm/libdirectfbwm_*.la
- 
-diff -ur -x Makefile.in -x config.guess -x config.sub -x configure -x install-sh -x ltmain.sh -x missing -x mkinstalldirs -x INSTALL -x aclocal.m4 -x config.h.in -x changelog directfb-0.9.24.old/debian/patches/30_linux_types.patch directfb-0.9.24/debian/patches/30_linux_types.patch
---- directfb-0.9.24.old/debian/patches/30_linux_types.patch	2006-04-19 12:57:49.000000000 +0200
-+++ directfb-0.9.24/debian/patches/30_linux_types.patch	2006-04-19 14:18:25.000000000 +0200
-@@ -2,19 +2,23 @@
- Status: sent-upstream
- --- include/dfb_types.h	2005-07-26 22:58:50.000000000 +0200
- +++ include/dfb_types.h	2006-04-13 21:36:03.000000000 +0200
--@@ -1,9 +1,10 @@
-+@@ -1,10 +1,15 @@
-  #ifndef __DFB_TYPES_H__
-  #define __DFB_TYPES_H__
-  
---#include <sys/types.h>
-++#ifdef __linux__
- +#include <asm/types.h>
-++#else
-+ #include <sys/types.h>
-++#endif
-  
-  #ifndef USE_KOS
--+#if 0
-  
-++#ifndef __u8
-  #define __u8  u_int8_t
-  #define __u16 u_int16_t
--@@ -14,6 +15,7 @@
-+ #define __u32 u_int32_t
-+@@ -14,9 +19,11 @@
-  #define __s16 int16_t
-  #define __s32 int32_t
-  #define __s64 int64_t
-@@ -22,6 +26,18 @@
-  
-  #else
-  
-++#ifndef __u8
-+ #define __u8  uint8
-+ #define __u16 uint16
-+ #define __u32 uint32
-+@@ -26,7 +33,6 @@
-+ #define __s16 sint16
-+ #define __s32 sint32
-+ #define __s64 sint64
-+-
-+ #endif
-+ 
-+ #endif
- --- gfxdrivers/cyber5k/cyber5k.h	2003-12-05 06:01:06.000000000 +0200
- +++ gfxdrivers/cyber5k/cyber5k.h	2006-01-21 21:26:37.000000000 +0200
- @@ -28,7 +28,7 @@

Deleted: trunk/web/patches/debian-only/libdrm.diff
===================================================================
--- trunk/web/patches/debian-only/libdrm.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/debian-only/libdrm.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,18 +0,0 @@
-
-Author: aurel32
-Status: in debian BTS
-
-diff -ur libdrm-2.0.1.old/shared-core/drm.h libdrm-2.0.1/shared-core/drm.h
---- libdrm-2.0.1.old/shared-core/drm.h	2006-01-02 06:55:31.000000000 +0100
-+++ libdrm-2.0.1/shared-core/drm.h	2006-04-19 12:06:18.000000000 +0200
-@@ -79,8 +79,8 @@
- #define DRM_IOC_WRITE		_IOC_WRITE
- #define DRM_IOC_READWRITE	_IOC_READ|_IOC_WRITE
- #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
--#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
--#if defined(__FreeBSD__) && defined(IN_MODULE)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(IN_MODULE)
- /* Prevent name collision when including sys/ioccom.h */
- #undef ioctl
- #include <sys/ioccom.h>

Deleted: trunk/web/patches/debian-only/pam.diff
===================================================================
--- trunk/web/patches/debian-only/pam.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/debian-only/pam.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,15 +0,0 @@
-
-Author: rmh
-Status: In BTS.  We also need #333141.
-
---- pam-0.79.old/debian/control	2006-02-11 12:09:34.000000000 +0100
-+++ pam-0.79/debian/control	2006-02-11 12:13:49.000000000 +0100
-@@ -4,7 +4,7 @@
- Uploaders: Karl Ramm <kcr at debian.org>, Steve Langasek <vorlon at debian.org>
- Maintainer: Sam Hartman <hartmans at debian.org>
- Standards-Version: 3.5.8
--Build-Depends: cracklib2-dev (>= 2.7-9), bzip2, debhelper, patch, libdb4.3-dev, libcap-dev [!hurd-i386 !freebsd-i386 !netbsd-i386], libselinux1-dev [!hurd-i386 !freebsd-i386 !netbsd-i386]
-+Build-Depends: cracklib2-dev (>= 2.7-9), bzip2, debhelper, patch, libdb4.3-dev, libcap-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386]
- Build-Depends-Indep: linuxdoc-tools, linuxdoc-tools-latex,  tetex-extra, groff, opensp
- 
- Package: libpam0g

Deleted: trunk/web/patches/debian-only/postgresql.bash
===================================================================
--- trunk/web/patches/debian-only/postgresql.bash	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/debian-only/postgresql.bash	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,41 +0,0 @@
-diff -Nur postgresql-7.4.6.old/debian/control postgresql-7.4.6/debian/control
---- postgresql-7.4.6.old/debian/control	2005-01-20 09:35:30.000000000 +0100
-+++ postgresql-7.4.6/debian/control	2005-01-20 10:07:21.000000000 +0100
-@@ -4,7 +4,7 @@
- Maintainer: Oliver Elphick <Oliver.Elphick at lfix.co.uk>
- Uploaders: Martin Pitt <mpitt at debian.org>
- Standards-Version: 3.6.1
--Build-Depends: bison, perl (>= 5.8), libperl-dev, tk8.4-dev, flex, debhelper (>= 4.1.29), libreadline4-dev (>= 4.2), libssl-dev, zlib1g-dev | libz-dev, libpam0g-dev | libpam-dev, dbs, libxml2-dev, libltdl3-dev, libkrb5-dev, po-debconf, python-dev, gettext, mmv
-+Build-Depends: bison, perl (>= 5.8), libperl-dev, tk8.4-dev, flex, debhelper (>= 4.1.29), libreadline4-dev (>= 4.2), libssl-dev, zlib1g-dev | libz-dev, libpam0g-dev | libpam-dev, dbs, libxml2-dev, libltdl3-dev, libkrb5-dev, po-debconf, python-dev, gettext, mmv, autotools-dev, autoconf
- 
- Package: postgresql
- Architecture: any
-diff -Nur postgresql-7.4.6.old/debian/patches/15kbsd-gnu postgresql-7.4.6/debian/patches/15kbsd-gnu
---- postgresql-7.4.6.old/debian/patches/15kbsd-gnu	1970-01-01 01:00:00.000000000 +0100
-+++ postgresql-7.4.6/debian/patches/15kbsd-gnu	2005-01-20 10:26:58.000000000 +0100
-@@ -0,0 +1,12 @@
-+--- postgresql-7.4.6/configure.in~	2004-06-08 17:36:35.000000000 +0200
-++++ postgresql-7.4.6/configure.in	2004-07-29 17:08:45.000000000 +0200
-+@@ -64,7 +64,8 @@
-+  freebsd*) template=freebsd ;;
-+     hpux*) template=hpux ;;
-+     irix*) template=irix5 ;;
-+-   linux*) template=linux ;;
-++   linux*|gnu*|k*bsd*-gnu)
-++           template=linux ;;
-+    mingw*) template=win32 ;;
-+   netbsd*) template=netbsd ;;
-+ nextstep*) template=nextstep ;;
-diff -Nur postgresql-7.4.6.old/debian/rules postgresql-7.4.6/debian/rules
---- postgresql-7.4.6.old/debian/rules	2005-01-20 09:35:30.000000000 +0100
-+++ postgresql-7.4.6/debian/rules	2005-01-20 10:06:55.000000000 +0100
-@@ -90,7 +90,8 @@
- 	@echo debian/rules target $(BUILD_TREE)/config.status
- 	dh_testdir
- 
--	cd $(BUILD_TREE) && \
-+	cp /usr/share/misc/config.* $(BUILD_TREE)/config/
-+	cd $(BUILD_TREE) && `which autoconf2.50 || which autoconf` && \
- 	    echo /usr/include/ncurses /usr/include/readline | \
- 	    	DOCBOOKSTYLE=/usr/share/sgml/docbook/stylesheet/dsssl/modular \
- 		./configure --host=$(DEB_HOST_GNU_TYPE) \

Deleted: trunk/web/patches/debian-only/xfonts-utils.diff
===================================================================
--- trunk/web/patches/debian-only/xfonts-utils.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/debian-only/xfonts-utils.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,204 +0,0 @@
-
-Debian: in BTS
-Upstream: see upstream-only/xorg-macros_kbsd-gnu.diff
-
-diff -ur -x configure -x changelog -x config.sub -x config.guess xfonts-utils-1.0.0.old/bdftopcf-X11R7.0-1.0.0/aclocal.m4 xfonts-utils-1.0.0/bdftopcf-X11R7.0-1.0.0/aclocal.m4
---- xfonts-utils-1.0.0.old/bdftopcf-X11R7.0-1.0.0/aclocal.m4	2006-02-22 03:21:37.000000000 +0100
-+++ xfonts-utils-1.0.0/bdftopcf-X11R7.0-1.0.0/aclocal.m4	2006-04-19 13:29:28.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog -x config.sub -x config.guess xfonts-utils-1.0.0.old/font-util-X11R7.0-1.0.0/aclocal.m4 xfonts-utils-1.0.0/font-util-X11R7.0-1.0.0/aclocal.m4
---- xfonts-utils-1.0.0.old/font-util-X11R7.0-1.0.0/aclocal.m4	2006-02-22 03:21:38.000000000 +0100
-+++ xfonts-utils-1.0.0/font-util-X11R7.0-1.0.0/aclocal.m4	2006-04-19 13:29:28.000000000 +0200
-@@ -979,40 +979,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog -x config.sub -x config.guess xfonts-utils-1.0.0.old/mkfontdir-X11R7.0-1.0.1/aclocal.m4 xfonts-utils-1.0.0/mkfontdir-X11R7.0-1.0.1/aclocal.m4
---- xfonts-utils-1.0.0.old/mkfontdir-X11R7.0-1.0.1/aclocal.m4	2006-02-22 03:21:37.000000000 +0100
-+++ xfonts-utils-1.0.0/mkfontdir-X11R7.0-1.0.1/aclocal.m4	2006-04-19 13:29:28.000000000 +0200
-@@ -953,40 +953,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog -x config.sub -x config.guess xfonts-utils-1.0.0.old/mkfontscale-X11R7.0-1.0.1/aclocal.m4 xfonts-utils-1.0.0/mkfontscale-X11R7.0-1.0.1/aclocal.m4
---- xfonts-utils-1.0.0.old/mkfontscale-X11R7.0-1.0.1/aclocal.m4	2006-02-22 03:21:37.000000000 +0100
-+++ xfonts-utils-1.0.0/mkfontscale-X11R7.0-1.0.1/aclocal.m4	2006-04-19 13:29:28.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi

Deleted: trunk/web/patches/debian-only/xorg-macros_kbsd-gnu.diff
===================================================================
--- trunk/web/patches/debian-only/xorg-macros_kbsd-gnu.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/debian-only/xorg-macros_kbsd-gnu.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,95 +0,0 @@
-
-This patch doesn't apply to any package in particular, but to a lot of xorg
-packages that include buggy aclocal.m4.  It should apply cleanly to all of
-them.
-
-It's been fixed in upstream post-7.0 release.
-
-Index: macros/xorg-macros.m4
-===================================================================
-RCS file: /cvs/xorg/util/macros/xorg-macros.m4,v
-retrieving revision 1.8
-diff -u -r1.8 xorg-macros.m4
---- macros/xorg-macros.m4	9 Dec 2005 15:28:41 -0000	1.8
-+++ macros/xorg-macros.m4	19 Apr 2006 11:09:22 -0000
-@@ -79,40 +79,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-@@ -121,14 +121,14 @@
- # LinuxDebian, not other Linuxes, so we leave it unchanged here
- if test x$MISC_MAN_SUFFIX = x    ; then
-     case $host_os in
--#	linux*)		MISC_MAN_SUFFIX=7x ;;
-+#	linux* | k*bsd*-gnu)		MISC_MAN_SUFFIX=7x ;;
- 	solaris*)	MISC_MAN_SUFFIX=5  ;;
- 	*)		MISC_MAN_SUFFIX=7  ;;
-     esac
- fi
- if test x$MISC_MAN_DIR = x    ; then
-     case $host_os in
--#	linux*)	MISC_MAN_DIR='$(mandir)/man7' ;;
-+#	linux* | k*bsd*-gnu)	MISC_MAN_DIR='$(mandir)/man7' ;;
- 	*)	MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
-     esac
- fi
-@@ -137,14 +137,14 @@
- # LinuxDebian, not other Linuxes, so we leave it unchanged here
- if test x$DRIVER_MAN_SUFFIX = x    ; then
-     case $host_os in
--#	linux*)		DRIVER_MAN_SUFFIX=4x ;;
-+#	linux* | k*bsd*-gnu)		DRIVER_MAN_SUFFIX=4x ;;
- 	solaris*)	DRIVER_MAN_SUFFIX=7  ;;
- 	*)		DRIVER_MAN_SUFFIX=4  ;;
-     esac
- fi
- if test x$DRIVER_MAN_DIR = x    ; then
-     case $host_os in
--#	linux*)	DRIVER_MAN_DIR='$(mandir)/man4' ;;
-+#	linux* | k*bsd*-gnu)	DRIVER_MAN_DIR='$(mandir)/man4' ;;
- 	*)	DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
-     esac
- fi

Deleted: trunk/web/patches/debian-only/xutils-dev.diff
===================================================================
--- trunk/web/patches/debian-only/xutils-dev.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/debian-only/xutils-dev.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,204 +0,0 @@
-
-Debian: in BTS
-Upstream: see upstream-only/xorg-macros_kbsd-gnu.diff
-
-diff -ur -x configure -x changelog -x config.sub -x config.guess xutils-dev-1.0.2.old/gccmakedep-1.0.1/aclocal.m4 xutils-dev-1.0.2/gccmakedep-1.0.1/aclocal.m4
---- xutils-dev-1.0.2.old/gccmakedep-1.0.1/aclocal.m4	2006-04-16 01:11:55.000000000 +0200
-+++ xutils-dev-1.0.2/gccmakedep-1.0.1/aclocal.m4	2006-04-19 13:27:28.000000000 +0200
-@@ -953,40 +953,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog -x config.sub -x config.guess xutils-dev-1.0.2.old/imake-1.0.1/aclocal.m4 xutils-dev-1.0.2/imake-1.0.1/aclocal.m4
---- xutils-dev-1.0.2.old/imake-1.0.1/aclocal.m4	2006-04-16 01:11:53.000000000 +0200
-+++ xutils-dev-1.0.2/imake-1.0.1/aclocal.m4	2006-04-19 13:27:28.000000000 +0200
-@@ -979,40 +979,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog -x config.sub -x config.guess xutils-dev-1.0.2.old/lndir-1.0.1/aclocal.m4 xutils-dev-1.0.2/lndir-1.0.1/aclocal.m4
---- xutils-dev-1.0.2.old/lndir-1.0.1/aclocal.m4	2006-04-16 01:11:54.000000000 +0200
-+++ xutils-dev-1.0.2/lndir-1.0.1/aclocal.m4	2006-04-19 13:27:28.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog -x config.sub -x config.guess xutils-dev-1.0.2.old/makedepend-1.0.0/aclocal.m4 xutils-dev-1.0.2/makedepend-1.0.0/aclocal.m4
---- xutils-dev-1.0.2.old/makedepend-1.0.0/aclocal.m4	2006-04-16 01:11:55.000000000 +0200
-+++ xutils-dev-1.0.2/makedepend-1.0.0/aclocal.m4	2006-04-19 13:27:28.000000000 +0200
-@@ -1097,40 +1097,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi

Deleted: trunk/web/patches/debian-only/xutils.diff
===================================================================
--- trunk/web/patches/debian-only/xutils.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/debian-only/xutils.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,354 +0,0 @@
-
-Debian: in BTS
-Upstream: see upstream-only/xorg-macros_kbsd-gnu.diff
-
-diff -ur -x configure -x changelog xutils-7.0.0.old/fslsfonts-X11R7.0-1.0.1/aclocal.m4 xutils-7.0.0/fslsfonts-X11R7.0-1.0.1/aclocal.m4
---- xutils-7.0.0.old/fslsfonts-X11R7.0-1.0.1/aclocal.m4	2006-03-20 03:42:44.000000000 +0100
-+++ xutils-7.0.0/fslsfonts-X11R7.0-1.0.1/aclocal.m4	2006-04-19 12:24:41.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog xutils-7.0.0.old/luit-X11R7.0-1.0.1/aclocal.m4 xutils-7.0.0/luit-X11R7.0-1.0.1/aclocal.m4
---- xutils-7.0.0.old/luit-X11R7.0-1.0.1/aclocal.m4	2006-03-20 03:42:45.000000000 +0100
-+++ xutils-7.0.0/luit-X11R7.0-1.0.1/aclocal.m4	2006-04-19 12:25:16.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog xutils-7.0.0.old/rstart-X11R7.0-1.0.1/aclocal.m4 xutils-7.0.0/rstart-X11R7.0-1.0.1/aclocal.m4
---- xutils-7.0.0.old/rstart-X11R7.0-1.0.1/aclocal.m4	2006-03-20 03:42:48.000000000 +0100
-+++ xutils-7.0.0/rstart-X11R7.0-1.0.1/aclocal.m4	2006-04-19 12:25:16.000000000 +0200
-@@ -979,40 +979,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog xutils-7.0.0.old/scripts-X11R7.0-1.0.1/aclocal.m4 xutils-7.0.0/scripts-X11R7.0-1.0.1/aclocal.m4
---- xutils-7.0.0.old/scripts-X11R7.0-1.0.1/aclocal.m4	2006-03-20 03:42:50.000000000 +0100
-+++ xutils-7.0.0/scripts-X11R7.0-1.0.1/aclocal.m4	2006-04-19 12:25:17.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog xutils-7.0.0.old/sessreg-X11R7.0-1.0.0/aclocal.m4 xutils-7.0.0/sessreg-X11R7.0-1.0.0/aclocal.m4
---- xutils-7.0.0.old/sessreg-X11R7.0-1.0.0/aclocal.m4	2006-03-20 03:42:48.000000000 +0100
-+++ xutils-7.0.0/sessreg-X11R7.0-1.0.0/aclocal.m4	2006-04-19 12:25:17.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog xutils-7.0.0.old/showfont-X11R7.0-1.0.1/aclocal.m4 xutils-7.0.0/showfont-X11R7.0-1.0.1/aclocal.m4
---- xutils-7.0.0.old/showfont-X11R7.0-1.0.1/aclocal.m4	2006-03-20 03:42:50.000000000 +0100
-+++ xutils-7.0.0/showfont-X11R7.0-1.0.1/aclocal.m4	2006-04-19 12:25:17.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi
-diff -ur -x configure -x changelog xutils-7.0.0.old/xfsinfo-X11R7.0-1.0.1/aclocal.m4 xutils-7.0.0/xfsinfo-X11R7.0-1.0.1/aclocal.m4
---- xutils-7.0.0.old/xfsinfo-X11R7.0-1.0.1/aclocal.m4	2006-03-20 03:42:49.000000000 +0100
-+++ xutils-7.0.0/xfsinfo-X11R7.0-1.0.1/aclocal.m4	2006-04-19 12:25:17.000000000 +0200
-@@ -1136,40 +1136,40 @@
- 
- if test x$APP_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_SUFFIX=1x ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_SUFFIX=1x ;;
- 	*)	APP_MAN_SUFFIX=1  ;;
-     esac
- fi
- if test x$APP_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	APP_MAN_DIR='$(mandir)/man1' ;;
-+	linux* | k*bsd*-gnu)	APP_MAN_DIR='$(mandir)/man1' ;;
- 	*)	APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$LIB_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_SUFFIX=3x ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_SUFFIX=3x ;;
- 	*)	LIB_MAN_SUFFIX=3  ;;
-     esac
- fi
- if test x$LIB_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	LIB_MAN_DIR='$(mandir)/man3' ;;
-+	linux* | k*bsd*-gnu)	LIB_MAN_DIR='$(mandir)/man3' ;;
- 	*)	LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
-     esac
- fi
- 
- if test x$FILE_MAN_SUFFIX = x    ; then
-     case $host_os in
--	linux*)		FILE_MAN_SUFFIX=5x ;;
-+	linux* | k*bsd*-gnu)		FILE_MAN_SUFFIX=5x ;;
- 	solaris*)	FILE_MAN_SUFFIX=4  ;;
- 	*)		FILE_MAN_SUFFIX=5  ;;
-     esac
- fi
- if test x$FILE_MAN_DIR = x    ; then
-     case $host_os in
--	linux*)	FILE_MAN_DIR='$(mandir)/man5' ;;
-+	linux* | k*bsd*-gnu)	FILE_MAN_DIR='$(mandir)/man5' ;;
- 	*)	FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
-     esac
- fi

Deleted: trunk/web/patches/directfb.diff
===================================================================
--- trunk/web/patches/directfb.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/directfb.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,95 +0,0 @@
-diff -u directfb-0.9.25.1/debian/patches/30_linux_types.patch directfb-0.9.25.1/debian/patches/30_linux_types.patch
---- directfb-0.9.25.1/debian/patches/30_linux_types.patch
-+++ directfb-0.9.25.1/debian/patches/30_linux_types.patch
-@@ -5,20 +5,15 @@
--@@ -1,9 +1,10 @@
-+@@ -1,6 +1,9 @@
-  #ifndef __DFB_TYPES_H__
-  #define __DFB_TYPES_H__
-  
---#include <sys/types.h>
-++#ifdef __linux__
- +#include <asm/types.h>
-++#else
-+ #include <sys/types.h>
-  
-  #ifndef USE_KOS
--+#if 0
-+@@ -30,3 +33,4 @@
-+ #endif
-  
-- #define __u8  u_int8_t
-- #define __u16 u_int16_t
--@@ -14,6 +15,7 @@
-- #define __s16 int16_t
-- #define __s32 int32_t
-- #define __s64 int64_t
-+ #endif
- +#endif
-- 
-- #else
-- 
-diff -u directfb-0.9.25.1/debian/rules directfb-0.9.25.1/debian/rules
---- directfb-0.9.25.1/debian/rules
-+++ directfb-0.9.25.1/debian/rules
-@@ -79,6 +79,7 @@
- 	-$(MAKE) distclean
- 	-rm -rf $(BUILD_DIST)
- 	-rm -rf $(BUILD_UDEB)
-+	-rm -f debian/*.install.kfreebsd-amd64
- 	
- 	dh_clean
- 
-@@ -99,7 +100,11 @@
- binary-arch: install
- 	dh_testdir
- 	dh_testroot
--	
-+
-+	for i in $(package_lib) $(package_udeb) libdirectfb-dev; do \
-+		cp debian/$${i}.install.kfreebsd-i386 debian/$$i.install.kfreebsd-amd64; \
-+	done
-+
- 	dh_install --sourcedir=$(DESTDIR_UDEB) -p$(package_udeb)
- 	dh_install --sourcedir=$(DESTDIR_DIST) -p$(package_lib) -Xsdl -Xx11 -Xvnc
- 	dh_install --sourcedir=$(DESTDIR_DIST) -a -N$(package_udeb) -N$(package_lib)
-only in patch2:
-unchanged:
---- directfb-0.9.25.1.orig/debian/libdirectfb-0.9-25-udeb.install.kfreebsd-i386
-+++ directfb-0.9.25.1/debian/libdirectfb-0.9-25-udeb.install.kfreebsd-i386
-@@ -0,0 +1,6 @@
-+usr/lib/lib*.so.*
-+usr/lib/directfb-*/interfaces/IDirectFBFont/lib*_default.so
-+usr/lib/directfb-*/interfaces/IDirectFBFont/lib*_ft2.so
-+usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*_png.so
-+usr/lib/directfb-*/wm/libdirectfbwm_*.so
-+usr/share/directfb*/
-only in patch2:
-unchanged:
---- directfb-0.9.25.1.orig/debian/libdirectfb-0.9-25.install.kfreebsd-i386
-+++ directfb-0.9.25.1/debian/libdirectfb-0.9-25.install.kfreebsd-i386
-@@ -0,0 +1,6 @@
-+usr/lib/lib*.so.*
-+usr/lib/directfb-*/interfaces/IDirectFBFont/lib*_default.so
-+usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*_gif.so
-+usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*_mpeg2.so
-+usr/lib/directfb-*/wm/libdirectfbwm_*.so
-+usr/share/directfb-*/
-only in patch2:
-unchanged:
---- directfb-0.9.25.1.orig/debian/libdirectfb-dev.install.kfreebsd-i386
-+++ directfb-0.9.25.1/debian/libdirectfb-dev.install.kfreebsd-i386
-@@ -0,0 +1,13 @@
-+usr/include/
-+usr/lib/lib*.a
-+usr/lib/lib*.so
-+usr/lib/lib*.la
-+usr/bin/directfb-*
-+usr/lib/pkgconfig/
-+usr/share/man/man1/directfb-*
-+usr/lib/directfb-*/interfaces/IDirectFBFont/lib*.a
-+usr/lib/directfb-*/interfaces/IDirectFBFont/lib*.la
-+usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*.a
-+usr/lib/directfb-*/interfaces/IDirectFBImageProvider/lib*.la
-+usr/lib/directfb-*/wm/libdirectfbwm_*.a
-+usr/lib/directfb-*/wm/libdirectfbwm_*.la

Deleted: trunk/web/patches/gst-plugins-base0.10.diff
===================================================================
--- trunk/web/patches/gst-plugins-base0.10.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/gst-plugins-base0.10.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,11 +0,0 @@
-diff -u gst-plugins-base0.10-0.10.10/debian/gstreamer-plugins-base.install gst-plugins-base0.10-0.10.10/debian/gstreamer-plugins-base.install
---- gst-plugins-base0.10-0.10.10/debian/gstreamer-plugins-base.install
-+++ gst-plugins-base0.10-0.10.10/debian/gstreamer-plugins-base.install
-@@ -14,7 +14,6 @@
- debian/tmp/usr/lib/gstreamer- at GST_ABI@/libgsttcp.so
- debian/tmp/usr/lib/gstreamer- at GST_ABI@/libgsttheora.so
- debian/tmp/usr/lib/gstreamer- at GST_ABI@/libgsttypefindfunctions.so
--debian/tmp/usr/lib/gstreamer- at GST_ABI@/libgstvideo4linux.so
- debian/tmp/usr/lib/gstreamer- at GST_ABI@/libgstvideorate.so
- debian/tmp/usr/lib/gstreamer- at GST_ABI@/libgstvideoscale.so
- debian/tmp/usr/lib/gstreamer- at GST_ABI@/libgstvideotestsrc.so

Deleted: trunk/web/patches/mpich.diff
===================================================================
--- trunk/web/patches/mpich.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/mpich.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,8086 +0,0 @@
-Author: aurel32
-Status: in BTS
-
-diff -u mpich-1.2.7/debian/patches/00list mpich-1.2.7/debian/patches/00list
---- mpich-1.2.7/debian/patches/00list
-+++ mpich-1.2.7/debian/patches/00list
-@@ -14,0 +15,2 @@
-+19_kfreebsd
-+20_config_guess_sub
---- mpich-1.2.7.orig/debian/patches/20_config_guess_sub.dpatch
-+++ mpich-1.2.7/debian/patches/20_config_guess_sub.dpatch
-@@ -0,0 +1,8041 @@
-+#! /bin/sh -e
-+## 20_config_guess_sub.dpatch by Aurelien Janro <aurel32 at debian.org>
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: Update config.{guess,sub} in the MPI-2-C++/ and mpe/ subdirs
-+
-+if [ $# -ne 1 ]; then
-+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+    exit 1
-+fi
-+case "$1" in
-+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-+    *)
-+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+        exit 1;;
-+esac
-+
-+exit 0
-+
-+--- mpich-1.2.7.orig/MPI-2-C++/config.sub	2005-09-12 23:40:44.000000000 +0200
-++++ mpich-1.2.7/MPI-2-C++/config.sub	2005-09-12 23:40:56.000000000 +0200
-+@@ -1,9 +1,9 @@
-+ #! /bin/sh
-+ # Configuration validation subroutine script.
-+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+-#   2000, 2001, 2002 Free Software Foundation, Inc.
-++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+ 
-+-timestamp='2002-03-07'
-++timestamp='2005-07-08'
-+ 
-+ # This file is (in principle) common to ALL GNU software.
-+ # The presence of a machine in this file suggests that SOME GNU software
-+@@ -21,14 +21,15 @@
-+ #
-+ # 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 at gnu.org>.  Submit a context
-+ # diff and a properly formatted ChangeLog entry.
-+ #
-+@@ -70,7 +71,7 @@
-+ 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
-+@@ -83,11 +84,11 @@
-+ 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.
-+@@ -99,7 +100,7 @@
-+     *local*)
-+        # First pass through any local machine types.
-+        echo $1
-+-       exit 0;;
-++       exit ;;
-+ 
-+     * )
-+        break ;;
-+@@ -118,7 +119,8 @@
-+ # 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-* | rtmk-nova*)
-++  nto-qnx* | linux-gnu* | linux-dietlibc | 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/'`
-+     ;;
-+@@ -144,7 +146,7 @@
-+ 	-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
-+ 		;;
-+@@ -228,34 +230,55 @@
-+ 	| 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 | dsp16xx \
-+-	| fr30 \
-++	| d10v | d30v | dlx | dsp16xx \
-++	| fr30 | frv \
-+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ 	| i370 | i860 | i960 | ia64 \
-+-	| m32r | m68000 | m68k | m88k | mcore \
-+-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-+-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-+-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-+-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-+-	| mipsisa32 | mipsisa64 \
-++	| ip2k | iq2000 \
-++	| m32r | m32rle | m68000 | m68k | 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 \
-+ 	| mn10200 | mn10300 \
-++	| ms1 \
-++	| msp430 \
-+ 	| ns16k | ns32k \
-+-	| openrisc | or32 \
-++	| or32 \
-+ 	| pdp10 | pdp11 | pj | pjl \
-+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ 	| pyramid \
-+-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-++	| 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 | tic80 | tron \
-++	| tahoe | thumb | tic4x | tic80 | tron \
-+ 	| v850 | v850e \
-+ 	| we32k \
-+-	| x86 | xscale | xstormy16 | xtensa \
-++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ 	| z8k)
-+ 		basic_machine=$basic_machine-unknown
-+ 		;;
-++	m32c)
-++		basic_machine=$basic_machine-unknown
-++		;;
-+ 	m6811 | m68hc11 | m6812 | m68hc12)
-+ 		# Motorola 68HC11/12.
-+ 		basic_machine=$basic_machine-unknown
-+@@ -281,41 +304,63 @@
-+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+-	| arm-*  | armbe-* | armle-* | armv*-* \
-++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+ 	| avr-* \
-+-	| bs2000-* \
-+-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-+-	| clipper-* | cydra-* \
-+-	| d10v-* | d30v-* \
-++	| bfin-* | bs2000-* \
-++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-++	| clipper-* | craynv-* | 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-* \
-+-	| m32r-* \
-++	| ip2k-* | iq2000-* \
-++	| m32r-* | m32rle-* \
-+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+-	| m88110-* | m88k-* | mcore-* \
-+-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-+-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-+-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-+-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-++	| 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-* \
-++	| msp430-* \
-+ 	| none-* | np1-* | ns16k-* | ns32k-* \
-+ 	| orion-* \
-+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ 	| pyramid-* \
-+ 	| romp-* | rs6000-* \
-+-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-+-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-++	| 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-* | xstormy16-* \
-+-	| xtensa-* \
-++	| 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.
-+ 	386bsd)
-+@@ -332,6 +377,9 @@
-+ 		basic_machine=a29k-amd
-+ 		os=-udi
-+ 		;;
-++    	abacus)
-++		basic_machine=abacus-unknown
-++		;;
-+ 	adobe68k)
-+ 		basic_machine=m68010-adobe
-+ 		os=-scout
-+@@ -346,6 +394,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
-+@@ -405,12 +459,27 @@
-+ 		basic_machine=j90-cray
-+ 		os=-unicos
-+ 		;;
-++	craynv)
-++		basic_machine=craynv-cray
-++		os=-unicosmp
-++		;;
-++	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
-+ 		;;
-+@@ -433,6 +502,10 @@
-+ 		basic_machine=m88k-motorola
-+ 		os=-sysv3
-+ 		;;
-++	djgpp)
-++		basic_machine=i586-pc
-++		os=-msdosdjgpp
-++		;;
-+ 	dpx20 | dpx20-*)
-+ 		basic_machine=rs6000-bull
-+ 		os=-bosx
-+@@ -611,10 +684,6 @@
-+ 	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
-+@@ -702,9 +771,12 @@
-+ 		basic_machine=hppa1.1-oki
-+ 		os=-proelf
-+ 		;;
-+-	or32 | or32-*)
-++	openrisc | openrisc-*)
-+ 		basic_machine=or32-unknown
-+-		os=-coff
-++		;;
-++	os400)
-++		basic_machine=powerpc-ibm
-++		os=-os400
-+ 		;;
-+ 	OSE68000 | ose68000)
-+ 		basic_machine=m68000-ericsson
-+@@ -728,49 +800,55 @@
-+ 	pbb)
-+ 		basic_machine=m68k-tti
-+ 		;;
-+-        pc532 | pc532-*)
-++	pc532 | pc532-*)
-+ 		basic_machine=ns32k-pc532
-+ 		;;
-+ 	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
-+ 		;;
-++	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/^[^-]*-//'`
-+ 		;;
-+@@ -801,6 +879,16 @@
-+ 		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
-+ 		;;
-+@@ -808,6 +896,9 @@
-+ 		basic_machine=sh-hitachi
-+ 		os=-hms
-+ 		;;
-++	sh64)
-++		basic_machine=sh64-unknown
-++		;;
-+ 	sparclite-wrs | simso-wrs)
-+ 		basic_machine=sparclite-wrs
-+ 		os=-vxworks
-+@@ -866,7 +957,7 @@
-+ 	sun386 | sun386i | roadrunner)
-+ 		basic_machine=i386-sun
-+ 		;;
-+-        sv1)
-++	sv1)
-+ 		basic_machine=sv1-cray
-+ 		os=-unicos
-+ 		;;
-+@@ -874,10 +965,6 @@
-+ 		basic_machine=i386-sequent
-+ 		os=-dynix
-+ 		;;
-+-	t3d)
-+-		basic_machine=alpha-cray
-+-		os=-unicos
-+-		;;
-+ 	t3e)
-+ 		basic_machine=alphaev5-cray
-+ 		os=-unicos
-+@@ -890,6 +977,14 @@
-+ 		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
-+ 		;;
-+@@ -903,6 +998,10 @@
-+ 	tower | tower-32)
-+ 		basic_machine=m68k-ncr
-+ 		;;
-++	tpf)
-++		basic_machine=s390x-ibm
-++		os=-tpf
-++		;;
-+ 	udi29k)
-+ 		basic_machine=a29k-amd
-+ 		os=-udi
-+@@ -924,8 +1023,8 @@
-+ 		os=-vms
-+ 		;;
-+ 	vpp*|vx|vx-*)
-+-               basic_machine=f301-fujitsu
-+-               ;;
-++		basic_machine=f301-fujitsu
-++		;;
-+ 	vxworks960)
-+ 		basic_machine=i960-wrs
-+ 		os=-vxworks
-+@@ -946,11 +1045,11 @@
-+ 		basic_machine=hppa1.1-winbond
-+ 		os=-proelf
-+ 		;;
-+-	windows32)
-+-		basic_machine=i386-pc
-+-		os=-windows32-msvcrt
-++	xbox)
-++		basic_machine=i686-pc
-++		os=-mingw32
-+ 		;;
-+-        xps | xps100)
-++	xps | xps100)
-+ 		basic_machine=xps100-honeywell
-+ 		;;
-+ 	ymp)
-+@@ -980,6 +1079,9 @@
-+ 	romp)
-+ 		basic_machine=romp-ibm
-+ 		;;
-++	mmix)
-++		basic_machine=mmix-knuth
-++		;;
-+ 	rs6000)
-+ 		basic_machine=rs6000-ibm
-+ 		;;
-+@@ -996,16 +1098,13 @@
-+ 	we32k)
-+ 		basic_machine=we32k-att
-+ 		;;
-+-	sh3 | sh4 | sh3eb | sh4eb)
-++	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+ 		basic_machine=sh-unknown
-+ 		;;
-+-	sh64)
-+-		basic_machine=sh64-unknown
-+-		;;
-+-	sparc | sparcv9 | sparcv9b)
-++	sparc | sparcv8 | sparcv9 | sparcv9b)
-+ 		basic_machine=sparc-sun
-+ 		;;
-+-        cydra)
-++	cydra)
-+ 		basic_machine=cydra-cydrome
-+ 		;;
-+ 	orion)
-+@@ -1020,10 +1119,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.
-+ 		;;
-+@@ -1079,18 +1174,21 @@
-+ 	      | -aos* \
-+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-++	      | -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* | -uxpv* | -beos* | -mpeix* | -udk* \
-+-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-++	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-++	      | -skyos* | -haiku*)
-+ 	# Remember, each alternative MUST END IN *, to match a version number.
-+ 		;;
-+ 	-qnx*)
-+@@ -1102,16 +1200,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|'`
-+ 		;;
-+@@ -1124,6 +1227,9 @@
-+ 	-opened*)
-+ 		os=-openedition
-+ 		;;
-++        -os400*)
-++		os=-os400
-++		;;
-+ 	-wince*)
-+ 		os=-wince
-+ 		;;
-+@@ -1145,6 +1251,9 @@
-+ 	-atheos*)
-+ 		os=-atheos
-+ 		;;
-++	-syllable*)
-++		os=-syllable
-++		;;
-+ 	-386bsd)
-+ 		os=-bsd
-+ 		;;
-+@@ -1155,7 +1264,7 @@
-+ 		os=-rtmk-nova
-+ 		;;
-+ 	-ns2 )
-+-	        os=-nextstep2
-++		os=-nextstep2
-+ 		;;
-+ 	-nsk*)
-+ 		os=-nsk
-+@@ -1167,6 +1276,9 @@
-+ 	-sinix*)
-+ 		os=-sysv4
-+ 		;;
-++        -tpf*)
-++		os=-tpf
-++		;;
-+ 	-triton*)
-+ 		os=-sysv3
-+ 		;;
-+@@ -1194,8 +1306,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)
-+ 		;;
-+@@ -1228,11 +1349,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-*)
-+@@ -1271,9 +1395,15 @@
-+ 	*-be)
-+ 		os=-beos
-+ 		;;
-++	*-haiku)
-++		os=-haiku
-++		;;
-+ 	*-ibm)
-+ 		os=-aix
-+ 		;;
-++    	*-knuth)
-++		os=-mmixware
-++		;;
-+ 	*-wec)
-+ 		os=-proelf
-+ 		;;
-+@@ -1325,19 +1455,19 @@
-+ 	*-next)
-+ 		os=-nextstep3
-+ 		;;
-+-        *-gould)
-++	*-gould)
-+ 		os=-sysv
-+ 		;;
-+-        *-highlevel)
-++	*-highlevel)
-+ 		os=-bsd
-+ 		;;
-+ 	*-encore)
-+ 		os=-bsd
-+ 		;;
-+-        *-sgi)
-++	*-sgi)
-+ 		os=-irix
-+ 		;;
-+-        *-siemens)
-++	*-siemens)
-+ 		os=-sysv4
-+ 		;;
-+ 	*-masscomp)
-+@@ -1406,10 +1536,16 @@
-+ 			-mvs* | -opened*)
-+ 				vendor=ibm
-+ 				;;
-++			-os400*)
-++				vendor=ibm
-++				;;
-+ 			-ptx*)
-+ 				vendor=sequent
-+ 				;;
-+-			-vxsim* | -vxworks*)
-++			-tpf*)
-++				vendor=ibm
-++				;;
-++			-vxsim* | -vxworks* | -windiss*)
-+ 				vendor=wrs
-+ 				;;
-+ 			-aux*)
-+@@ -1433,7 +1569,7 @@
-+ esac
-+ 
-+ echo $basic_machine$os
-+-exit 0
-++exit
-+ 
-+ # Local variables:
-+ # eval: (add-hook 'write-file-hooks 'time-stamp)
-+--- mpich-1.2.7.orig/MPI-2-C++/config.guess	2005-09-12 23:40:36.000000000 +0200
-++++ mpich-1.2.7/MPI-2-C++/config.guess	2005-09-12 23:41:04.000000000 +0200
-+@@ -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, 2002, 2003 Free Software Foundation, Inc.
-++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+ 
-+-timestamp='2003-02-22'
-++timestamp='2005-08-03'
-+ 
-+ # 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,13 +17,15 @@
-+ #
-+ # 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.
-+ 
-++
-+ # 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.
-+@@ -53,7 +55,7 @@
-+ GNU config.guess ($timestamp)
-+ 
-+ Originally written by Per Bothner.
-+-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
-+@@ -66,11 +68,11 @@
-+ 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.
-+@@ -106,6 +108,7 @@
-+ : ${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" ;
-+@@ -122,7 +125,7 @@
-+ 	;;
-+  ,,*)   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 at noc.rutgers.edu 1994-08-24)
-+@@ -195,50 +198,29 @@
-+ 	# 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 ;;
-++	exit ;;
-+     *:OpenBSD:*:*)
-+-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+-	exit 0 ;;
-++	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 ;;
-++    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
-+@@ -276,39 +258,49 @@
-+ 	    "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.
-+-	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;;
-++	exit ;;
-+     *:[Aa]miga[Oo][Ss]:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-amigaos
-+-	exit 0 ;;
-++	exit ;;
-+     *:[Mm]orph[Oo][Ss]:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-morphos
-+-	exit 0 ;;
-++	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 at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+@@ -316,29 +308,32 @@
-+ 	else
-+ 		echo pyramid-pyramid-bsd
-+ 	fi
-+-	exit 0 ;;
-++	exit ;;
-+     NILE*:*:*:dcosx)
-+ 	echo pyramid-pyramid-svr4
-+-	exit 0 ;;
-+-    DRS?6000:UNIX_SV:4.2*:7*)
-++	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 0 ;;
-++	    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*)
-+@@ -347,10 +342,10 @@
-+ 	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=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+@@ -362,10 +357,10 @@
-+ 		echo sparc-sun-sunos${UNAME_RELEASE}
-+ 		;;
-+ 	esac
-+-	exit 0 ;;
-++	exit ;;
-+     aushp:SunOS:*:*)
-+ 	echo sparc-auspex-sunos${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
-+@@ -376,37 +371,40 @@
-+     # 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 ;;
-++        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
-+@@ -430,32 +428,33 @@
-+ 	  exit (-1);
-+ 	}
-+ EOF
-+-	$CC_FOR_BUILD -o $dummy $dummy.c \
-+-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+-	  && exit 0
-++	$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 0 ;;
-++	exit ;;
-+     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ 	echo powerpc-harris-powermax
-+-	exit 0 ;;
-++	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`
-+@@ -471,29 +470,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`
-+@@ -501,7 +500,7 @@
-+ 		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
-+@@ -516,14 +515,18 @@
-+ 			exit(0);
-+ 			}
-+ EOF
-+-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+-		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 | sed 1q | awk '{ print $1 }'`
-+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+@@ -537,28 +540,28 @@
-+ 		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
-+@@ -620,9 +623,19 @@
-+ 	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
-++	    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
-+@@ -630,11 +643,11 @@
-+ 	    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
-+@@ -662,147 +675,166 @@
-+ 	  exit (0);
-+ 	}
-+ EOF
-+-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-++	$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 ;;
-++	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 ;;
-++	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 ;;
-++        exit ;;
-+     CRAY*Y-MP:*:*:*)
-+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+-	exit 0 ;;
-++	exit ;;
-+     CRAY*[A-Z]90:*:*:*)
-+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ 	      -e 's/\.[^.]*$/.X/'
-+-	exit 0 ;;
-++	exit ;;
-+     CRAY*TS:*:*:*)
-+ 	echo t90-cray-unicos${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 ;;
-++	exit ;;
-+     *:UNICOS/mp:*:*)
-+-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-+-	exit 0 ;;
-++	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 ;;
-++        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:*:*)
-+-	# 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=`
-+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-+-	exit 0 ;;
-++	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-++	exit ;;
-+     i*:CYGWIN*:*)
-+ 	echo ${UNAME_MACHINE}-pc-cygwin
-+-	exit 0 ;;
-++	exit ;;
-+     i*:MINGW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-mingw32
-+-	exit 0 ;;
-++	exit ;;
-++    i*:windows32*:*)
-++    	# uname -m includes "-pc" on this system.
-++    	echo ${UNAME_MACHINE}-mingw32
-++	exit ;;
-+     i*:PW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-pw32
-+-	exit 0 ;;
-+-    x86:Interix*:3*)
-+-	echo i586-pc-interix3
-+-	exit 0 ;;
-++	exit ;;
-++    x86:Interix*:[34]*)
-++	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-++	exit ;;
-+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ 	echo i${UNAME_MACHINE}-pc-mks
-+-	exit 0 ;;
-++	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 i586-pc-interix
-+-	exit 0 ;;
-++	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-gnu
-+-	exit 0 ;;
-++	exit ;;
-++    m32r*:Linux:*:*)
-++	echo ${UNAME_MACHINE}-unknown-linux-gnu
-++	exit ;;
-+     m68*:Linux:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     mips:Linux:*:*)
-+ 	eval $set_cc_for_build
-+ 	sed 's/^	//' << EOF >$dummy.c
-+@@ -820,7 +852,7 @@
-+ 	#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
-++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+ 	;;
-+     mips64:Linux:*:*)
-+ 	eval $set_cc_for_build
-+@@ -839,14 +871,17 @@
-+ 	#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
-++	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 0 ;;
-++	exit ;;
-+     ppc64:Linux:*:*)
-+ 	echo powerpc64-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     alpha:Linux:*:*)
-+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+@@ -860,7 +895,7 @@
-+ 	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
-+@@ -868,22 +903,25 @@
-+ 	  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 ;;
-+     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
-+@@ -901,15 +939,15 @@
-+ 		;;
-+ 	  a.out-i386-linux)
-+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+-		exit 0 ;;
-++		exit ;;
-+ 	  coff-i386)
-+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+-		exit 0 ;;
-++		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 0 ;;
-++		exit ;;
-+ 	esac
-+ 	# Determine whether the default compiler is a.out or elf
-+ 	eval $set_cc_for_build
-+@@ -932,17 +970,23 @@
-+ 	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
-++	test x"${LIBC}" != x && {
-++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-++		exit
-++	}
-++	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-+ 	;;
-+     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...
-+@@ -950,24 +994,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 0 ;;
-++	exit ;;
-+     i*86:XTS-300:*:STOP)
-+ 	echo ${UNAME_MACHINE}-unknown-stop
-+-	exit 0 ;;
-++	exit ;;
-+     i*86:atheos:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-atheos
-+-	exit 0 ;;
-++	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 0 ;;
-++	exit ;;
-+     i*86:*DOS:*:*)
-+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+-	exit 0 ;;
-++	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
-+@@ -975,15 +1022,16 @@
-+ 	else
-+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ 	fi
-+-	exit 0 ;;
-+-    i*86:*:5:[78]*)
-++	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 0 ;;
-++	exit ;;
-+     i*86:*:3.2:*)
-+ 	if test -f /usr/options/cb.name; then
-+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+@@ -1001,73 +1049,73 @@
-+ 	else
-+ 		echo ${UNAME_MACHINE}-pc-sysv32
-+ 	fi
-+-	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 ;;
-++	exit ;;
-+     mc68k:UNIX:SYSTEM5:3.51m)
-+ 	echo m68k-convergent-sysv
-+-	exit 0 ;;
-++	exit ;;
-+     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 | 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)
-++	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 ;;
-++	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`
-+@@ -1075,68 +1123,73 @@
-+ 	else
-+ 		echo ns32k-sni-sysv
-+ 	fi
-+-	exit 0 ;;
-++	exit ;;
-+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                       # says <Richard.M.Bartel at ccMail.Census.GOV>
-+         echo i586-unisys-sysv4
-+-        exit 0 ;;
-++        exit ;;
-+     *:UNIX_System_V:4*:FTX*)
-+ 	# From Gerald Hewes <hewes at openmarket.com>.
-+ 	# How about differentiating between stratus architectures? -djm
-+ 	echo hppa1.1-stratus-sysv4
-+-	exit 0 ;;
-++	exit ;;
-+     *:*:*:FTX*)
-+ 	# From seanf at swdc.stratus.com.
-+ 	echo i860-stratus-sysv4
-+-	exit 0 ;;
-++	exit ;;
-++    i*86:VOS:*:*)
-++	# From Paul.Green at stratus.com.
-++	echo ${UNAME_MACHINE}-stratus-vos
-++	exit ;;
-+     *:VOS:*:*)
-+ 	# From Paul.Green at stratus.com.
-+ 	echo hppa1.1-stratus-vos
-+-	exit 0 ;;
-++	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 0 ;;
-++	exit ;;
-+     Power*:Rhapsody:*:*)
-+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:Rhapsody:*:*)
-+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:Darwin:*:*)
-+-	case `uname -p` in
-++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-++	case $UNAME_PROCESSOR in
-+ 	    *86) UNAME_PROCESSOR=i686 ;;
-+-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-++	    unknown) UNAME_PROCESSOR=powerpc ;;
-+ 	esac
-+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ 	UNAME_PROCESSOR=`uname -p`
-+ 	if test "$UNAME_PROCESSOR" = "x86"; then
-+@@ -1144,22 +1197,25 @@
-+ 		UNAME_MACHINE=pc
-+ 	fi
-+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:QNX:*:4*)
-+ 	echo i386-pc-qnx
-+-	exit 0 ;;
-+-    NSR-[DGKLNPTVW]: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
-+@@ -1170,25 +1226,44 @@
-+ 	    UNAME_MACHINE="$cputype"
-+ 	fi
-+ 	echo ${UNAME_MACHINE}-unknown-plan9
-+-	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 ;;
-+ esac
-+ 
-+ #echo '(No uname command or uname output not recognized.)' 1>&2
-+@@ -1220,7 +1295,7 @@
-+ #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)
-+@@ -1309,11 +1384,12 @@
-+ }
-+ EOF
-+ 
-+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-++$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)
-+ 
-+@@ -1322,22 +1398,22 @@
-+     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
-+ 
-+@@ -1348,7 +1424,9 @@
-+ 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
-+--- mpich-1.2.7.orig/mpe/config.guess	2005-09-12 23:58:10.000000000 +0200
-++++ mpich-1.2.7/mpe/config.guess	2005-09-12 23:58:47.000000000 +0200
-+@@ -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, 2002, 2003 Free Software Foundation, Inc.
-++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+ 
-+-timestamp='2003-02-22'
-++timestamp='2005-08-03'
-+ 
-+ # 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,13 +17,15 @@
-+ #
-+ # 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.
-+ 
-++
-+ # 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.
-+@@ -53,7 +55,7 @@
-+ GNU config.guess ($timestamp)
-+ 
-+ Originally written by Per Bothner.
-+-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
-+@@ -66,11 +68,11 @@
-+ 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.
-+@@ -106,6 +108,7 @@
-+ : ${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" ;
-+@@ -122,7 +125,7 @@
-+ 	;;
-+  ,,*)   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 at noc.rutgers.edu 1994-08-24)
-+@@ -195,50 +198,29 @@
-+ 	# 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 ;;
-++	exit ;;
-+     *:OpenBSD:*:*)
-+-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+-	exit 0 ;;
-++	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 ;;
-++    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
-+@@ -276,39 +258,49 @@
-+ 	    "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.
-+-	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;;
-++	exit ;;
-+     *:[Aa]miga[Oo][Ss]:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-amigaos
-+-	exit 0 ;;
-++	exit ;;
-+     *:[Mm]orph[Oo][Ss]:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-morphos
-+-	exit 0 ;;
-++	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 at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+@@ -316,29 +308,32 @@
-+ 	else
-+ 		echo pyramid-pyramid-bsd
-+ 	fi
-+-	exit 0 ;;
-++	exit ;;
-+     NILE*:*:*:dcosx)
-+ 	echo pyramid-pyramid-svr4
-+-	exit 0 ;;
-+-    DRS?6000:UNIX_SV:4.2*:7*)
-++	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 0 ;;
-++	    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*)
-+@@ -347,10 +342,10 @@
-+ 	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=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+@@ -362,10 +357,10 @@
-+ 		echo sparc-sun-sunos${UNAME_RELEASE}
-+ 		;;
-+ 	esac
-+-	exit 0 ;;
-++	exit ;;
-+     aushp:SunOS:*:*)
-+ 	echo sparc-auspex-sunos${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
-+@@ -376,37 +371,40 @@
-+     # 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 ;;
-++        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
-+@@ -430,32 +428,33 @@
-+ 	  exit (-1);
-+ 	}
-+ EOF
-+-	$CC_FOR_BUILD -o $dummy $dummy.c \
-+-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+-	  && exit 0
-++	$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 0 ;;
-++	exit ;;
-+     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ 	echo powerpc-harris-powermax
-+-	exit 0 ;;
-++	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`
-+@@ -471,29 +470,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`
-+@@ -501,7 +500,7 @@
-+ 		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
-+@@ -516,14 +515,18 @@
-+ 			exit(0);
-+ 			}
-+ EOF
-+-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+-		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 | sed 1q | awk '{ print $1 }'`
-+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+@@ -537,28 +540,28 @@
-+ 		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
-+@@ -620,9 +623,19 @@
-+ 	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
-++	    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
-+@@ -630,11 +643,11 @@
-+ 	    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
-+@@ -662,147 +675,166 @@
-+ 	  exit (0);
-+ 	}
-+ EOF
-+-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-++	$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 ;;
-++	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 ;;
-++	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 ;;
-++        exit ;;
-+     CRAY*Y-MP:*:*:*)
-+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+-	exit 0 ;;
-++	exit ;;
-+     CRAY*[A-Z]90:*:*:*)
-+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ 	      -e 's/\.[^.]*$/.X/'
-+-	exit 0 ;;
-++	exit ;;
-+     CRAY*TS:*:*:*)
-+ 	echo t90-cray-unicos${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 ;;
-++	exit ;;
-+     *:UNICOS/mp:*:*)
-+-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-+-	exit 0 ;;
-++	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 ;;
-++        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:*:*)
-+-	# 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=`
-+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-+-	exit 0 ;;
-++	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-++	exit ;;
-+     i*:CYGWIN*:*)
-+ 	echo ${UNAME_MACHINE}-pc-cygwin
-+-	exit 0 ;;
-++	exit ;;
-+     i*:MINGW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-mingw32
-+-	exit 0 ;;
-++	exit ;;
-++    i*:windows32*:*)
-++    	# uname -m includes "-pc" on this system.
-++    	echo ${UNAME_MACHINE}-mingw32
-++	exit ;;
-+     i*:PW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-pw32
-+-	exit 0 ;;
-+-    x86:Interix*:3*)
-+-	echo i586-pc-interix3
-+-	exit 0 ;;
-++	exit ;;
-++    x86:Interix*:[34]*)
-++	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-++	exit ;;
-+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ 	echo i${UNAME_MACHINE}-pc-mks
-+-	exit 0 ;;
-++	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 i586-pc-interix
-+-	exit 0 ;;
-++	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-gnu
-+-	exit 0 ;;
-++	exit ;;
-++    m32r*:Linux:*:*)
-++	echo ${UNAME_MACHINE}-unknown-linux-gnu
-++	exit ;;
-+     m68*:Linux:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     mips:Linux:*:*)
-+ 	eval $set_cc_for_build
-+ 	sed 's/^	//' << EOF >$dummy.c
-+@@ -820,7 +852,7 @@
-+ 	#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
-++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+ 	;;
-+     mips64:Linux:*:*)
-+ 	eval $set_cc_for_build
-+@@ -839,14 +871,17 @@
-+ 	#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
-++	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 0 ;;
-++	exit ;;
-+     ppc64:Linux:*:*)
-+ 	echo powerpc64-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     alpha:Linux:*:*)
-+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+@@ -860,7 +895,7 @@
-+ 	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
-+@@ -868,22 +903,25 @@
-+ 	  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 ;;
-+     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
-+@@ -901,15 +939,15 @@
-+ 		;;
-+ 	  a.out-i386-linux)
-+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+-		exit 0 ;;
-++		exit ;;
-+ 	  coff-i386)
-+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+-		exit 0 ;;
-++		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 0 ;;
-++		exit ;;
-+ 	esac
-+ 	# Determine whether the default compiler is a.out or elf
-+ 	eval $set_cc_for_build
-+@@ -932,17 +970,23 @@
-+ 	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
-++	test x"${LIBC}" != x && {
-++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-++		exit
-++	}
-++	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-+ 	;;
-+     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...
-+@@ -950,24 +994,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 0 ;;
-++	exit ;;
-+     i*86:XTS-300:*:STOP)
-+ 	echo ${UNAME_MACHINE}-unknown-stop
-+-	exit 0 ;;
-++	exit ;;
-+     i*86:atheos:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-atheos
-+-	exit 0 ;;
-++	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 0 ;;
-++	exit ;;
-+     i*86:*DOS:*:*)
-+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+-	exit 0 ;;
-++	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
-+@@ -975,15 +1022,16 @@
-+ 	else
-+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ 	fi
-+-	exit 0 ;;
-+-    i*86:*:5:[78]*)
-++	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 0 ;;
-++	exit ;;
-+     i*86:*:3.2:*)
-+ 	if test -f /usr/options/cb.name; then
-+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+@@ -1001,73 +1049,73 @@
-+ 	else
-+ 		echo ${UNAME_MACHINE}-pc-sysv32
-+ 	fi
-+-	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 ;;
-++	exit ;;
-+     mc68k:UNIX:SYSTEM5:3.51m)
-+ 	echo m68k-convergent-sysv
-+-	exit 0 ;;
-++	exit ;;
-+     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 | 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)
-++	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 ;;
-++	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`
-+@@ -1075,68 +1123,73 @@
-+ 	else
-+ 		echo ns32k-sni-sysv
-+ 	fi
-+-	exit 0 ;;
-++	exit ;;
-+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                       # says <Richard.M.Bartel at ccMail.Census.GOV>
-+         echo i586-unisys-sysv4
-+-        exit 0 ;;
-++        exit ;;
-+     *:UNIX_System_V:4*:FTX*)
-+ 	# From Gerald Hewes <hewes at openmarket.com>.
-+ 	# How about differentiating between stratus architectures? -djm
-+ 	echo hppa1.1-stratus-sysv4
-+-	exit 0 ;;
-++	exit ;;
-+     *:*:*:FTX*)
-+ 	# From seanf at swdc.stratus.com.
-+ 	echo i860-stratus-sysv4
-+-	exit 0 ;;
-++	exit ;;
-++    i*86:VOS:*:*)
-++	# From Paul.Green at stratus.com.
-++	echo ${UNAME_MACHINE}-stratus-vos
-++	exit ;;
-+     *:VOS:*:*)
-+ 	# From Paul.Green at stratus.com.
-+ 	echo hppa1.1-stratus-vos
-+-	exit 0 ;;
-++	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 0 ;;
-++	exit ;;
-+     Power*:Rhapsody:*:*)
-+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:Rhapsody:*:*)
-+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:Darwin:*:*)
-+-	case `uname -p` in
-++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-++	case $UNAME_PROCESSOR in
-+ 	    *86) UNAME_PROCESSOR=i686 ;;
-+-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-++	    unknown) UNAME_PROCESSOR=powerpc ;;
-+ 	esac
-+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ 	UNAME_PROCESSOR=`uname -p`
-+ 	if test "$UNAME_PROCESSOR" = "x86"; then
-+@@ -1144,22 +1197,25 @@
-+ 		UNAME_MACHINE=pc
-+ 	fi
-+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:QNX:*:4*)
-+ 	echo i386-pc-qnx
-+-	exit 0 ;;
-+-    NSR-[DGKLNPTVW]: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
-+@@ -1170,25 +1226,44 @@
-+ 	    UNAME_MACHINE="$cputype"
-+ 	fi
-+ 	echo ${UNAME_MACHINE}-unknown-plan9
-+-	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 ;;
-+ esac
-+ 
-+ #echo '(No uname command or uname output not recognized.)' 1>&2
-+@@ -1220,7 +1295,7 @@
-+ #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)
-+@@ -1309,11 +1384,12 @@
-+ }
-+ EOF
-+ 
-+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-++$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)
-+ 
-+@@ -1322,22 +1398,22 @@
-+     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
-+ 
-+@@ -1348,7 +1424,9 @@
-+ 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
-+--- mpich-1.2.7.orig/mpe/config.sub	2005-09-12 23:58:24.000000000 +0200
-++++ mpich-1.2.7/mpe/config.sub	2005-09-12 23:58:33.000000000 +0200
-+@@ -1,9 +1,9 @@
-+ #! /bin/sh
-+ # Configuration validation subroutine script.
-+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+-#   2000, 2001, 2002 Free Software Foundation, Inc.
-++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+ 
-+-timestamp='2002-03-07'
-++timestamp='2005-07-08'
-+ 
-+ # This file is (in principle) common to ALL GNU software.
-+ # The presence of a machine in this file suggests that SOME GNU software
-+@@ -21,14 +21,15 @@
-+ #
-+ # 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 at gnu.org>.  Submit a context
-+ # diff and a properly formatted ChangeLog entry.
-+ #
-+@@ -70,7 +71,7 @@
-+ 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
-+@@ -83,11 +84,11 @@
-+ 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.
-+@@ -99,7 +100,7 @@
-+     *local*)
-+        # First pass through any local machine types.
-+        echo $1
-+-       exit 0;;
-++       exit ;;
-+ 
-+     * )
-+        break ;;
-+@@ -118,7 +119,8 @@
-+ # 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-* | rtmk-nova*)
-++  nto-qnx* | linux-gnu* | linux-dietlibc | 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/'`
-+     ;;
-+@@ -144,7 +146,7 @@
-+ 	-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
-+ 		;;
-+@@ -228,34 +230,55 @@
-+ 	| 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 | dsp16xx \
-+-	| fr30 \
-++	| d10v | d30v | dlx | dsp16xx \
-++	| fr30 | frv \
-+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ 	| i370 | i860 | i960 | ia64 \
-+-	| m32r | m68000 | m68k | m88k | mcore \
-+-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-+-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-+-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-+-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-+-	| mipsisa32 | mipsisa64 \
-++	| ip2k | iq2000 \
-++	| m32r | m32rle | m68000 | m68k | 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 \
-+ 	| mn10200 | mn10300 \
-++	| ms1 \
-++	| msp430 \
-+ 	| ns16k | ns32k \
-+-	| openrisc | or32 \
-++	| or32 \
-+ 	| pdp10 | pdp11 | pj | pjl \
-+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ 	| pyramid \
-+-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-++	| 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 | tic80 | tron \
-++	| tahoe | thumb | tic4x | tic80 | tron \
-+ 	| v850 | v850e \
-+ 	| we32k \
-+-	| x86 | xscale | xstormy16 | xtensa \
-++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ 	| z8k)
-+ 		basic_machine=$basic_machine-unknown
-+ 		;;
-++	m32c)
-++		basic_machine=$basic_machine-unknown
-++		;;
-+ 	m6811 | m68hc11 | m6812 | m68hc12)
-+ 		# Motorola 68HC11/12.
-+ 		basic_machine=$basic_machine-unknown
-+@@ -281,41 +304,63 @@
-+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+-	| arm-*  | armbe-* | armle-* | armv*-* \
-++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+ 	| avr-* \
-+-	| bs2000-* \
-+-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-+-	| clipper-* | cydra-* \
-+-	| d10v-* | d30v-* \
-++	| bfin-* | bs2000-* \
-++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-++	| clipper-* | craynv-* | 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-* \
-+-	| m32r-* \
-++	| ip2k-* | iq2000-* \
-++	| m32r-* | m32rle-* \
-+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+-	| m88110-* | m88k-* | mcore-* \
-+-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-+-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-+-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-+-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-++	| 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-* \
-++	| msp430-* \
-+ 	| none-* | np1-* | ns16k-* | ns32k-* \
-+ 	| orion-* \
-+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ 	| pyramid-* \
-+ 	| romp-* | rs6000-* \
-+-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-+-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-++	| 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-* | xstormy16-* \
-+-	| xtensa-* \
-++	| 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.
-+ 	386bsd)
-+@@ -332,6 +377,9 @@
-+ 		basic_machine=a29k-amd
-+ 		os=-udi
-+ 		;;
-++    	abacus)
-++		basic_machine=abacus-unknown
-++		;;
-+ 	adobe68k)
-+ 		basic_machine=m68010-adobe
-+ 		os=-scout
-+@@ -346,6 +394,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
-+@@ -405,12 +459,27 @@
-+ 		basic_machine=j90-cray
-+ 		os=-unicos
-+ 		;;
-++	craynv)
-++		basic_machine=craynv-cray
-++		os=-unicosmp
-++		;;
-++	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
-+ 		;;
-+@@ -433,6 +502,10 @@
-+ 		basic_machine=m88k-motorola
-+ 		os=-sysv3
-+ 		;;
-++	djgpp)
-++		basic_machine=i586-pc
-++		os=-msdosdjgpp
-++		;;
-+ 	dpx20 | dpx20-*)
-+ 		basic_machine=rs6000-bull
-+ 		os=-bosx
-+@@ -611,10 +684,6 @@
-+ 	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
-+@@ -702,9 +771,12 @@
-+ 		basic_machine=hppa1.1-oki
-+ 		os=-proelf
-+ 		;;
-+-	or32 | or32-*)
-++	openrisc | openrisc-*)
-+ 		basic_machine=or32-unknown
-+-		os=-coff
-++		;;
-++	os400)
-++		basic_machine=powerpc-ibm
-++		os=-os400
-+ 		;;
-+ 	OSE68000 | ose68000)
-+ 		basic_machine=m68000-ericsson
-+@@ -728,49 +800,55 @@
-+ 	pbb)
-+ 		basic_machine=m68k-tti
-+ 		;;
-+-        pc532 | pc532-*)
-++	pc532 | pc532-*)
-+ 		basic_machine=ns32k-pc532
-+ 		;;
-+ 	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
-+ 		;;
-++	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/^[^-]*-//'`
-+ 		;;
-+@@ -801,6 +879,16 @@
-+ 		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
-+ 		;;
-+@@ -808,6 +896,9 @@
-+ 		basic_machine=sh-hitachi
-+ 		os=-hms
-+ 		;;
-++	sh64)
-++		basic_machine=sh64-unknown
-++		;;
-+ 	sparclite-wrs | simso-wrs)
-+ 		basic_machine=sparclite-wrs
-+ 		os=-vxworks
-+@@ -866,7 +957,7 @@
-+ 	sun386 | sun386i | roadrunner)
-+ 		basic_machine=i386-sun
-+ 		;;
-+-        sv1)
-++	sv1)
-+ 		basic_machine=sv1-cray
-+ 		os=-unicos
-+ 		;;
-+@@ -874,10 +965,6 @@
-+ 		basic_machine=i386-sequent
-+ 		os=-dynix
-+ 		;;
-+-	t3d)
-+-		basic_machine=alpha-cray
-+-		os=-unicos
-+-		;;
-+ 	t3e)
-+ 		basic_machine=alphaev5-cray
-+ 		os=-unicos
-+@@ -890,6 +977,14 @@
-+ 		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
-+ 		;;
-+@@ -903,6 +998,10 @@
-+ 	tower | tower-32)
-+ 		basic_machine=m68k-ncr
-+ 		;;
-++	tpf)
-++		basic_machine=s390x-ibm
-++		os=-tpf
-++		;;
-+ 	udi29k)
-+ 		basic_machine=a29k-amd
-+ 		os=-udi
-+@@ -924,8 +1023,8 @@
-+ 		os=-vms
-+ 		;;
-+ 	vpp*|vx|vx-*)
-+-               basic_machine=f301-fujitsu
-+-               ;;
-++		basic_machine=f301-fujitsu
-++		;;
-+ 	vxworks960)
-+ 		basic_machine=i960-wrs
-+ 		os=-vxworks
-+@@ -946,11 +1045,11 @@
-+ 		basic_machine=hppa1.1-winbond
-+ 		os=-proelf
-+ 		;;
-+-	windows32)
-+-		basic_machine=i386-pc
-+-		os=-windows32-msvcrt
-++	xbox)
-++		basic_machine=i686-pc
-++		os=-mingw32
-+ 		;;
-+-        xps | xps100)
-++	xps | xps100)
-+ 		basic_machine=xps100-honeywell
-+ 		;;
-+ 	ymp)
-+@@ -980,6 +1079,9 @@
-+ 	romp)
-+ 		basic_machine=romp-ibm
-+ 		;;
-++	mmix)
-++		basic_machine=mmix-knuth
-++		;;
-+ 	rs6000)
-+ 		basic_machine=rs6000-ibm
-+ 		;;
-+@@ -996,16 +1098,13 @@
-+ 	we32k)
-+ 		basic_machine=we32k-att
-+ 		;;
-+-	sh3 | sh4 | sh3eb | sh4eb)
-++	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+ 		basic_machine=sh-unknown
-+ 		;;
-+-	sh64)
-+-		basic_machine=sh64-unknown
-+-		;;
-+-	sparc | sparcv9 | sparcv9b)
-++	sparc | sparcv8 | sparcv9 | sparcv9b)
-+ 		basic_machine=sparc-sun
-+ 		;;
-+-        cydra)
-++	cydra)
-+ 		basic_machine=cydra-cydrome
-+ 		;;
-+ 	orion)
-+@@ -1020,10 +1119,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.
-+ 		;;
-+@@ -1079,18 +1174,21 @@
-+ 	      | -aos* \
-+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-++	      | -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* | -uxpv* | -beos* | -mpeix* | -udk* \
-+-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-++	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-++	      | -skyos* | -haiku*)
-+ 	# Remember, each alternative MUST END IN *, to match a version number.
-+ 		;;
-+ 	-qnx*)
-+@@ -1102,16 +1200,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|'`
-+ 		;;
-+@@ -1124,6 +1227,9 @@
-+ 	-opened*)
-+ 		os=-openedition
-+ 		;;
-++        -os400*)
-++		os=-os400
-++		;;
-+ 	-wince*)
-+ 		os=-wince
-+ 		;;
-+@@ -1145,6 +1251,9 @@
-+ 	-atheos*)
-+ 		os=-atheos
-+ 		;;
-++	-syllable*)
-++		os=-syllable
-++		;;
-+ 	-386bsd)
-+ 		os=-bsd
-+ 		;;
-+@@ -1155,7 +1264,7 @@
-+ 		os=-rtmk-nova
-+ 		;;
-+ 	-ns2 )
-+-	        os=-nextstep2
-++		os=-nextstep2
-+ 		;;
-+ 	-nsk*)
-+ 		os=-nsk
-+@@ -1167,6 +1276,9 @@
-+ 	-sinix*)
-+ 		os=-sysv4
-+ 		;;
-++        -tpf*)
-++		os=-tpf
-++		;;
-+ 	-triton*)
-+ 		os=-sysv3
-+ 		;;
-+@@ -1194,8 +1306,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)
-+ 		;;
-+@@ -1228,11 +1349,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-*)
-+@@ -1271,9 +1395,15 @@
-+ 	*-be)
-+ 		os=-beos
-+ 		;;
-++	*-haiku)
-++		os=-haiku
-++		;;
-+ 	*-ibm)
-+ 		os=-aix
-+ 		;;
-++    	*-knuth)
-++		os=-mmixware
-++		;;
-+ 	*-wec)
-+ 		os=-proelf
-+ 		;;
-+@@ -1325,19 +1455,19 @@
-+ 	*-next)
-+ 		os=-nextstep3
-+ 		;;
-+-        *-gould)
-++	*-gould)
-+ 		os=-sysv
-+ 		;;
-+-        *-highlevel)
-++	*-highlevel)
-+ 		os=-bsd
-+ 		;;
-+ 	*-encore)
-+ 		os=-bsd
-+ 		;;
-+-        *-sgi)
-++	*-sgi)
-+ 		os=-irix
-+ 		;;
-+-        *-siemens)
-++	*-siemens)
-+ 		os=-sysv4
-+ 		;;
-+ 	*-masscomp)
-+@@ -1406,10 +1536,16 @@
-+ 			-mvs* | -opened*)
-+ 				vendor=ibm
-+ 				;;
-++			-os400*)
-++				vendor=ibm
-++				;;
-+ 			-ptx*)
-+ 				vendor=sequent
-+ 				;;
-+-			-vxsim* | -vxworks*)
-++			-tpf*)
-++				vendor=ibm
-++				;;
-++			-vxsim* | -vxworks* | -windiss*)
-+ 				vendor=wrs
-+ 				;;
-+ 			-aux*)
-+@@ -1433,7 +1569,7 @@
-+ esac
-+ 
-+ echo $basic_machine$os
-+-exit 0
-++exit
-+ 
-+ # Local variables:
-+ # eval: (add-hook 'write-file-hooks 'time-stamp)
-+--- mpich-1.2.7.orig/mpe/slog2sdk/config.guess
-++++ mpich-1.2.7/mpe/slog2sdk/config.guess
-+@@ -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, 2002 Free Software Foundation, Inc.
-++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+ 
-+-timestamp='2002-03-20'
-++timestamp='2005-08-03'
-+ 
-+ # 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,13 +17,15 @@
-+ #
-+ # 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.
-+ 
-++
-+ # 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.
-+@@ -53,7 +55,7 @@
-+ GNU config.guess ($timestamp)
-+ 
-+ Originally written by Per Bothner.
-+-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
-+@@ -66,11 +68,11 @@
-+ 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.
-+@@ -88,30 +90,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 ;
-++# 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
-+-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
-+-	  if test $? = 0 ; then
-++	  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 ; set_cc_for_build= ;'
-+ 
-+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+ # (ghazi at noc.rutgers.edu 1994-08-24)
-+@@ -142,6 +156,7 @@
-+ 	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 ;;
-+@@ -167,141 +182,125 @@
-+ 		;;
-+ 	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 ;;
-++	exit ;;
-+     *:OpenBSD:*:*)
-+-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+-	exit 0 ;;
-++	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 ;;
-++    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
-+-	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 ;;
-++	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;;
-++	exit ;;
-+     *:[Aa]miga[Oo][Ss]:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-amigaos
-+-	exit 0 ;;
-++	exit ;;
-+     *:[Mm]orph[Oo][Ss]:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-morphos
-+-	exit 0 ;;
-++	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 at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+@@ -309,25 +308,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*)
-+@@ -336,10 +342,10 @@
-+ 	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=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+@@ -351,10 +357,10 @@
-+ 		echo sparc-sun-sunos${UNAME_RELEASE}
-+ 		;;
-+ 	esac
-+-	exit 0 ;;
-++	exit ;;
-+     aushp:SunOS:*:*)
-+ 	echo sparc-auspex-sunos${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
-+@@ -365,37 +371,40 @@
-+     # 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 ;;
-++        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
-+@@ -419,27 +428,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`
-+@@ -455,29 +470,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`
-+@@ -485,7 +500,7 @@
-+ 		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
-+@@ -500,15 +515,18 @@
-+ 			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 | sed 1q | awk '{ print $1 }'`
-+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+@@ -522,28 +540,28 @@
-+ 		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
-+@@ -599,17 +617,37 @@
-+                   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
-++		    (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
-+@@ -637,134 +675,166 @@
-+ 	  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 ;;
-++	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 ;;
-++	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 ;;
-++        exit ;;
-+     CRAY*Y-MP:*:*:*)
-+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+-	exit 0 ;;
-++	exit ;;
-+     CRAY*[A-Z]90:*:*:*)
-+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ 	      -e 's/\.[^.]*$/.X/'
-+-	exit 0 ;;
-++	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 ;;
-++	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 ;;
-++        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 ;;
-++	exit ;;
-+     i*:CYGWIN*:*)
-+ 	echo ${UNAME_MACHINE}-pc-cygwin
-+-	exit 0 ;;
-++	exit ;;
-+     i*:MINGW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-mingw32
-+-	exit 0 ;;
-++	exit ;;
-++    i*:windows32*:*)
-++    	# uname -m includes "-pc" on this system.
-++    	echo ${UNAME_MACHINE}-mingw32
-++	exit ;;
-+     i*:PW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-pw32
-+-	exit 0 ;;
-+-    x86:Interix*:3*)
-+-	echo i386-pc-interix3
-+-	exit 0 ;;
-++	exit ;;
-++    x86:Interix*:[34]*)
-++	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-++	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-gnu
-+-	exit 0 ;;
-++	exit ;;
-++    m32r*:Linux:*:*)
-++	echo ${UNAME_MACHINE}-unknown-linux-gnu
-++	exit ;;
-+     m68*:Linux:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     mips:Linux:*:*)
-+ 	eval $set_cc_for_build
-+ 	sed 's/^	//' << EOF >$dummy.c
-+@@ -782,15 +852,36 @@
-+ 	#endif
-+ EOF
-+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+-	rm -f $dummy.c
-+-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-++	;;
-++    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; }
-+ 	;;
-++    or32:Linux:*:*)
-++	echo or32-unknown-linux-gnu
-++	exit ;;
-+     ppc:Linux:*:*)
-+ 	echo powerpc-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     ppc64:Linux:*:*)
-+ 	echo powerpc64-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     alpha:Linux:*:*)
-+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+@@ -804,7 +895,7 @@
-+ 	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
-+@@ -812,22 +903,25 @@
-+ 	  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 ;;
-+     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
-+@@ -845,15 +939,15 @@
-+ 		;;
-+ 	  a.out-i386-linux)
-+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+-		exit 0 ;;		
-++		exit ;;
-+ 	  coff-i386)
-+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+-		exit 0 ;;
-++		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 0 ;;
-++		exit ;;
-+ 	esac
-+ 	# Determine whether the default compiler is a.out or elf
-+ 	eval $set_cc_for_build
-+@@ -876,18 +970,23 @@
-+ 	LIBC=gnuaout
-+ 	#endif
-+ 	#endif
-++	#ifdef __dietlibc__
-++	LIBC=dietlibc
-++	#endif
-+ EOF
-+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+-	rm -f $dummy.c
-+-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-+-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-++	test x"${LIBC}" != x && {
-++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-++		exit
-++	}
-++	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-+ 	;;
-+     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...
-+@@ -895,7 +994,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
-+@@ -903,99 +1022,100 @@
-+ 	else
-+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ 	fi
-+-	exit 0 ;;
-+-    i*86:*:5:[78]*)
-++	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 0 ;;
-++	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 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*: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`
-+@@ -1003,61 +1123,73 @@
-+ 	else
-+ 		echo ns32k-sni-sysv
-+ 	fi
-+-	exit 0 ;;
-++	exit ;;
-+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                       # says <Richard.M.Bartel at ccMail.Census.GOV>
-+         echo i586-unisys-sysv4
-+-        exit 0 ;;
-++        exit ;;
-+     *:UNIX_System_V:4*:FTX*)
-+ 	# From Gerald Hewes <hewes at openmarket.com>.
-+ 	# How about differentiating between stratus architectures? -djm
-+ 	echo hppa1.1-stratus-sysv4
-+-	exit 0 ;;
-++	exit ;;
-+     *:*:*:FTX*)
-+ 	# From seanf at swdc.stratus.com.
-+ 	echo i860-stratus-sysv4
-+-	exit 0 ;;
-++	exit ;;
-++    i*86:VOS:*:*)
-++	# From Paul.Green at stratus.com.
-++	echo ${UNAME_MACHINE}-stratus-vos
-++	exit ;;
-+     *:VOS:*:*)
-+ 	# From Paul.Green at stratus.com.
-+ 	echo hppa1.1-stratus-vos
-+-	exit 0 ;;
-++	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]*:*)
-+ 	UNAME_PROCESSOR=`uname -p`
-+ 	if test "$UNAME_PROCESSOR" = "x86"; then
-+@@ -1065,22 +1197,25 @@
-+ 		UNAME_MACHINE=pc
-+ 	fi
-+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:QNX:*:4*)
-+ 	echo i386-pc-qnx
-+-	exit 0 ;;
-+-    NSR-[GKLNPTVW]: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
-+@@ -1091,36 +1226,44 @@
-+ 	    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 ;;
-+-    i*86:XTS-300:*:STOP)
-+-	echo ${UNAME_MACHINE}-unknown-stop
-+-	exit 0 ;;
-+-    i*86:atheos:*:*)
-+-	echo ${UNAME_MACHINE}-unknown-atheos
-+-	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 ;;
-+ esac
-+ 
-+ #echo '(No uname command or uname output not recognized.)' 1>&2
-+@@ -1152,7 +1295,7 @@
-+ #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)
-+@@ -1241,12 +1384,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)
-+ 
-+@@ -1255,22 +1398,22 @@
-+     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
-+ 
-+@@ -1281,7 +1424,9 @@
-+ 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
-+--- mpich-1.2.7.orig/mpe/slog2sdk/config.sub
-++++ mpich-1.2.7/mpe/slog2sdk/config.sub
-+@@ -1,9 +1,9 @@
-+ #! /bin/sh
-+ # Configuration validation subroutine script.
-+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+-#   2000, 2001, 2002 Free Software Foundation, Inc.
-++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+ 
-+-timestamp='2002-03-07'
-++timestamp='2005-07-08'
-+ 
-+ # This file is (in principle) common to ALL GNU software.
-+ # The presence of a machine in this file suggests that SOME GNU software
-+@@ -21,14 +21,15 @@
-+ #
-+ # 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 at gnu.org>.  Submit a context
-+ # diff and a properly formatted ChangeLog entry.
-+ #
-+@@ -70,7 +71,7 @@
-+ 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
-+@@ -83,11 +84,11 @@
-+ 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.
-+@@ -99,7 +100,7 @@
-+     *local*)
-+        # First pass through any local machine types.
-+        echo $1
-+-       exit 0;;
-++       exit ;;
-+ 
-+     * )
-+        break ;;
-+@@ -118,7 +119,8 @@
-+ # 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-* | rtmk-nova*)
-++  nto-qnx* | linux-gnu* | linux-dietlibc | 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/'`
-+     ;;
-+@@ -144,7 +146,7 @@
-+ 	-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
-+ 		;;
-+@@ -228,34 +230,55 @@
-+ 	| 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 | dsp16xx \
-+-	| fr30 \
-++	| d10v | d30v | dlx | dsp16xx \
-++	| fr30 | frv \
-+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ 	| i370 | i860 | i960 | ia64 \
-+-	| m32r | m68000 | m68k | m88k | mcore \
-+-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-+-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-+-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-+-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-+-	| mipsisa32 | mipsisa64 \
-++	| ip2k | iq2000 \
-++	| m32r | m32rle | m68000 | m68k | 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 \
-+ 	| mn10200 | mn10300 \
-++	| ms1 \
-++	| msp430 \
-+ 	| ns16k | ns32k \
-+-	| openrisc | or32 \
-++	| or32 \
-+ 	| pdp10 | pdp11 | pj | pjl \
-+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ 	| pyramid \
-+-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-++	| 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 | tic80 | tron \
-++	| tahoe | thumb | tic4x | tic80 | tron \
-+ 	| v850 | v850e \
-+ 	| we32k \
-+-	| x86 | xscale | xstormy16 | xtensa \
-++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ 	| z8k)
-+ 		basic_machine=$basic_machine-unknown
-+ 		;;
-++	m32c)
-++		basic_machine=$basic_machine-unknown
-++		;;
-+ 	m6811 | m68hc11 | m6812 | m68hc12)
-+ 		# Motorola 68HC11/12.
-+ 		basic_machine=$basic_machine-unknown
-+@@ -281,41 +304,63 @@
-+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+-	| arm-*  | armbe-* | armle-* | armv*-* \
-++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+ 	| avr-* \
-+-	| bs2000-* \
-+-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-+-	| clipper-* | cydra-* \
-+-	| d10v-* | d30v-* \
-++	| bfin-* | bs2000-* \
-++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-++	| clipper-* | craynv-* | 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-* \
-+-	| m32r-* \
-++	| ip2k-* | iq2000-* \
-++	| m32r-* | m32rle-* \
-+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+-	| m88110-* | m88k-* | mcore-* \
-+-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-+-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-+-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-+-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-++	| 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-* \
-++	| msp430-* \
-+ 	| none-* | np1-* | ns16k-* | ns32k-* \
-+ 	| orion-* \
-+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ 	| pyramid-* \
-+ 	| romp-* | rs6000-* \
-+-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-+-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-++	| 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-* | xstormy16-* \
-+-	| xtensa-* \
-++	| 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.
-+ 	386bsd)
-+@@ -332,6 +377,9 @@
-+ 		basic_machine=a29k-amd
-+ 		os=-udi
-+ 		;;
-++    	abacus)
-++		basic_machine=abacus-unknown
-++		;;
-+ 	adobe68k)
-+ 		basic_machine=m68010-adobe
-+ 		os=-scout
-+@@ -346,6 +394,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
-+@@ -405,12 +459,27 @@
-+ 		basic_machine=j90-cray
-+ 		os=-unicos
-+ 		;;
-++	craynv)
-++		basic_machine=craynv-cray
-++		os=-unicosmp
-++		;;
-++	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
-+ 		;;
-+@@ -433,6 +502,10 @@
-+ 		basic_machine=m88k-motorola
-+ 		os=-sysv3
-+ 		;;
-++	djgpp)
-++		basic_machine=i586-pc
-++		os=-msdosdjgpp
-++		;;
-+ 	dpx20 | dpx20-*)
-+ 		basic_machine=rs6000-bull
-+ 		os=-bosx
-+@@ -611,10 +684,6 @@
-+ 	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
-+@@ -702,9 +771,12 @@
-+ 		basic_machine=hppa1.1-oki
-+ 		os=-proelf
-+ 		;;
-+-	or32 | or32-*)
-++	openrisc | openrisc-*)
-+ 		basic_machine=or32-unknown
-+-		os=-coff
-++		;;
-++	os400)
-++		basic_machine=powerpc-ibm
-++		os=-os400
-+ 		;;
-+ 	OSE68000 | ose68000)
-+ 		basic_machine=m68000-ericsson
-+@@ -728,49 +800,55 @@
-+ 	pbb)
-+ 		basic_machine=m68k-tti
-+ 		;;
-+-        pc532 | pc532-*)
-++	pc532 | pc532-*)
-+ 		basic_machine=ns32k-pc532
-+ 		;;
-+ 	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
-+ 		;;
-++	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/^[^-]*-//'`
-+ 		;;
-+@@ -801,6 +879,16 @@
-+ 		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
-+ 		;;
-+@@ -808,6 +896,9 @@
-+ 		basic_machine=sh-hitachi
-+ 		os=-hms
-+ 		;;
-++	sh64)
-++		basic_machine=sh64-unknown
-++		;;
-+ 	sparclite-wrs | simso-wrs)
-+ 		basic_machine=sparclite-wrs
-+ 		os=-vxworks
-+@@ -866,7 +957,7 @@
-+ 	sun386 | sun386i | roadrunner)
-+ 		basic_machine=i386-sun
-+ 		;;
-+-        sv1)
-++	sv1)
-+ 		basic_machine=sv1-cray
-+ 		os=-unicos
-+ 		;;
-+@@ -874,10 +965,6 @@
-+ 		basic_machine=i386-sequent
-+ 		os=-dynix
-+ 		;;
-+-	t3d)
-+-		basic_machine=alpha-cray
-+-		os=-unicos
-+-		;;
-+ 	t3e)
-+ 		basic_machine=alphaev5-cray
-+ 		os=-unicos
-+@@ -890,6 +977,14 @@
-+ 		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
-+ 		;;
-+@@ -903,6 +998,10 @@
-+ 	tower | tower-32)
-+ 		basic_machine=m68k-ncr
-+ 		;;
-++	tpf)
-++		basic_machine=s390x-ibm
-++		os=-tpf
-++		;;
-+ 	udi29k)
-+ 		basic_machine=a29k-amd
-+ 		os=-udi
-+@@ -924,8 +1023,8 @@
-+ 		os=-vms
-+ 		;;
-+ 	vpp*|vx|vx-*)
-+-               basic_machine=f301-fujitsu
-+-               ;;
-++		basic_machine=f301-fujitsu
-++		;;
-+ 	vxworks960)
-+ 		basic_machine=i960-wrs
-+ 		os=-vxworks
-+@@ -946,11 +1045,11 @@
-+ 		basic_machine=hppa1.1-winbond
-+ 		os=-proelf
-+ 		;;
-+-	windows32)
-+-		basic_machine=i386-pc
-+-		os=-windows32-msvcrt
-++	xbox)
-++		basic_machine=i686-pc
-++		os=-mingw32
-+ 		;;
-+-        xps | xps100)
-++	xps | xps100)
-+ 		basic_machine=xps100-honeywell
-+ 		;;
-+ 	ymp)
-+@@ -980,6 +1079,9 @@
-+ 	romp)
-+ 		basic_machine=romp-ibm
-+ 		;;
-++	mmix)
-++		basic_machine=mmix-knuth
-++		;;
-+ 	rs6000)
-+ 		basic_machine=rs6000-ibm
-+ 		;;
-+@@ -996,16 +1098,13 @@
-+ 	we32k)
-+ 		basic_machine=we32k-att
-+ 		;;
-+-	sh3 | sh4 | sh3eb | sh4eb)
-++	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+ 		basic_machine=sh-unknown
-+ 		;;
-+-	sh64)
-+-		basic_machine=sh64-unknown
-+-		;;
-+-	sparc | sparcv9 | sparcv9b)
-++	sparc | sparcv8 | sparcv9 | sparcv9b)
-+ 		basic_machine=sparc-sun
-+ 		;;
-+-        cydra)
-++	cydra)
-+ 		basic_machine=cydra-cydrome
-+ 		;;
-+ 	orion)
-+@@ -1020,10 +1119,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.
-+ 		;;
-+@@ -1079,18 +1174,21 @@
-+ 	      | -aos* \
-+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-++	      | -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* | -uxpv* | -beos* | -mpeix* | -udk* \
-+-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-++	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-++	      | -skyos* | -haiku*)
-+ 	# Remember, each alternative MUST END IN *, to match a version number.
-+ 		;;
-+ 	-qnx*)
-+@@ -1102,16 +1200,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|'`
-+ 		;;
-+@@ -1124,6 +1227,9 @@
-+ 	-opened*)
-+ 		os=-openedition
-+ 		;;
-++        -os400*)
-++		os=-os400
-++		;;
-+ 	-wince*)
-+ 		os=-wince
-+ 		;;
-+@@ -1145,6 +1251,9 @@
-+ 	-atheos*)
-+ 		os=-atheos
-+ 		;;
-++	-syllable*)
-++		os=-syllable
-++		;;
-+ 	-386bsd)
-+ 		os=-bsd
-+ 		;;
-+@@ -1155,7 +1264,7 @@
-+ 		os=-rtmk-nova
-+ 		;;
-+ 	-ns2 )
-+-	        os=-nextstep2
-++		os=-nextstep2
-+ 		;;
-+ 	-nsk*)
-+ 		os=-nsk
-+@@ -1167,6 +1276,9 @@
-+ 	-sinix*)
-+ 		os=-sysv4
-+ 		;;
-++        -tpf*)
-++		os=-tpf
-++		;;
-+ 	-triton*)
-+ 		os=-sysv3
-+ 		;;
-+@@ -1194,8 +1306,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)
-+ 		;;
-+@@ -1228,11 +1349,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-*)
-+@@ -1271,9 +1395,15 @@
-+ 	*-be)
-+ 		os=-beos
-+ 		;;
-++	*-haiku)
-++		os=-haiku
-++		;;
-+ 	*-ibm)
-+ 		os=-aix
-+ 		;;
-++    	*-knuth)
-++		os=-mmixware
-++		;;
-+ 	*-wec)
-+ 		os=-proelf
-+ 		;;
-+@@ -1325,19 +1455,19 @@
-+ 	*-next)
-+ 		os=-nextstep3
-+ 		;;
-+-        *-gould)
-++	*-gould)
-+ 		os=-sysv
-+ 		;;
-+-        *-highlevel)
-++	*-highlevel)
-+ 		os=-bsd
-+ 		;;
-+ 	*-encore)
-+ 		os=-bsd
-+ 		;;
-+-        *-sgi)
-++	*-sgi)
-+ 		os=-irix
-+ 		;;
-+-        *-siemens)
-++	*-siemens)
-+ 		os=-sysv4
-+ 		;;
-+ 	*-masscomp)
-+@@ -1406,10 +1536,16 @@
-+ 			-mvs* | -opened*)
-+ 				vendor=ibm
-+ 				;;
-++			-os400*)
-++				vendor=ibm
-++				;;
-+ 			-ptx*)
-+ 				vendor=sequent
-+ 				;;
-+-			-vxsim* | -vxworks*)
-++			-tpf*)
-++				vendor=ibm
-++				;;
-++			-vxsim* | -vxworks* | -windiss*)
-+ 				vendor=wrs
-+ 				;;
-+ 			-aux*)
-+@@ -1433,7 +1569,7 @@
-+ esac
-+ 
-+ echo $basic_machine$os
-+-exit 0
-++exit
-+ 
-+ # Local variables:
-+ # eval: (add-hook 'write-file-hooks 'time-stamp)
-+--- mpich-1.2.7.orig/src/fortran/config/config.guess
-++++ mpich-1.2.7/src/fortran/config/config.guess
-+@@ -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, 2002, 2003 Free Software Foundation, Inc.
-++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+ 
-+-timestamp='2003-02-22'
-++timestamp='2005-08-03'
-+ 
-+ # 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,13 +17,15 @@
-+ #
-+ # 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.
-+ 
-++
-+ # 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.
-+@@ -53,7 +55,7 @@
-+ GNU config.guess ($timestamp)
-+ 
-+ Originally written by Per Bothner.
-+-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
-+@@ -66,11 +68,11 @@
-+ 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.
-+@@ -106,6 +108,7 @@
-+ : ${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" ;
-+@@ -122,7 +125,7 @@
-+ 	;;
-+  ,,*)   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 at noc.rutgers.edu 1994-08-24)
-+@@ -195,50 +198,29 @@
-+ 	# 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 ;;
-++	exit ;;
-+     *:OpenBSD:*:*)
-+-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+-	exit 0 ;;
-++	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 ;;
-++    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
-+@@ -276,39 +258,49 @@
-+ 	    "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.
-+-	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;;
-++	exit ;;
-+     *:[Aa]miga[Oo][Ss]:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-amigaos
-+-	exit 0 ;;
-++	exit ;;
-+     *:[Mm]orph[Oo][Ss]:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-morphos
-+-	exit 0 ;;
-++	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 at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+@@ -316,29 +308,32 @@
-+ 	else
-+ 		echo pyramid-pyramid-bsd
-+ 	fi
-+-	exit 0 ;;
-++	exit ;;
-+     NILE*:*:*:dcosx)
-+ 	echo pyramid-pyramid-svr4
-+-	exit 0 ;;
-+-    DRS?6000:UNIX_SV:4.2*:7*)
-++	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 0 ;;
-++	    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*)
-+@@ -347,10 +342,10 @@
-+ 	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=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+@@ -362,10 +357,10 @@
-+ 		echo sparc-sun-sunos${UNAME_RELEASE}
-+ 		;;
-+ 	esac
-+-	exit 0 ;;
-++	exit ;;
-+     aushp:SunOS:*:*)
-+ 	echo sparc-auspex-sunos${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
-+@@ -376,37 +371,40 @@
-+     # 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 ;;
-++        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
-+@@ -430,32 +428,33 @@
-+ 	  exit (-1);
-+ 	}
-+ EOF
-+-	$CC_FOR_BUILD -o $dummy $dummy.c \
-+-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+-	  && exit 0
-++	$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 0 ;;
-++	exit ;;
-+     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+ 	echo powerpc-harris-powermax
-+-	exit 0 ;;
-++	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`
-+@@ -471,29 +470,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`
-+@@ -501,7 +500,7 @@
-+ 		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
-+@@ -516,14 +515,18 @@
-+ 			exit(0);
-+ 			}
-+ EOF
-+-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-+-		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 | sed 1q | awk '{ print $1 }'`
-+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+@@ -537,28 +540,28 @@
-+ 		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
-+@@ -620,9 +623,19 @@
-+ 	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
-++	    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
-+@@ -630,11 +643,11 @@
-+ 	    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
-+@@ -662,147 +675,166 @@
-+ 	  exit (0);
-+ 	}
-+ EOF
-+-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-++	$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 ;;
-++	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 ;;
-++	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 ;;
-++        exit ;;
-+     CRAY*Y-MP:*:*:*)
-+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+-	exit 0 ;;
-++	exit ;;
-+     CRAY*[A-Z]90:*:*:*)
-+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+ 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+ 	      -e 's/\.[^.]*$/.X/'
-+-	exit 0 ;;
-++	exit ;;
-+     CRAY*TS:*:*:*)
-+ 	echo t90-cray-unicos${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 ;;
-++	exit ;;
-+     *:UNICOS/mp:*:*)
-+-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
-+-	exit 0 ;;
-++	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 ;;
-++        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:*:*)
-+-	# 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=`
-+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-+-	exit 0 ;;
-++	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-++	exit ;;
-+     i*:CYGWIN*:*)
-+ 	echo ${UNAME_MACHINE}-pc-cygwin
-+-	exit 0 ;;
-++	exit ;;
-+     i*:MINGW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-mingw32
-+-	exit 0 ;;
-++	exit ;;
-++    i*:windows32*:*)
-++    	# uname -m includes "-pc" on this system.
-++    	echo ${UNAME_MACHINE}-mingw32
-++	exit ;;
-+     i*:PW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-pw32
-+-	exit 0 ;;
-+-    x86:Interix*:3*)
-+-	echo i586-pc-interix3
-+-	exit 0 ;;
-++	exit ;;
-++    x86:Interix*:[34]*)
-++	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-++	exit ;;
-+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ 	echo i${UNAME_MACHINE}-pc-mks
-+-	exit 0 ;;
-++	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 i586-pc-interix
-+-	exit 0 ;;
-++	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-gnu
-+-	exit 0 ;;
-++	exit ;;
-++    m32r*:Linux:*:*)
-++	echo ${UNAME_MACHINE}-unknown-linux-gnu
-++	exit ;;
-+     m68*:Linux:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     mips:Linux:*:*)
-+ 	eval $set_cc_for_build
-+ 	sed 's/^	//' << EOF >$dummy.c
-+@@ -820,7 +852,7 @@
-+ 	#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
-++	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-+ 	;;
-+     mips64:Linux:*:*)
-+ 	eval $set_cc_for_build
-+@@ -839,14 +871,17 @@
-+ 	#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
-++	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 0 ;;
-++	exit ;;
-+     ppc64:Linux:*:*)
-+ 	echo powerpc64-unknown-linux-gnu
-+-	exit 0 ;;
-++	exit ;;
-+     alpha:Linux:*:*)
-+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ 	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+@@ -860,7 +895,7 @@
-+ 	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
-+@@ -868,22 +903,25 @@
-+ 	  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 ;;
-+     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
-+@@ -901,15 +939,15 @@
-+ 		;;
-+ 	  a.out-i386-linux)
-+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+-		exit 0 ;;
-++		exit ;;
-+ 	  coff-i386)
-+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+-		exit 0 ;;
-++		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 0 ;;
-++		exit ;;
-+ 	esac
-+ 	# Determine whether the default compiler is a.out or elf
-+ 	eval $set_cc_for_build
-+@@ -932,17 +970,23 @@
-+ 	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
-++	test x"${LIBC}" != x && {
-++		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-++		exit
-++	}
-++	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-+ 	;;
-+     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...
-+@@ -950,24 +994,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 0 ;;
-++	exit ;;
-+     i*86:XTS-300:*:STOP)
-+ 	echo ${UNAME_MACHINE}-unknown-stop
-+-	exit 0 ;;
-++	exit ;;
-+     i*86:atheos:*:*)
-+ 	echo ${UNAME_MACHINE}-unknown-atheos
-+-	exit 0 ;;
-++	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 0 ;;
-++	exit ;;
-+     i*86:*DOS:*:*)
-+ 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+-	exit 0 ;;
-++	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
-+@@ -975,15 +1022,16 @@
-+ 	else
-+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+ 	fi
-+-	exit 0 ;;
-+-    i*86:*:5:[78]*)
-++	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 0 ;;
-++	exit ;;
-+     i*86:*:3.2:*)
-+ 	if test -f /usr/options/cb.name; then
-+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+@@ -1001,73 +1049,73 @@
-+ 	else
-+ 		echo ${UNAME_MACHINE}-pc-sysv32
-+ 	fi
-+-	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 ;;
-++	exit ;;
-+     mc68k:UNIX:SYSTEM5:3.51m)
-+ 	echo m68k-convergent-sysv
-+-	exit 0 ;;
-++	exit ;;
-+     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 | 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)
-++	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 ;;
-++	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`
-+@@ -1075,68 +1123,73 @@
-+ 	else
-+ 		echo ns32k-sni-sysv
-+ 	fi
-+-	exit 0 ;;
-++	exit ;;
-+     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                       # says <Richard.M.Bartel at ccMail.Census.GOV>
-+         echo i586-unisys-sysv4
-+-        exit 0 ;;
-++        exit ;;
-+     *:UNIX_System_V:4*:FTX*)
-+ 	# From Gerald Hewes <hewes at openmarket.com>.
-+ 	# How about differentiating between stratus architectures? -djm
-+ 	echo hppa1.1-stratus-sysv4
-+-	exit 0 ;;
-++	exit ;;
-+     *:*:*:FTX*)
-+ 	# From seanf at swdc.stratus.com.
-+ 	echo i860-stratus-sysv4
-+-	exit 0 ;;
-++	exit ;;
-++    i*86:VOS:*:*)
-++	# From Paul.Green at stratus.com.
-++	echo ${UNAME_MACHINE}-stratus-vos
-++	exit ;;
-+     *:VOS:*:*)
-+ 	# From Paul.Green at stratus.com.
-+ 	echo hppa1.1-stratus-vos
-+-	exit 0 ;;
-++	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 0 ;;
-++	exit ;;
-+     Power*:Rhapsody:*:*)
-+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:Rhapsody:*:*)
-+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:Darwin:*:*)
-+-	case `uname -p` in
-++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-++	case $UNAME_PROCESSOR in
-+ 	    *86) UNAME_PROCESSOR=i686 ;;
-+-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-++	    unknown) UNAME_PROCESSOR=powerpc ;;
-+ 	esac
-+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+ 	UNAME_PROCESSOR=`uname -p`
-+ 	if test "$UNAME_PROCESSOR" = "x86"; then
-+@@ -1144,22 +1197,25 @@
-+ 		UNAME_MACHINE=pc
-+ 	fi
-+ 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+-	exit 0 ;;
-++	exit ;;
-+     *:QNX:*:4*)
-+ 	echo i386-pc-qnx
-+-	exit 0 ;;
-+-    NSR-[DGKLNPTVW]: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
-+@@ -1170,25 +1226,44 @@
-+ 	    UNAME_MACHINE="$cputype"
-+ 	fi
-+ 	echo ${UNAME_MACHINE}-unknown-plan9
-+-	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 ;;
-+ esac
-+ 
-+ #echo '(No uname command or uname output not recognized.)' 1>&2
-+@@ -1220,7 +1295,7 @@
-+ #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)
-+@@ -1309,11 +1384,12 @@
-+ }
-+ EOF
-+ 
-+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-++$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)
-+ 
-+@@ -1322,22 +1398,22 @@
-+     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
-+ 
-+@@ -1348,7 +1424,9 @@
-+ 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
-+--- mpich-1.2.7.orig/src/fortran/config/config.sub
-++++ mpich-1.2.7/src/fortran/config/config.sub
-+@@ -1,9 +1,9 @@
-+ #! /bin/sh
-+ # Configuration validation subroutine script.
-+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+-#   2000, 2001, 2002 Free Software Foundation, Inc.
-++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+ 
-+-timestamp='2002-03-07'
-++timestamp='2005-07-08'
-+ 
-+ # This file is (in principle) common to ALL GNU software.
-+ # The presence of a machine in this file suggests that SOME GNU software
-+@@ -21,14 +21,15 @@
-+ #
-+ # 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 at gnu.org>.  Submit a context
-+ # diff and a properly formatted ChangeLog entry.
-+ #
-+@@ -70,7 +71,7 @@
-+ 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
-+@@ -83,11 +84,11 @@
-+ 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.
-+@@ -99,7 +100,7 @@
-+     *local*)
-+        # First pass through any local machine types.
-+        echo $1
-+-       exit 0;;
-++       exit ;;
-+ 
-+     * )
-+        break ;;
-+@@ -118,7 +119,8 @@
-+ # 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-* | rtmk-nova*)
-++  nto-qnx* | linux-gnu* | linux-dietlibc | 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/'`
-+     ;;
-+@@ -144,7 +146,7 @@
-+ 	-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
-+ 		;;
-+@@ -228,34 +230,55 @@
-+ 	| 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 | dsp16xx \
-+-	| fr30 \
-++	| d10v | d30v | dlx | dsp16xx \
-++	| fr30 | frv \
-+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ 	| i370 | i860 | i960 | ia64 \
-+-	| m32r | m68000 | m68k | m88k | mcore \
-+-	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-+-	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
-+-	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
-+-	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-+-	| mipsisa32 | mipsisa64 \
-++	| ip2k | iq2000 \
-++	| m32r | m32rle | m68000 | m68k | 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 \
-+ 	| mn10200 | mn10300 \
-++	| ms1 \
-++	| msp430 \
-+ 	| ns16k | ns32k \
-+-	| openrisc | or32 \
-++	| or32 \
-+ 	| pdp10 | pdp11 | pj | pjl \
-+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ 	| pyramid \
-+-	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
-+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-++	| 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 | tic80 | tron \
-++	| tahoe | thumb | tic4x | tic80 | tron \
-+ 	| v850 | v850e \
-+ 	| we32k \
-+-	| x86 | xscale | xstormy16 | xtensa \
-++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+ 	| z8k)
-+ 		basic_machine=$basic_machine-unknown
-+ 		;;
-++	m32c)
-++		basic_machine=$basic_machine-unknown
-++		;;
-+ 	m6811 | m68hc11 | m6812 | m68hc12)
-+ 		# Motorola 68HC11/12.
-+ 		basic_machine=$basic_machine-unknown
-+@@ -281,41 +304,63 @@
-+ 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+-	| arm-*  | armbe-* | armle-* | armv*-* \
-++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+ 	| avr-* \
-+-	| bs2000-* \
-+-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
-+-	| clipper-* | cydra-* \
-+-	| d10v-* | d30v-* \
-++	| bfin-* | bs2000-* \
-++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-++	| clipper-* | craynv-* | 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-* \
-+-	| m32r-* \
-++	| ip2k-* | iq2000-* \
-++	| m32r-* | m32rle-* \
-+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+-	| m88110-* | m88k-* | mcore-* \
-+-	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-+-	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-+-	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-+-	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
-++	| 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-* \
-++	| msp430-* \
-+ 	| none-* | np1-* | ns16k-* | ns32k-* \
-+ 	| orion-* \
-+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+ 	| pyramid-* \
-+ 	| romp-* | rs6000-* \
-+-	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
-+-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
-++	| 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-* | xstormy16-* \
-+-	| xtensa-* \
-++	| 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.
-+ 	386bsd)
-+@@ -332,6 +377,9 @@
-+ 		basic_machine=a29k-amd
-+ 		os=-udi
-+ 		;;
-++    	abacus)
-++		basic_machine=abacus-unknown
-++		;;
-+ 	adobe68k)
-+ 		basic_machine=m68010-adobe
-+ 		os=-scout
-+@@ -346,6 +394,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
-+@@ -405,12 +459,27 @@
-+ 		basic_machine=j90-cray
-+ 		os=-unicos
-+ 		;;
-++	craynv)
-++		basic_machine=craynv-cray
-++		os=-unicosmp
-++		;;
-++	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
-+ 		;;
-+@@ -433,6 +502,10 @@
-+ 		basic_machine=m88k-motorola
-+ 		os=-sysv3
-+ 		;;
-++	djgpp)
-++		basic_machine=i586-pc
-++		os=-msdosdjgpp
-++		;;
-+ 	dpx20 | dpx20-*)
-+ 		basic_machine=rs6000-bull
-+ 		os=-bosx
-+@@ -611,10 +684,6 @@
-+ 	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
-+@@ -702,9 +771,12 @@
-+ 		basic_machine=hppa1.1-oki
-+ 		os=-proelf
-+ 		;;
-+-	or32 | or32-*)
-++	openrisc | openrisc-*)
-+ 		basic_machine=or32-unknown
-+-		os=-coff
-++		;;
-++	os400)
-++		basic_machine=powerpc-ibm
-++		os=-os400
-+ 		;;
-+ 	OSE68000 | ose68000)
-+ 		basic_machine=m68000-ericsson
-+@@ -728,49 +800,55 @@
-+ 	pbb)
-+ 		basic_machine=m68k-tti
-+ 		;;
-+-        pc532 | pc532-*)
-++	pc532 | pc532-*)
-+ 		basic_machine=ns32k-pc532
-+ 		;;
-+ 	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
-+ 		;;
-++	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/^[^-]*-//'`
-+ 		;;
-+@@ -801,6 +879,16 @@
-+ 		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
-+ 		;;
-+@@ -808,6 +896,9 @@
-+ 		basic_machine=sh-hitachi
-+ 		os=-hms
-+ 		;;
-++	sh64)
-++		basic_machine=sh64-unknown
-++		;;
-+ 	sparclite-wrs | simso-wrs)
-+ 		basic_machine=sparclite-wrs
-+ 		os=-vxworks
-+@@ -866,7 +957,7 @@
-+ 	sun386 | sun386i | roadrunner)
-+ 		basic_machine=i386-sun
-+ 		;;
-+-        sv1)
-++	sv1)
-+ 		basic_machine=sv1-cray
-+ 		os=-unicos
-+ 		;;
-+@@ -874,10 +965,6 @@
-+ 		basic_machine=i386-sequent
-+ 		os=-dynix
-+ 		;;
-+-	t3d)
-+-		basic_machine=alpha-cray
-+-		os=-unicos
-+-		;;
-+ 	t3e)
-+ 		basic_machine=alphaev5-cray
-+ 		os=-unicos
-+@@ -890,6 +977,14 @@
-+ 		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
-+ 		;;
-+@@ -903,6 +998,10 @@
-+ 	tower | tower-32)
-+ 		basic_machine=m68k-ncr
-+ 		;;
-++	tpf)
-++		basic_machine=s390x-ibm
-++		os=-tpf
-++		;;
-+ 	udi29k)
-+ 		basic_machine=a29k-amd
-+ 		os=-udi
-+@@ -924,8 +1023,8 @@
-+ 		os=-vms
-+ 		;;
-+ 	vpp*|vx|vx-*)
-+-               basic_machine=f301-fujitsu
-+-               ;;
-++		basic_machine=f301-fujitsu
-++		;;
-+ 	vxworks960)
-+ 		basic_machine=i960-wrs
-+ 		os=-vxworks
-+@@ -946,11 +1045,11 @@
-+ 		basic_machine=hppa1.1-winbond
-+ 		os=-proelf
-+ 		;;
-+-	windows32)
-+-		basic_machine=i386-pc
-+-		os=-windows32-msvcrt
-++	xbox)
-++		basic_machine=i686-pc
-++		os=-mingw32
-+ 		;;
-+-        xps | xps100)
-++	xps | xps100)
-+ 		basic_machine=xps100-honeywell
-+ 		;;
-+ 	ymp)
-+@@ -980,6 +1079,9 @@
-+ 	romp)
-+ 		basic_machine=romp-ibm
-+ 		;;
-++	mmix)
-++		basic_machine=mmix-knuth
-++		;;
-+ 	rs6000)
-+ 		basic_machine=rs6000-ibm
-+ 		;;
-+@@ -996,16 +1098,13 @@
-+ 	we32k)
-+ 		basic_machine=we32k-att
-+ 		;;
-+-	sh3 | sh4 | sh3eb | sh4eb)
-++	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+ 		basic_machine=sh-unknown
-+ 		;;
-+-	sh64)
-+-		basic_machine=sh64-unknown
-+-		;;
-+-	sparc | sparcv9 | sparcv9b)
-++	sparc | sparcv8 | sparcv9 | sparcv9b)
-+ 		basic_machine=sparc-sun
-+ 		;;
-+-        cydra)
-++	cydra)
-+ 		basic_machine=cydra-cydrome
-+ 		;;
-+ 	orion)
-+@@ -1020,10 +1119,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.
-+ 		;;
-+@@ -1079,18 +1174,21 @@
-+ 	      | -aos* \
-+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-++	      | -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* | -uxpv* | -beos* | -mpeix* | -udk* \
-+-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-++	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
-++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-++	      | -skyos* | -haiku*)
-+ 	# Remember, each alternative MUST END IN *, to match a version number.
-+ 		;;
-+ 	-qnx*)
-+@@ -1102,16 +1200,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|'`
-+ 		;;
-+@@ -1124,6 +1227,9 @@
-+ 	-opened*)
-+ 		os=-openedition
-+ 		;;
-++        -os400*)
-++		os=-os400
-++		;;
-+ 	-wince*)
-+ 		os=-wince
-+ 		;;
-+@@ -1145,6 +1251,9 @@
-+ 	-atheos*)
-+ 		os=-atheos
-+ 		;;
-++	-syllable*)
-++		os=-syllable
-++		;;
-+ 	-386bsd)
-+ 		os=-bsd
-+ 		;;
-+@@ -1155,7 +1264,7 @@
-+ 		os=-rtmk-nova
-+ 		;;
-+ 	-ns2 )
-+-	        os=-nextstep2
-++		os=-nextstep2
-+ 		;;
-+ 	-nsk*)
-+ 		os=-nsk
-+@@ -1167,6 +1276,9 @@
-+ 	-sinix*)
-+ 		os=-sysv4
-+ 		;;
-++        -tpf*)
-++		os=-tpf
-++		;;
-+ 	-triton*)
-+ 		os=-sysv3
-+ 		;;
-+@@ -1194,8 +1306,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)
-+ 		;;
-+@@ -1228,11 +1349,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-*)
-+@@ -1271,9 +1395,15 @@
-+ 	*-be)
-+ 		os=-beos
-+ 		;;
-++	*-haiku)
-++		os=-haiku
-++		;;
-+ 	*-ibm)
-+ 		os=-aix
-+ 		;;
-++    	*-knuth)
-++		os=-mmixware
-++		;;
-+ 	*-wec)
-+ 		os=-proelf
-+ 		;;
-+@@ -1325,19 +1455,19 @@
-+ 	*-next)
-+ 		os=-nextstep3
-+ 		;;
-+-        *-gould)
-++	*-gould)
-+ 		os=-sysv
-+ 		;;
-+-        *-highlevel)
-++	*-highlevel)
-+ 		os=-bsd
-+ 		;;
-+ 	*-encore)
-+ 		os=-bsd
-+ 		;;
-+-        *-sgi)
-++	*-sgi)
-+ 		os=-irix
-+ 		;;
-+-        *-siemens)
-++	*-siemens)
-+ 		os=-sysv4
-+ 		;;
-+ 	*-masscomp)
-+@@ -1406,10 +1536,16 @@
-+ 			-mvs* | -opened*)
-+ 				vendor=ibm
-+ 				;;
-++			-os400*)
-++				vendor=ibm
-++				;;
-+ 			-ptx*)
-+ 				vendor=sequent
-+ 				;;
-+-			-vxsim* | -vxworks*)
-++			-tpf*)
-++				vendor=ibm
-++				;;
-++			-vxsim* | -vxworks* | -windiss*)
-+ 				vendor=wrs
-+ 				;;
-+ 			-aux*)
-+@@ -1433,7 +1569,7 @@
-+ esac
-+ 
-+ echo $basic_machine$os
-+-exit 0
-++exit
-+ 
-+ # Local variables:
-+ # eval: (add-hook 'write-file-hooks 'time-stamp)
---- mpich-1.2.7.orig/debian/patches/19_kfreebsd.dpatch
-+++ mpich-1.2.7/debian/patches/19_kfreebsd.dpatch
-@@ -0,0 +1,30 @@
-+#! /bin/sh -e
-+## 19_kfreebsd.dpatch by Aurelien Janro <aurel32 at debian.org>
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: Add support for GNU/kFreeBSD
-+
-+if [ $# -ne 1 ]; then
-+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+    exit 1
-+fi
-+case "$1" in
-+    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-+    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-+    *)
-+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-+        exit 1;;
-+esac
-+
-+exit 0
-+
-+--- mpich-1.2.7.orig/bin/tarch
-++++ mpich-1.2.7/bin/tarch
-+@@ -138,6 +138,7 @@
-+         next)            FARCH=NeXT ; break ;;	
-+ 	KSR1|KSR2)       FARCH=ksr ; break ;;	
-+         FreeBSD)         FARCH=freebsd ; break ;;
-++        GNU/kFreeBSD)         FARCH=freebsd ; break ;;
-+ 	NetBSD)          FARCH=netbsd ; break ;;
-+ 	i386)            GARCH=ipsc2 ;;
-+ 	ULTRIX|RISC)     GARCH=dec5000 ;;

Deleted: trunk/web/patches/qemu.diff
===================================================================
--- trunk/web/patches/qemu.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/qemu.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,107 +0,0 @@
-* at least on kfreebsd-i386 works, 
-  kfreebsd-amd64 runs inside qemu under kfreebsd-i386
-
-* for build it needs glibc with r1698 (fixes to <bits/sigcontext.h>)
-
-diff -u qemu-0.8.2/debian/control qemu-0.8.2/debian/control
---- qemu-0.8.2/debian/control
-+++ qemu-0.8.2/debian/control
-@@ -6,13 +6,14 @@
-  Guillem Jover <guillem at debian.org>, Elrond <elrond at samba-tng.org>,
-  Josh Triplett <josh at psas.pdx.edu>
- Build-Depends: debhelper (>= 5), quilt (>= 0.40), binutils (>= 2.16-1), nasm,
-- gcc-3.4, libasound2-dev, libx11-dev, libsdl1.2-dev (>> 1.2.1), zlib1g-dev,
-+ gcc-3.4, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libx11-dev,
-+ libsdl1.2-dev (>> 1.2.1), zlib1g-dev, libfreebsd-dev [kfreebsd-i386 kfreebsd-amd64],
-  texi2html, sharutils, libgpmg1-dev [amd64 i386 powerpc alpha sparc arm s390],
-  iasl
- Standards-Version: 3.7.2
- 
- Package: qemu
--Architecture: amd64 i386 powerpc alpha sparc arm s390
-+Architecture: amd64 i386 powerpc alpha sparc arm s390 kfreebsd-i386 kfreebsd-amd64
- Depends: ${shlibs:Depends}, vgabios (>= 0.5a-1), bochsbios (>= 2.2.1-1),
-  proll, openhackware
- Recommends: debootstrap, sharutils, vde
-diff -u qemu-0.8.2/debian/patches/series qemu-0.8.2/debian/patches/series
---- qemu-0.8.2/debian/patches/series
-+++ qemu-0.8.2/debian/patches/series
-@@ -30,0 +31 @@
-+65_kfreebsd.patch
-diff -u qemu-0.8.2/debian/rules qemu-0.8.2/debian/rules
---- qemu-0.8.2/debian/rules
-+++ qemu-0.8.2/debian/rules
-@@ -3,6 +3,7 @@
- # $Id: rules 190 2006-09-20 01:14:03Z guillem $
- #
- 
-+DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
- CC = gcc-3.4
- # WARNING: Removing no-strict-aliasing will make qemu insta-segfault.
- CFLAGS = -Wall -g -fno-strict-aliasing
-@@ -13,6 +14,12 @@
- 	CFLAGS += -O2
- endif
- 
-+CONF_FLAGS = --prefix=/usr --enable-iasl --cc=$(CC)
-+
-+ifeq (linux,$(DEB_HOST_ARCH_OS))
-+	CONF_FLAGS += --enable-alsa
-+endif
-+
- D = $(CURDIR)/debian/qemu
- 
- qemu_bios_files = \
-@@ -34,11 +41,7 @@
- config-host.mak: configure
- 	dh_testdir
- 	
--	CFLAGS="$(CFLAGS)" ./configure \
--	  --prefix=/usr \
--	  --enable-alsa \
--	  --enable-iasl \
--	  --cc=$(CC)
-+	CFLAGS="$(CFLAGS)" ./configure $(CONF_FLAGS)
- 
- build: patch config-host.mak
- 	dh_testdir
-only in patch2:
-unchanged:
---- qemu-0.8.2.orig/debian/patches/65_kfreebsd.patch
-+++ qemu-0.8.2/debian/patches/65_kfreebsd.patch
-@@ -0,0 +1,35 @@
-+--- qemu-0.8.2.orig/configure
-++++ qemu-0.8.2/configure
-+@@ -108,6 +108,12 @@
-+ MINGW32*)
-+ mingw32="yes"
-+ ;;
-++GNU/kFreeBSD)
-++oss="yes"
-++if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
-++    kqemu="yes"
-++fi
-++;;
-+ FreeBSD)
-+ bsd="yes"
-+ oss="yes"
-+--- qemu-0.8.2.orig/vl.c
-++++ qemu-0.8.2/vl.c
-+@@ -46,6 +46,8 @@
-+ #ifndef __APPLE__
-+ #include <libutil.h>
-+ #endif
-++#elif defined (__FreeBSD_kernel__)
-++#include <freebsd/stdlib.h>
-+ #else
-+ #ifndef __sun__
-+ #include <linux/if.h>
-+@@ -3022,7 +3024,7 @@
-+     return s;
-+ }
-+ 
-+-#ifdef _BSD
-++#if defined (_BSD) || defined (__FreeBSD_kernel__)
-+ static int tap_open(char *ifname, int ifname_size)
-+ {
-+     int fd;

Deleted: trunk/web/patches/totem.diff
===================================================================
--- trunk/web/patches/totem.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/totem.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,71 +0,0 @@
-diff -u totem-1.4.5/debian/patches/00list totem-1.4.5/debian/patches/00list
---- totem-1.4.5/debian/patches/00list
-+++ totem-1.4.5/debian/patches/00list
-@@ -2,2 +2,3 @@
- 20_use_alternatives
-+30_kfreebsd_gnu
- 60_mandatory-relibtoolizing
---- totem-1.4.5.orig/debian/patches/30_kfreebsd_gnu.dpatch
-+++ totem-1.4.5/debian/patches/30_kfreebsd_gnu.dpatch
-@@ -0,0 +1,61 @@
-+#! /bin/sh -e
-+## 30_kfreebsd_gnu.dpatch by Joe Marcus Clarke <marcus at marcuscom.com> 
-+##                       and Aurelien Jarno <aurel32 at debian.org>
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: No description.
-+
-+if [ $# -lt 1 ]; then
-+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-+    exit 1
-+fi
-+
-+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-+
-+case "$1" in
-+    -patch) patch -p1 ${patch_opts} < $0;;
-+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-+    *)
-+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-+        exit 1;;
-+esac
-+
-+exit 0
-+
-+ at DPATCH@
-+--- totem-1.2.1.orig/src/plparse/totem-disc.c	2006-02-07 20:24:54.000000000 +0100
-++++ totem-1.2.1/src/plparse/totem-disc.c	2006-02-07 20:26:43.000000000 +0100
-+@@ -43,7 +43,32 @@
-+ #include <glib/gi18n.h>
-+ #include <libgnomevfs/gnome-vfs.h>
-+ 
-++#if defined (__linux__)
-++#include <mntent.h>
-+ #include <linux/cdrom.h>
-++#elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
-++#include <sys/cdio.h>
-++#include <sys/disklabel.h>
-++
-++#define CDROM_DRIVE_STATUS      0x5326
-++#define CDROM_DISC_STATUS       0x5327
-++#define CDS_AUDIO               100
-++#define CDS_MIXED               105
-++#define CDS_DATA_1              101
-++#define CDS_DATA_2              102
-++#define CDS_NO_INFO             0       /* if not implemented */
-++#define CDS_NO_DISC             1
-++#define CDS_TRAY_OPEN           2
-++#define CDS_DRIVE_NOT_READY     3
-++#define CDS_DISC_OK             4
-++#define CDS_XA_2_1              103
-++#define CDS_XA_2_2              104
-++#define CDC_DVD                 0x8000
-++#define ENOMEDIUM ENODEV
-++#define CDROM_GET_CAPABILITY CDIOCCLRDEBUG
-++#else
-++# error "Unknown system"
-++#endif
-+ 
-+ #include "totem-disc.h"
-+ 

Deleted: trunk/web/patches/xemacs21.diff
===================================================================
--- trunk/web/patches/xemacs21.diff	2006-11-16 16:18:48 UTC (rev 1725)
+++ trunk/web/patches/xemacs21.diff	2006-11-17 19:45:04 UTC (rev 1726)
@@ -1,43 +0,0 @@
-
-Status: in BTS #366133
-
-only in patch2:
-unchanged:
---- xemacs21-21.4.19.orig/configure.in
-+++ xemacs21-21.4.19/configure.in
-@@ -1105,6 +1105,7 @@
- dnl Straightforward OS determination
- case "$canonical" in
-   *-*-linux*    ) opsys=linux ;;
-+  *-*-kfreebsd* ) opsys=linux ;;
-   *-*-netbsd*   ) opsys=netbsd ;;
-   *-*-openbsd*	) opsys=openbsd ;;
-   *-*-nextstep* ) opsys=nextstep ;;
-diff -u xemacs21-21.4.19/debian/control.in xemacs21-21.4.19/debian/control.in
---- xemacs21-21.4.19/debian/control.in
-+++ xemacs21-21.4.19/debian/control.in
-@@ -3,7 +3,7 @@
- Priority: optional
- Maintainer: OHURA Makoto <ohura at debian.org>
- Standards-Version: 3.6.2
--Build-Depends: texinfo, libcanna1g-dev, libwnn6-dev, libjpeg62-dev, libncurses5-dev, libpng3-dev, libtiff4-dev, zlib1g-dev, texi2html, debhelper (>> 4), libldap2-dev, libdb3-dev, libpam0g-dev, libcompfaceg1-dev, libx11-dev, libxau-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, x-dev, xlibs-data, libxaw7-dev, autoconf2.13, libgtk1.2-dev, libgnome-dev, libart-dev, libesd0-dev, dpatch (>= 1.11), libgpmg1-dev
-+Build-Depends: texinfo, libcanna1g-dev, libwnn6-dev, libjpeg62-dev, libncurses5-dev, libpng3-dev, libtiff4-dev, zlib1g-dev, texi2html, debhelper (>> 4), libldap2-dev, libdb3-dev, libpam0g-dev, libcompfaceg1-dev, libx11-dev, libxau-dev, libxext-dev, libxmu-dev, libxpm-dev, libxt-dev, x-dev, xlibs-data, libxaw7-dev, autoconf2.13, libgtk1.2-dev, libgnome-dev, libart-dev, libesd0-dev, dpatch (>= 1.11), libgpmg1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
- 
- Package: xemacs at MAJVERSION@@SUBNAME@
- Architecture: all
-diff -u xemacs21-21.4.19/debian/rules xemacs21-21.4.19/debian/rules
---- xemacs21-21.4.19/debian/rules
-+++ xemacs21-21.4.19/debian/rules
-@@ -22,10 +22,10 @@
- # any way to do this automatically since we'd like this to be
- # easily used with no changes on other architectures, but still
- # want to be able to specify.  Does this work OK?
--machine_type = $(shell dpkg --print-architecture)
-+machine_type = $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
- prefix=usr
- 
--debianconfig = ${machine_type}-debian-linux
-+debianconfig = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- tmp_file_loc = debian/tmp
- 
- var_file = var_file.pl




More information about the Glibc-bsd-commits mailing list