7 files changed, 29 insertions, 14 deletions
diff --git a/package/gnuconfig/CVS/Entries b/package/gnuconfig/CVS/Entries
index 0a887d969..07ca106ed 100644
--- a/package/gnuconfig/CVS/Entries
+++ b/package/gnuconfig/CVS/Entries
@@ -7,8 +7,8 @@ D/scripts////
 D/src////
 D/tests////
 D/testsuite////
-/ChangeLog/1.384/Mon Jul  9 16:57:20 2007//
 /Makefile/1.6/Mon Sep 26 07:33:33 2005//
-/config.guess/1.366/Mon Jul  9 16:57:20 2007//
-/config.sub/1.356/Mon Jul  9 16:57:20 2007//
-/uname/1.5/Mon Jul  9 16:57:20 2007//
+/ChangeLog/1.387/Thu Sep 20 16:47:12 2007//
+/config.guess/1.368/Thu Sep 20 16:47:12 2007//
+/config.sub/1.356/Thu Sep 20 16:47:05 2007//
+/uname/1.5/Tue Aug 21 18:37:34 2007//
diff --git a/package/gnuconfig/ChangeLog b/package/gnuconfig/ChangeLog
index 424eb6ac9..2bba73eb5 100644
--- a/package/gnuconfig/ChangeLog
+++ b/package/gnuconfig/ChangeLog
@@ -1,3 +1,18 @@
+2007-07-25  Mike Frysinger  <vapier@gentoo.org>
+
+	* testsuite/config-guess.sh (run_config_guess): Do not prefix with
+	"function" as this is not permitted by POSIX.
+	* testsuite/config-sub.sh (run_config_sub): Likewise.
+
+2007-07-24  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Remove trailing whitespace.
+
+2007-07-22  Ben Elliston  <bje@gnu.org>
+
+	Reported by Luke Mewburn <luke@mewburn.net>:
+	* config.guess: Fix typo ix86xen -> i86xen.
+
 2007-06-28  Ben Elliston  <bje@gnu.org>
 
 	From M R Swami Reddy <MR.Swami.Reddy@nsc.com>:
diff --git a/package/gnuconfig/config.guess b/package/gnuconfig/config.guess
index 5c4f04d81..ebf353e3d 100755
--- a/package/gnuconfig/config.guess
+++ b/package/gnuconfig/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 #   Inc.
 
-timestamp='2007-05-17'
+timestamp='2007-07-22'
 
 # 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
@@ -347,7 +347,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
@@ -810,7 +810,7 @@ EOF
 	exit ;;
     *:Interix*:[3456]*)
     	case ${UNAME_MACHINE} in
-	    x86) 
+	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
 	    EM64T | authenticamd)
diff --git a/package/gnuconfig/testsuite/CVS/Entries b/package/gnuconfig/testsuite/CVS/Entries
index c155f79ae..31b14765c 100644
--- a/package/gnuconfig/testsuite/CVS/Entries
+++ b/package/gnuconfig/testsuite/CVS/Entries
@@ -1,7 +1,7 @@
 /.cvsignore/1.1/Mon Sep 26 07:33:33 2005//
-/config-guess.data/1.37/Mon Jul  9 16:57:20 2007//
-/config-guess.sh/1.4/Mon Sep 26 07:33:33 2005//
-/config-sub.data/1.47/Mon Jul  9 16:57:20 2007//
-/config-sub.sh/1.2/Mon Sep 26 07:33:33 2005//
 /uname.in/1.1/Mon Sep 26 07:33:33 2005//
+/config-guess.data/1.38/Thu Sep 20 16:47:13 2007//
+/config-guess.sh/1.5/Thu Sep 20 16:47:13 2007//
+/config-sub.data/1.47/Tue Aug 21 18:37:33 2007//
+/config-sub.sh/1.3/Thu Sep 20 16:47:13 2007//
 D
diff --git a/package/gnuconfig/testsuite/config-guess.data b/package/gnuconfig/testsuite/config-guess.data
index 100a604c4..0d8210da6 100644
--- a/package/gnuconfig/testsuite/config-guess.data
+++ b/package/gnuconfig/testsuite/config-guess.data
@@ -31,4 +31,4 @@ xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu
 x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
 i386	1.0			MINGW		ignored	i386-pc-mingw32
 SX-8R	1.0			SUPER-UX	ignored	sx8r-nec-superux1.0
-ix86xen	5.6			SunOS		ignored	i386-pc-solaris2.6
+i86xen	5.6			SunOS		ignored	i386-pc-solaris2.6
diff --git a/package/gnuconfig/testsuite/config-guess.sh b/package/gnuconfig/testsuite/config-guess.sh
index 3f5103080..324f275e3 100644
--- a/package/gnuconfig/testsuite/config-guess.sh
+++ b/package/gnuconfig/testsuite/config-guess.sh
@@ -10,7 +10,7 @@ verbose=false
 export PATH=`pwd`:$PATH
 IFS="	" # tab
 
-function run_config_guess ()
+run_config_guess ()
 {
     rc=0
     while read machine release system version triplet ; do
diff --git a/package/gnuconfig/testsuite/config-sub.sh b/package/gnuconfig/testsuite/config-sub.sh
index 03b642010..ab5d7ff66 100644
--- a/package/gnuconfig/testsuite/config-sub.sh
+++ b/package/gnuconfig/testsuite/config-sub.sh
@@ -9,7 +9,7 @@
 
 verbose=false
 
-function run_config_sub ()
+run_config_sub ()
 {
     rc=0
     while read alias canonical ; do