Disable multibyte support on NetBSD to fix compile error.

4 files changed, 67 insertions, 1 deletions

diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo
index 2ea9a319a9d..7fa2125ee73 100644
--- a/shells/bash2/distinfo
+++ b/shells/bash2/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/11/25 04:18:47 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2002/11/25 05:39:33 schmonz Exp $
 
 SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09
 Size (bash-2.05b.tar.gz) = 1956216 bytes
+SHA1 (patch-aa) = 7ea440ffc3c3051fc589c8b0a9015feb7f1e7093
 SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93
+SHA1 (patch-ac) = 38d134c25aa12fec1dda7b1d0c7f8cf512b4b2cb
+SHA1 (patch-ad) = 11f38c1a531578fa9947aed0a6b16537560877e9
 SHA1 (patch-ae) = c0e5564d5e57a04d8458e67fb391df0d890e6f38
diff --git a/shells/bash2/patches/patch-aa b/shells/bash2/patches/patch-aa
new file mode 100644
index 00000000000..036f07c1a07
--- /dev/null
+++ b/shells/bash2/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.9 2002/11/25 05:39:34 schmonz Exp $
+
+--- config-bot.h.orig	Tue Apr 16 17:01:03 2002
++++ config-bot.h
+@@ -104,11 +104,16 @@
+ /* For platforms which support the ISO C amendement 1 functionality we
+    support user defined character classes.  */
+ /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
++#if defined (__NetBSD__)
++#  define HANDLE_MULTIBYTE        0
++#endif
+ #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H)
+ #  include <wchar.h>
+ #  include <wctype.h>
+ #  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */
++#   if !defined (HANDLE_MULTIBYTE)
+ #    define HANDLE_MULTIBYTE      1
++#   endif
+ #  endif
+ #endif
+ 
diff --git a/shells/bash2/patches/patch-ac b/shells/bash2/patches/patch-ac
new file mode 100644
index 00000000000..39314dd7c45
--- /dev/null
+++ b/shells/bash2/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.7 2002/11/25 05:39:35 schmonz Exp $
+
+--- include/shmbutil.h.orig	Mon May  6 13:58:39 2002
++++ include/shmbutil.h
+@@ -30,11 +30,16 @@
+ /* For platforms which support the ISO C amendement 1 functionality we
+    support user defined character classes.  */
+    /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
++#if defined (__NetBSD__)
++#  define HANDLE_MULTIBYTE        0
++#endif
+ #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H)
+ #  include <wchar.h>
+ #  include <wctype.h>
+ #  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */
++#   if !defined(HANDLE_MULTIBYTE)
+ #    define HANDLE_MULTIBYTE      1
++#   endif
+ #  endif
+ #endif /* HAVE_WCTYPE_H && HAVE_WCHAR_H */
+ 
diff --git a/shells/bash2/patches/patch-ad b/shells/bash2/patches/patch-ad
new file mode 100644
index 00000000000..945b67cf3c8
--- /dev/null
+++ b/shells/bash2/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.3 2002/11/25 05:39:36 schmonz Exp $
+
+--- lib/readline/rlmbutil.h.orig	Thu Dec 20 09:54:38 2001
++++ lib/readline/rlmbutil.h
+@@ -32,11 +32,16 @@
+ /* For platforms which support the ISO C amendement 1 functionality we
+    support user defined character classes.  */
+    /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
++#if defined (__NetBSD__)
++#  define HANDLE_MULTIBYTE        0
++#endif
+ #if defined (HAVE_WCTYPE_H) && defined (HAVE_WCHAR_H)
+ #  include <wchar.h>
+ #  include <wctype.h>
+ #  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */
++#   if !defined(HANDLE_MULTIBYTE)
+ #    define HANDLE_MULTIBYTE      1
++#   endif
+ #  endif
+ #endif
+