summaryrefslogtreecommitdiff
path: root/shells/bash
diff options
context:
space:
mode:
Diffstat (limited to 'shells/bash')
-rw-r--r--shells/bash/Makefile23
-rw-r--r--shells/bash/distinfo70
-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
-rw-r--r--shells/bash/patches/patch-af9
8 files changed, 19 insertions, 223 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index b0067091896..7a101e9b04e 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,17 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2006/10/21 11:39:16 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/10/22 11:18:10 wiz Exp $
-DISTNAME= bash-3.1
-PKGNAME= bash-3.1pl17
+DISTNAME= bash-3.2
CATEGORIES= shells
MASTER_SITES= ${MASTER_SITE_GNU:=bash/} \
ftp://ftp.cwru.edu/pub/bash/
-PATCH_SITES= ${MASTER_SITES:=bash-3.1-patches/}
-PATCHFILES= bash31-001 bash31-002 bash31-003 bash31-004 \
- bash31-005 bash31-006 bash31-007 bash31-008 \
- bash31-009 bash31-010 bash31-011 bash31-012 \
- bash31-013 bash31-014 bash31-015 bash31-016 \
- bash31-017
+PATCH_SITES= ${MASTER_SITES:=bash-3.2-patches/}
+PATCHFILES= bash32-001
MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/bash/bash.html
@@ -53,8 +48,7 @@ CONFIGURE_ARGS+= --enable-array-variables
.include "../../mk/bsd.prefs.mk"
PKG_OPTIONS_VAR= PKG_OPTIONS.bash
-PKG_SUPPORTED_OPTIONS= multibyte static
-PKG_SUGGESTED_OPTIONS= multibyte
+PKG_SUPPORTED_OPTIONS= static
.include "../../mk/bsd.options.mk"
@@ -67,13 +61,6 @@ BUILDLINK_DEPMETHOD.gettext= build
BUILDLINK_DEPMETHOD.readline= build
.endif
-##
-## Multibyte support
-##
-.if empty(PKG_OPTIONS:Mmultibyte)
-CONFIGURE_ENV+= ac_cv_type_wctype_t=no
-.endif
-
# the code has problems with older versions of yacc
.if !empty(LOWER_OPSYS:Mirix5*)
USE_TOOLS+= bison
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index 2a39556d8a7..306e0f71e42 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,63 +1,11 @@
-$NetBSD: distinfo,v 1.8 2006/09/03 08:30:42 wiz Exp $
+$NetBSD: distinfo,v 1.9 2006/10/22 11:18:10 wiz Exp $
-SHA1 (bash-3.1.tar.gz) = 766e3fd9384616d8a103f812f662fd8ec791c129
-RMD160 (bash-3.1.tar.gz) = cbeda56312b3f623684b2099b711bb7592e0eda1
-Size (bash-3.1.tar.gz) = 2533934 bytes
-SHA1 (bash31-001) = cea61aaea659ba8e5d7552204a2a497424deaf65
-RMD160 (bash31-001) = 0d071aeade45c1706f4061774bb486d9a2ba7dae
-Size (bash31-001) = 2708 bytes
-SHA1 (bash31-002) = a66b9ffb10d1fec8752353c851d9e3dc1ef7353a
-RMD160 (bash31-002) = 9b03b62c9eb1ba2a574467c6a2950b3b933794e1
-Size (bash31-002) = 7169 bytes
-SHA1 (bash31-003) = dc61c9dc01457c7742f429ed878fbba598b1b016
-RMD160 (bash31-003) = 1ee18374c2416407d1fa997ed99c5fc7f295cd62
-Size (bash31-003) = 1324 bytes
-SHA1 (bash31-004) = dcc8a188ee7b8d5cc668b8b6d9c6013e8ba7c76b
-RMD160 (bash31-004) = b8182116ca8efc0bec9054694cac54045245a704
-Size (bash31-004) = 1470 bytes
-SHA1 (bash31-005) = c9a29982618703765767e83d0c627cecde10203f
-RMD160 (bash31-005) = 3e2583ebf0e4fc546cdcf8ccf8b987a100f71a7e
-Size (bash31-005) = 1322 bytes
-SHA1 (bash31-006) = 19ca1806a739c58c680e795fb2c4dee9e0623a37
-RMD160 (bash31-006) = 608f650ef96c6f0e46395a21d9e30aba42fb33f9
-Size (bash31-006) = 1561 bytes
-SHA1 (bash31-007) = 897564cb062adacf9300ccc79006c3239993de22
-RMD160 (bash31-007) = ae865a7f4e0cbeb2022004d385c7c9d29dfe07a5
-Size (bash31-007) = 3254 bytes
-SHA1 (bash31-008) = 20479feb25533407b36ba13eed2421afa9b20e83
-RMD160 (bash31-008) = 9ec2f72649a1955593ab4ad98605ba323747367a
-Size (bash31-008) = 1422 bytes
-SHA1 (bash31-009) = 35d890067d85446b19892bae697695493c68eba5
-RMD160 (bash31-009) = 443ba0c4cbd81fe4a24d92f213a65c4dbf123053
-Size (bash31-009) = 2000 bytes
-SHA1 (bash31-010) = d6fc8724e5716a3e3b26aed51f9cc8b9d2425e4e
-RMD160 (bash31-010) = 9228d25e84180f576892ee6c9c3da8262e201269
-Size (bash31-010) = 5218 bytes
-SHA1 (bash31-011) = 2af832ae9fac9462c4029ee8f6893b6396ab8740
-RMD160 (bash31-011) = 1f35aeb50689b9ea1a8d393e34abbe1da241164a
-Size (bash31-011) = 1462 bytes
-SHA1 (bash31-012) = 253bda773a64334e9c64ab54b5ba4839ed8f9c29
-RMD160 (bash31-012) = 21892db3ca2441ebba7eabb269437024b37de0d1
-Size (bash31-012) = 1212 bytes
-SHA1 (bash31-013) = 0390c0a1529fdc40dbcba76d536440225d0232cd
-RMD160 (bash31-013) = da5aa550ac0f4a92346f846cd0e1d7290631f6a7
-Size (bash31-013) = 1133 bytes
-SHA1 (bash31-014) = b95c67171ec105cc39c9e136d3445f50f8f53622
-RMD160 (bash31-014) = d627b92e82e6c850b8f6abf2f6828b8120f1a695
-Size (bash31-014) = 2818 bytes
-SHA1 (bash31-015) = e22f2490d9403de0b28a295f4ac89554e55e901f
-RMD160 (bash31-015) = 1c2203711e26acf8f7e7bc51f05c2827b03f8eb9
-Size (bash31-015) = 3089 bytes
-SHA1 (bash31-016) = 7f4629b94464f53e98786e4a2d38f2b02566bb05
-RMD160 (bash31-016) = b474ec209cc59f8e9d2616eed9327c96cf3cc606
-Size (bash31-016) = 1295 bytes
-SHA1 (bash31-017) = 652a02f90011a167fec6e23a46bbdf9338bc9a7c
-RMD160 (bash31-017) = 838038cd5f70234504bb6d29741c48e15ca20d59
-Size (bash31-017) = 3640 bytes
-SHA1 (patch-aa) = 611f9c7e512c7fb80b088d58d6b3d91e18b06911
-SHA1 (patch-ab) = c08789555515fd4afb621cb564397ad6f1ec4dea
-SHA1 (patch-ac) = a7db1188d4986b87fb4bdf32da0f32513afa52de
-SHA1 (patch-ad) = d5224322e962e48ae29c71e1fd2d2616c60b7939
-SHA1 (patch-ae) = cdbdd0d04366f53b8efe40b3643dca4cc4d12b21
-SHA1 (patch-af) = 80372fe4ad53a20976bb8e40f2859b2c7c93d460
+SHA1 (bash-3.2.tar.gz) = fe6466c7ee98061e044dae0347ca5d1a8eab4a0d
+RMD160 (bash-3.2.tar.gz) = a73f790817d98be375a36def567737498e33aaf1
+Size (bash-3.2.tar.gz) = 2529838 bytes
+SHA1 (bash32-001) = cec2d4b62abf3361a22fb9a53242b8a27a38fe02
+RMD160 (bash32-001) = 633f6eb6b2b48345234c442b835abb94d10e0dad
+Size (bash32-001) = 1539 bytes
+SHA1 (patch-af) = d265d5ff8eae99b8334753ef7d9d9b95dd4b2380
SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
+SHA1 (patch-ah) = 6f88b33d9b56fabd319fa23cd1ff41594a01045b
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)
{
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 21:56:41 +0000