6 files changed, 5 insertions, 144 deletions
diff --git a/shells/bash/patches/patch-aa b/shells/bash/patches/patch-aa
deleted file mode 100644
index a2647c56e18..00000000000
--- a/shells/bash/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/10/23 07:48:03 minskim Exp $
-
---- config-bot.h.orig	2004-03-19 16:56:23.000000000 -0600
-+++ config-bot.h
-@@ -141,7 +141,7 @@
- 
- /* If we don't want multibyte chars even on a system that supports them, let
-    the configuring user turn multibyte support off. */
--#if defined (NO_MULTIBYTE_SUPPORT)
-+#if defined (NO_MULTIBYTE_SUPPORT) || !defined(HAVE_WCTYPE_T)
- #  undef HANDLE_MULTIBYTE
- #endif
- 
diff --git a/shells/bash/patches/patch-ab b/shells/bash/patches/patch-ab
deleted file mode 100644
index 43706eccb94..00000000000
--- a/shells/bash/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/10/23 07:48:03 minskim Exp $
-
---- lib/readline/rlmbutil.h.orig	2003-05-13 08:38:37.000000000 -0500
-+++ lib/readline/rlmbutil.h
-@@ -43,7 +43,7 @@
- 
- /* If we don't want multibyte chars even on a system that supports them, let
-    the configuring user turn multibyte support off. */
--#if defined (NO_MULTIBYTE_SUPPORT)
-+#if defined (NO_MULTIBYTE_SUPPORT) || !defined(HAVE_WCTYPE_T)
- #  undef HANDLE_MULTIBYTE
- #endif
- 
diff --git a/shells/bash/patches/patch-ac b/shells/bash/patches/patch-ac
deleted file mode 100644
index 091dc75827b..00000000000
--- a/shells/bash/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/12/31 00:02:28 wiz Exp $
-
---- configure.in.orig	2005-12-01 15:36:03.000000000 +0100
-+++ configure.in
-@@ -826,6 +826,16 @@ AC_CHECK_SIZEOF([long long], 8)
- 
- AC_CHECK_TYPE(u_int, [unsigned int])
- AC_CHECK_TYPE(u_long, [unsigned long])
-+AC_CHECK_TYPE(wctype_t,
-+[  	cat >>confdefs.h <<\_ACEOF
-+#define HAVE_WCTYPE_T 1
-+_ACEOF],,
-+[#ifdef HAVE_WCHAR_H
-+#include <wchar.h>
-+#endif
-+#ifdef HAVE_WCTYPE_H
-+#include <wctype.h>
-+#endif])
- 
- BASH_TYPE_BITS16_T
- BASH_TYPE_U_BITS16_T
diff --git a/shells/bash/patches/patch-ad b/shells/bash/patches/patch-ad
deleted file mode 100644
index cfb4b5a2ade..00000000000
--- a/shells/bash/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/12/31 00:02:28 wiz Exp $
-
---- config.h.in.orig	2005-09-05 04:35:50.000000000 +0200
-+++ config.h.in
-@@ -239,6 +239,9 @@
- /* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
- #undef HAVE_ALLOCA_H
- 
-+/* Define if you have wctype_t, as a type.  */
-+#undef HAVE_WCTYPE_T
-+
- 
- /* SYSTEM TYPES */
- 
diff --git a/shells/bash/patches/patch-ae b/shells/bash/patches/patch-ae
deleted file mode 100644
index 223e19b68c8..00000000000
--- a/shells/bash/patches/patch-ae
+++ /dev/null
@@ -1,79 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2005/12/31 00:02:28 wiz Exp $
-
---- configure.orig	2005-12-01 15:44:38.000000000 +0100
-+++ configure
-@@ -17937,6 +17937,74 @@ fi
- 
- 
- 
-+echo "$as_me:10755: checking for wctype_t" >&5
-+echo $ECHO_N "checking for wctype_t... $ECHO_C" >&6
-+if test "${ac_cv_type_wctype_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#ifdef HAVE_WCHAR_H
-+#include <wchar.h>
-+#endif
-+#ifdef HAVE_WCTYPE_H
-+#include <wctype.h>
-+#endif
-+
-+int
-+main ()
-+{
-+if ((wctype_t *) 0)
-+  return 0;
-+if (sizeof (wctype_t))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:10785: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:10791: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:10795: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:10798: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:10801: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:10804: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_type_wctype_t=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_type_wctype_t=no
-+fi
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+echo "$as_me:10815: result: $ac_cv_type_wctype_t" >&5
-+echo "${ECHO_T}$ac_cv_type_wctype_t" >&6
-+if test $ac_cv_type_wctype_t = yes; then
-+  	cat >>confdefs.h <<\_ACEOF
-+#define HAVE_WCTYPE_T 1
-+_ACEOF
-+fi
-+
- if test "$ac_cv_sizeof_short" = 2; then
-   echo "$as_me:$LINENO: checking for bits16_t" >&5
- echo $ECHO_N "checking for bits16_t... $ECHO_C" >&6
diff --git a/shells/bash/patches/patch-af b/shells/bash/patches/patch-af
index 3e87233eef3..cdc7273738d 100644
--- a/shells/bash/patches/patch-af
+++ b/shells/bash/patches/patch-af
@@ -1,5 +1,6 @@
-$NetBSD: patch-af,v 1.2 2005/12/31 00:02:28 wiz Exp $
---- builtins/printf.def.orig	2005-10-29 20:51:29.000000000 +0200
+$NetBSD: patch-af,v 1.3 2006/10/22 11:18:10 wiz Exp $
+
+--- builtins/printf.def.orig	2006-09-18 12:48:42.000000000 +0000
 +++ builtins/printf.def
 @@ -64,6 +64,11 @@ $END
  #include "bashgetopt.h"
@@ -27,7 +28,7 @@ $NetBSD: patch-af,v 1.2 2005/12/31 00:02:28 wiz Exp $
  
  #if !defined (errno)
  extern int errno;
-@@ -438,7 +450,11 @@ printf_builtin (list)
+@@ -452,7 +464,11 @@ printf_builtin (list)
  		p = pp = getintmax ();
  		if (p != pp)
  		  {
@@ -39,7 +40,7 @@ $NetBSD: patch-af,v 1.2 2005/12/31 00:02:28 wiz Exp $
  		    PF (f, pp);
  		  }
  		else
-@@ -465,7 +481,11 @@ printf_builtin (list)
+@@ -479,7 +495,11 @@ printf_builtin (list)
  		p = pp = getuintmax ();
  		if (p != pp)
  		  {