Disable multibyte support only when wctype_t is not available. The

previous patches disabled it on NetBSD unconditionally.  Bump PKGREVISION.

Pointed out by Kibum Han.  Thanks to junyoung@ for testing.

OK'ed by schmonz@ and wiz@.

8 files changed, 129 insertions, 12 deletions

diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index a946e478e21..5ab949a2c75 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2004/01/05 12:36:41 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2004/06/22 14:05:39 minskim Exp $
 #
 
 DISTNAME=	bash-2.05b
 PKGNAME=	bash-2.05.2.7
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU:=bash/} \
 		ftp://ftp.cwru.edu/pub/bash/
diff --git a/shells/bash2/distinfo b/shells/bash2/distinfo
index 474aeea37db..673a218ef30 100644
--- a/shells/bash2/distinfo
+++ b/shells/bash2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2004/05/17 22:29:30 jschauma Exp $
+$NetBSD: distinfo,v 1.13 2004/06/22 14:05:39 minskim Exp $
 
 SHA1 (bash-2.05b.tar.gz) = b3e158877f94e66ec1c8ef604e994851ee388b09
 Size (bash-2.05b.tar.gz) = 1956216 bytes
@@ -16,10 +16,13 @@ SHA1 (bash205b-006) = 230aea5af21c0f895f7cf8290774ad7ce2cd7c08
 Size (bash205b-006) = 3155 bytes
 SHA1 (bash205b-007) = 758301e500c23779da9236c5cd3f6612d29d5f7b
 Size (bash205b-007) = 1072 bytes
-SHA1 (patch-aa) = 481cfa2962a799ec6444519949935dcadd942915
+SHA1 (patch-aa) = f6f5eb9b70e609164b35c57de70a1c404c7f52ba
 SHA1 (patch-ab) = 1a2fc87648b7e73a4987454bb249149ae15bed93
-SHA1 (patch-ac) = 6528085df706bd8741b8d460e5766a4be6f95ca2
-SHA1 (patch-ad) = 412b45000cbd26e5dbacb4c414351c70d73ae62f
+SHA1 (patch-ac) = 7f68d80de74a887fe0c3f42e9fb5d7e6ad311c30
+SHA1 (patch-ad) = 037f0b153c139cf5f6ea70245b99103200315cf8
 SHA1 (patch-ae) = c0e5564d5e57a04d8458e67fb391df0d890e6f38
 SHA1 (patch-af) = 7f9cca6100fa6b24c1fb0d30958b2743679e46ee
 SHA1 (patch-ag) = 0baab486f57f6f4eaedc376223aecde0e6dd5c0f
+SHA1 (patch-ah) = 00732b402fc0479e153d3f5b24ea8151a3d42dc0
+SHA1 (patch-ai) = db34e25bef3572d2bf198216e8c2aebb98362925
+SHA1 (patch-aj) = c5c541a5e3c06127ccbc8a560e3ea97fbf77ef4f
diff --git a/shells/bash2/patches/patch-aa b/shells/bash2/patches/patch-aa
index dff38aaab92..22ba73eb5f0 100644
--- a/shells/bash2/patches/patch-aa
+++ b/shells/bash2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.10 2002/12/17 14:45:13 drochner Exp $
+$NetBSD: patch-aa,v 1.11 2004/06/22 14:05:39 minskim Exp $
 
 --- config-bot.h.orig	Tue Apr 16 23:01:03 2002
 +++ config-bot.h	Tue Dec 17 15:34:52 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.10 2002/12/17 14:45:13 drochner Exp $
  #  include <wchar.h>
  #  include <wctype.h>
 -#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */
-+#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */ && !defined(__NetBSD__)
++#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */ && defined (HAVE_WCTYPE_T)
  #    define HANDLE_MULTIBYTE      1
  #  endif
  #endif
diff --git a/shells/bash2/patches/patch-ac b/shells/bash2/patches/patch-ac
index 793c6f7f53a..a272ec14a86 100644
--- a/shells/bash2/patches/patch-ac
+++ b/shells/bash2/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2002/12/17 14:45:13 drochner Exp $
+$NetBSD: patch-ac,v 1.9 2004/06/22 14:05:39 minskim Exp $
 
 --- include/shmbutil.h.orig	Mon May  6 19:58:39 2002
 +++ include/shmbutil.h	Tue Dec 17 15:27:20 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.8 2002/12/17 14:45:13 drochner Exp $
  #  include <wchar.h>
  #  include <wctype.h>
 -#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */
-+#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */ && !defined(__NetBSD__)
++#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */ && defined (HAVE_WCTYPE_T)
  #    define HANDLE_MULTIBYTE      1
  #  endif
  #endif /* HAVE_WCTYPE_H && HAVE_WCHAR_H */
diff --git a/shells/bash2/patches/patch-ad b/shells/bash2/patches/patch-ad
index 4283edb99a7..ce05784c945 100644
--- a/shells/bash2/patches/patch-ad
+++ b/shells/bash2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.4 2002/12/17 14:45:13 drochner Exp $
+$NetBSD: patch-ad,v 1.5 2004/06/22 14:05:39 minskim Exp $
 
 --- lib/readline/rlmbutil.h.orig	Thu Dec 20 15:54:38 2001
 +++ lib/readline/rlmbutil.h	Tue Dec 17 15:35:45 2002
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.4 2002/12/17 14:45:13 drochner Exp $
  #  include <wchar.h>
  #  include <wctype.h>
 -#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */
-+#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */ && !defined(__NetBSD__)
++#  if defined (HAVE_MBSRTOWCS) /* system is supposed to support XPG5 */ && defined (HAVE_WCTYPE_T)
  #    define HANDLE_MULTIBYTE      1
  #  endif
  #endif
diff --git a/shells/bash2/patches/patch-ah b/shells/bash2/patches/patch-ah
new file mode 100644
index 00000000000..12059aaf4a6
--- /dev/null
+++ b/shells/bash2/patches/patch-ah
@@ -0,0 +1,79 @@
+$NetBSD: patch-ah,v 1.1 2004/06/22 14:05:39 minskim Exp $
+
+--- configure.orig	2002-07-16 08:31:47.000000000 -0500
++++ configure
+@@ -10752,6 +10752,74 @@ EOF
+ 
+ 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:10756: checking for bits16_t" >&5
+ echo $ECHO_N "checking for bits16_t... $ECHO_C" >&6
diff --git a/shells/bash2/patches/patch-ai b/shells/bash2/patches/patch-ai
new file mode 100644
index 00000000000..2b560548c45
--- /dev/null
+++ b/shells/bash2/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2004/06/22 14:05:39 minskim Exp $
+
+--- config.h.in.orig	2004-06-21 09:46:10.000000000 -0500
++++ config.h.in
+@@ -221,6 +221,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/bash2/patches/patch-aj b/shells/bash2/patches/patch-aj
new file mode 100644
index 00000000000..3268b3d5c5c
--- /dev/null
+++ b/shells/bash2/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.1 2004/06/22 14:05:39 minskim Exp $
+
+--- configure.in.orig	2002-07-16 08:31:25.000000000 -0500
++++ configure.in
+@@ -678,6 +678,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