summaryrefslogtreecommitdiff
path: root/shells/bash
diff options
context:
space:
mode:
authorminskim <minskim@pkgsrc.org>2004-10-23 07:48:03 +0000
committerminskim <minskim@pkgsrc.org>2004-10-23 07:48:03 +0000
commit1ea300c1072c7b1f1ff515b7b518233119a7318c (patch)
treeb7f94b8b811784e3ba2f6821e610df0b8520b38d /shells/bash
parent1d7c7e8787489df213cccff862dda71b29a8a398 (diff)
downloadpkgsrc-1ea300c1072c7b1f1ff515b7b518233119a7318c.tar.gz
Enable multibyte support in default. It will be disabled by configure
if wctype_t is not available. Bump PKGREVISION.
Diffstat (limited to 'shells/bash')
-rw-r--r--shells/bash/Makefile13
-rw-r--r--shells/bash/distinfo7
-rw-r--r--shells/bash/patches/patch-aa13
-rw-r--r--shells/bash/patches/patch-ab13
-rw-r--r--shells/bash/patches/patch-ac21
-rw-r--r--shells/bash/patches/patch-ad14
-rw-r--r--shells/bash/patches/patch-ae79
7 files changed, 150 insertions, 10 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 05208ff39f2..d29a5d06e1d 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2004/10/22 10:48:01 martti Exp $
+# $NetBSD: Makefile,v 1.4 2004/10/23 07:48:03 minskim Exp $
#
DISTNAME= bash-3.0
+PKGREVISION= 1
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
ftp://ftp.cwru.edu/pub/bash/
@@ -25,14 +26,6 @@ INFO_FILES= bash.info
PKG_SHELL= ${PREFIX}/bin/bash
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(OPSYS:MNetBSD) && empty(OS_VERSION:M1.[56]*)
-CONFIGURE_ARGS+= --enable-multibyte
-.else
-CONFIGURE_ARGS+= --disable-multibyte
-.endif
-
# All features enabled by default.
CONFIGURE_ARGS+= --enable-readline
CONFIGURE_ARGS+= --enable-progcomp
@@ -49,6 +42,8 @@ CONFIGURE_ARGS+= --enable-alias
CONFIGURE_ARGS+= --enable-brace-expansion
CONFIGURE_ARGS+= --enable-array-variables
+.include "../../mk/bsd.prefs.mk"
+
.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS])
PKG_DEFAULT_OPTIONS+= static
.endif
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 5697042c31f..4aa5bef92d2 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,4 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/10/21 03:11:14 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/10/23 07:48:03 minskim Exp $
SHA1 (bash-3.0.tar.gz) = 3acf1ff4910d4bc863620c7533cbf4858370017b
Size (bash-3.0.tar.gz) = 2418293 bytes
+SHA1 (patch-aa) = 611f9c7e512c7fb80b088d58d6b3d91e18b06911
+SHA1 (patch-ab) = c08789555515fd4afb621cb564397ad6f1ec4dea
+SHA1 (patch-ac) = 012300f9e4427f2e15c8b96bc59a674f17d93cbd
+SHA1 (patch-ad) = 520fec46aa5df6f41418ce253cef6448dc36cadb
+SHA1 (patch-ae) = 7bacb7ac6835eb64014c744aa48eeecf48960fd8
diff --git a/shells/bash/patches/patch-aa b/shells/bash/patches/patch-aa
new file mode 100644
index 00000000000..a2647c56e18
--- /dev/null
+++ b/shells/bash/patches/patch-aa
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..43706eccb94
--- /dev/null
+++ b/shells/bash/patches/patch-ab
@@ -0,0 +1,13 @@
+$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
new file mode 100644
index 00000000000..a7735f518a3
--- /dev/null
+++ b/shells/bash/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.1 2004/10/23 07:48:03 minskim Exp $
+
+--- configure.in.orig 2004-07-21 15:06:54.000000000 -0500
++++ configure.in
+@@ -756,6 +756,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
new file mode 100644
index 00000000000..e6e94aada55
--- /dev/null
+++ b/shells/bash/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2004/10/23 07:48:03 minskim Exp $
+
+--- config.h.in.orig 2004-07-21 15:08:31.000000000 -0500
++++ config.h.in
+@@ -235,6 +235,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
new file mode 100644
index 00000000000..724a151f9f3
--- /dev/null
+++ b/shells/bash/patches/patch-ae
@@ -0,0 +1,79 @@
+$NetBSD: patch-ae,v 1.1 2004/10/23 07:48:03 minskim Exp $
+
+--- configure.orig 2004-07-21 15:18:56.000000000 -0500
++++ configure
+@@ -18508,6 +18508,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