Update to 4.0 PL0.

4 files changed, 46 insertions, 206 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 8cf4684c6b33..2582658839c7 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=		bash
-PATCHLEVEL=		48
-PORTVERSION=		3.2.${PATCHLEVEL:S/^0//g}
-PORTREVISION?=	1
+PATCHLEVEL=		0
+PORTVERSION=		4.0.${PATCHLEVEL:S/^0//g}
+PORTREVISION?=		0
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_GNU:S/$/:bash/} \
 			ftp://ftp.cwru.edu/pub/%SUBDIR%/:faq
@@ -22,9 +22,9 @@ EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 PATCH_SITES=		${MASTER_SITE_GNU} \
 			ftp://ftp.cwru.edu/pub/%SUBDIR%/
 PATCH_SITE_SUBDIR=	${PORTNAME}/${DISTNAME}-patches/
-PATCHFILES!=		/usr/bin/jot -s " " -w \
-			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
-			${PATCHLEVEL} 1 ${PATCHLEVEL}
+#PATCHFILES!=		/usr/bin/jot -s " " -w \
+#			${PORTNAME}${PORTVERSION:R:S/.//g}-%03d \
+#			${PATCHLEVEL} 1 ${PATCHLEVEL}
 
 MAINTAINER=		obrien@FreeBSD.org
 COMMENT=		The GNU Project's Bourne Again SHell
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index f1097eb03733..1d7a45abd459 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,149 +1,5 @@
-MD5 (bash/bash-3.2.tar.gz) = 00bfa16d58e034e3c2aa27f390390d30
-SHA256 (bash/bash-3.2.tar.gz) = 26c99025b59e30779300b68adb764f824974d267a4d7cc1b347d14a2393f9fb4
-SIZE (bash/bash-3.2.tar.gz) = 2529838
-MD5 (bash/bash32-001) = d8e10c754f477e3f3a581af566b89301
-SHA256 (bash/bash32-001) = beda60ce6186fafa36cd0a98db9ced42cff68daee4342cca73167fb0f2f43eaa
-SIZE (bash/bash32-001) = 1539
-MD5 (bash/bash32-002) = d38a5288b2f0ea6c9ac76b66cc74ef7d
-SHA256 (bash/bash32-002) = a0ca49a3c47678ad074c990bdc871fcec680749b7f04f2def6527f04c589c40a
-SIZE (bash/bash32-002) = 1524
-MD5 (bash/bash32-003) = 0b90d37911827d8cb95f3b4353cc225e
-SHA256 (bash/bash32-003) = 7ec9e5e7e402e43b12bfd3a9237f4f171029fc7f58e59335abf3ccb455a5a84d
-SIZE (bash/bash32-003) = 4599
-MD5 (bash/bash32-004) = 8062f3a59631f58d78b180d83759b68a
-SHA256 (bash/bash32-004) = 3de0938673637089c3b0f0f355de377bb2be2d3fca68053dda267ca11b5998f2
-SIZE (bash/bash32-004) = 2585
-MD5 (bash/bash32-005) = 585b5943fadf0875ced243b245adde58
-SHA256 (bash/bash32-005) = e7fecdecb12320cd6fe9aca83fab1828b76aeb5313b991883764cb9139d845b7
-SIZE (bash/bash32-005) = 5910
-MD5 (bash/bash32-006) = 1d5732e01ea938aeed42f3def131fa4d
-SHA256 (bash/bash32-006) = 8f14f81ced32bc057bc10abf6842f4a5ac172816631f2b87a5a3be4f01c0847d
-SIZE (bash/bash32-006) = 1298
-MD5 (bash/bash32-007) = dcd0cc5d801607827f7c851e72b0eabc
-SHA256 (bash/bash32-007) = 6863a712e5a68eccfb77162a9f947ffd80af648f0124c38f795ebba2be12eff8
-SIZE (bash/bash32-007) = 1375
-MD5 (bash/bash32-008) = bb3c7dd11198c0ab93d0e960bebf6256
-SHA256 (bash/bash32-008) = ccf303b4d199d89d5efc659235f8a645376e86d294260dda4becbb61ec06667b
-SIZE (bash/bash32-008) = 1302
-MD5 (bash/bash32-009) = 434a6f29b0ca5f1ab784b2437ae8eaed
-SHA256 (bash/bash32-009) = ef30c579419106b4b4a2d0064ef7e57ceee6cdf657f4ccd7b89c8e4fd70560d8
-SIZE (bash/bash32-009) = 1882
-MD5 (bash/bash32-010) = 2efff04dd246fcf63bd4b99f77c9a081
-SHA256 (bash/bash32-010) = bb7df9fefe88d62ee371353edf62402a667cffba6ea202aa1c8b220308a0c612
-SIZE (bash/bash32-010) = 6293
-MD5 (bash/bash32-011) = 1dd104342f6920dfaf5efb3131e922e0
-SHA256 (bash/bash32-011) = 85bf656cfc49b1447b061341a4b1cb93ba89a41d8d1699a65aa971d1853ba472
-SIZE (bash/bash32-011) = 4776
-MD5 (bash/bash32-012) = 4f24b696ab78bdfae4f9cb7eb59b835d
-SHA256 (bash/bash32-012) = 45ef4ad98f2f218aa3acec15842ae1b833769c1dbe2f90c9bba00bbe4949fc43
-SIZE (bash/bash32-012) = 2555
-MD5 (bash/bash32-013) = 7c40addbf1187a26ae1c8373ed383442
-SHA256 (bash/bash32-013) = 9fbf893c383f45d25e5bc5c9eae8d2b349521f288945b3bd21c781784b81f693
-SIZE (bash/bash32-013) = 1852
-MD5 (bash/bash32-014) = 28e88c9f8679e99ac590d4a4a8227c56
-SHA256 (bash/bash32-014) = 62bb1a4d70f6f7938ca70a6aa7fe6f4b377ab5f450c7756b22b41de3bbd98ed6
-SIZE (bash/bash32-014) = 8141
-MD5 (bash/bash32-015) = 7c17d29675bd0d49470f162774385f80
-SHA256 (bash/bash32-015) = de40425e83628eb7431f39340ac09b42b5fcf484a565352851961b3e917d8771
-SIZE (bash/bash32-015) = 2293
-MD5 (bash/bash32-016) = a1edaa98b4449fe2205fa75448b7b105
-SHA256 (bash/bash32-016) = 7abf66bbba3ebd6b6428190f3ebca59abdc0bfa3957f1a725489de7391c2d9f1
-SIZE (bash/bash32-016) = 1620
-MD5 (bash/bash32-017) = 889ed119bbf9d363660b9a0127f35efa
-SHA256 (bash/bash32-017) = 951aa2a07b38db8eea8e7368d3ac36af60af7f5ade455215006229ce3815dfe0
-SIZE (bash/bash32-017) = 2611
-MD5 (bash/bash32-018) = a7d3f85fa687d2c1b5a134839f6d395d
-SHA256 (bash/bash32-018) = c85e2bca6084a79774adbf801698c62905662836334e54355b77fbf1c529074c
-SIZE (bash/bash32-018) = 2433
-MD5 (bash/bash32-019) = f0399da4007e46fc5820ce25d07425b9
-SHA256 (bash/bash32-019) = d83f1d740cb103be444589dcd9da61c2802815e8c256a01cfa7e484c50a9eb85
-SIZE (bash/bash32-019) = 8618
-MD5 (bash/bash32-020) = b76602281c3104d904fd064510fe0c21
-SHA256 (bash/bash32-020) = 3e66a1d05566d5501c2f868d3c94b8d71821a21d0daf9baaf594369697793013
-SIZE (bash/bash32-020) = 5182
-MD5 (bash/bash32-021) = 923374ae4403c92820f711e62e1d01a5
-SHA256 (bash/bash32-021) = a5e54704e6867c969a3e60556a5fbacedecca7404c3ddbe8180a92b6898a2a58
-SIZE (bash/bash32-021) = 1814
-MD5 (bash/bash32-022) = c82d3bd14e373878b2a680dce18d1596
-SHA256 (bash/bash32-022) = 057e03d593b858637056c0458b168e9c012db914727abba964afcaf377f2c5a4
-SIZE (bash/bash32-022) = 3034
-MD5 (bash/bash32-023) = 987c949a77b4b0ffe4a2597141e77635
-SHA256 (bash/bash32-023) = 869466d80807cde59c0eab9a39ef1909be4d5e8698ea1e3daa530ad59baaa97a
-SIZE (bash/bash32-023) = 1321
-MD5 (bash/bash32-024) = 5a2b976e761ab83f0fc7daae11451b86
-SHA256 (bash/bash32-024) = d13c59fa6b182f79bbf9ba35f72085aeb755f9785985eaf9f4a55d58045fe327
-SIZE (bash/bash32-024) = 3228
-MD5 (bash/bash32-025) = 08668dc2825f65eced9cac6b09ce1b45
-SHA256 (bash/bash32-025) = abfc1e1db3af956d4e71deb6a1ea9de1164c49fca4020b2546df3aa56f08cebe
-SIZE (bash/bash32-025) = 1935
-MD5 (bash/bash32-026) = f35b2b217f088ff009f956894550d41d
-SHA256 (bash/bash32-026) = 07985caacd6c150cf89c51965bd18db2c89a9f32f7a2aa946757007409c292b9
-SIZE (bash/bash32-026) = 2438
-MD5 (bash/bash32-027) = b5ff2b9610c61290f773c4b02cc1a37d
-SHA256 (bash/bash32-027) = 79647e3af94db8c2e636a293ee5b2f12516560b12aac0d4568a125d36cd21ddf
-SIZE (bash/bash32-027) = 2690
-MD5 (bash/bash32-028) = 016f5b56c93404d32aea09385f0fc13e
-SHA256 (bash/bash32-028) = 37289390175097c23efac5cb00d66b8b87e41fc37398064d11ac00de0e9934b0
-SIZE (bash/bash32-028) = 1750
-MD5 (bash/bash32-029) = a81420626d4d88d0dce2ffac0ac56341
-SHA256 (bash/bash32-029) = 1f4e543171bd66bc28b197938811028ea70e9e406be2529326d2a586844b98e7
-SIZE (bash/bash32-029) = 1330
-MD5 (bash/bash32-030) = 11f91baf970c132949f9072ee93f2ea6
-SHA256 (bash/bash32-030) = 5ed6ca19787f2285e0c080056f65a137e053387380b3d8f6133812dd8f824afb
-SIZE (bash/bash32-030) = 1558
-MD5 (bash/bash32-031) = f6bbc1e8ec0246740731c728ef476191
-SHA256 (bash/bash32-031) = 81ddc8f45e3272dd0e463fab87b58058be28d9c867674f3f53432dbd25cdfa48
-SIZE (bash/bash32-031) = 1961
-MD5 (bash/bash32-032) = 8180ec936770579bce69f0816c2dd878
-SHA256 (bash/bash32-032) = 926a9115e5c885ff9f2ef8abc6c3c552652afc370ebf65a87f41ec6810bdb569
-SIZE (bash/bash32-032) = 1304
-MD5 (bash/bash32-033) = 3cec33c3711860c4c6b7614afeec7870
-SHA256 (bash/bash32-033) = 9d7abee640dafbcdc6b75544015f3ffb5ed5aed2747465ec1412e959d3966740
-SIZE (bash/bash32-033) = 2181
-MD5 (bash/bash32-034) = 7bc6c5b5f38b7027152f8db0458a2e14
-SHA256 (bash/bash32-034) = adc52e3427b606fe9649980b01c5b2b18f0509c4dd6d59a84f85b6a2989f9f8e
-SIZE (bash/bash32-034) = 1866
-MD5 (bash/bash32-035) = a2db61fe90e39371d0e6cd2285ec9208
-SHA256 (bash/bash32-035) = d3d906b23fce195d5d6f0db8969fa5264e80a98b5460008d6a05e4156ca73953
-SIZE (bash/bash32-035) = 4805
-MD5 (bash/bash32-036) = 95c70c7ae9de5bd3659c86284be7fb76
-SHA256 (bash/bash32-036) = bdb24d65d1170234379fe587f5dc8b990c5e0c2d61c394bb8c81b91c1c64ce23
-SIZE (bash/bash32-036) = 1264
-MD5 (bash/bash32-037) = 62b876a3d7cd192cc8db2476fbb6b7b9
-SHA256 (bash/bash32-037) = 9688a352c0fb23d2ce6e685ce39cda1c49f4aa7819bde2508ff8c90003f484df
-SIZE (bash/bash32-037) = 3227
-MD5 (bash/bash32-038) = aca3afc341bd3e5a0d8a3b4ca40dbb3f
-SHA256 (bash/bash32-038) = 0e3649531c3a5675743980ecf5ff5fcbca2801afe4dca7fb4b250aae7ac3b782
-SIZE (bash/bash32-038) = 2412
-MD5 (bash/bash32-039) = e240c34f979b64bcb83c5f6567110bb1
-SHA256 (bash/bash32-039) = 46d427fd5b1509ec7dd980c07efd88634fde61cf07ab221dcbde9e1021bd2817
-SIZE (bash/bash32-039) = 5034
-MD5 (bash/bash32-040) = 06e6df263398807fa032707fb7b77b5f
-SHA256 (bash/bash32-040) = c9e0387eb4a2904126864d24de0699cdb6070789e1c02287a3b81ea96bf945aa
-SIZE (bash/bash32-040) = 1403
-MD5 (bash/bash32-041) = 373ae081d658dc85bc1058c4759d6669
-SHA256 (bash/bash32-041) = cc551fa57d613efea30ab2404fe724793a3d10f012b030e611d2c6449e463bcd
-SIZE (bash/bash32-041) = 4446
-MD5 (bash/bash32-042) = 9c9ebc6bfc33a0215277ee17a276eb5a
-SHA256 (bash/bash32-042) = fd0df54d03034e104b6377f249624bda0271aa874190a46e9d41fc49ad3caaef
-SIZE (bash/bash32-042) = 1209
-MD5 (bash/bash32-043) = b87fb9ea16a64ca41b6676e9a7eb7a33
-SHA256 (bash/bash32-043) = 43df7d2d7d61d3a8f0e14bc86d4f55b6d2e64829ba0829a78f5214d186087af7
-SIZE (bash/bash32-043) = 1658
-MD5 (bash/bash32-044) = 07e0229ce5879bfbd26a8146070fd366
-SHA256 (bash/bash32-044) = 204b5ecaaa5de334c3cfbce6dfd8a9d3770b09024ab4724d86080fbf501ded69
-SIZE (bash/bash32-044) = 5565
-MD5 (bash/bash32-045) = 1ad07965a8a93f3556ee1ab18b97cde2
-SHA256 (bash/bash32-045) = 3250e6c6d5d6884e31beaa2f521d2a1af9c2f701a4c0e67a7cd011b6ad8f082b
-SIZE (bash/bash32-045) = 1338
-MD5 (bash/bash32-046) = f7b1e19fcad54c2286bc0ed614aad9bf
-SHA256 (bash/bash32-046) = fc829e92fa951c34368d83272d746f5c0ed345a7ad037f93322347eed00a1e1f
-SIZE (bash/bash32-046) = 1275
-MD5 (bash/bash32-047) = 550690766de770116c34dbdf74e59184
-SHA256 (bash/bash32-047) = 623d4a958d2b022a15929a4de7403766ff07b295a185987b4d1e6cf3b70ea106
-SIZE (bash/bash32-047) = 1981
-MD5 (bash/bash32-048) = 4cc593e7b789b23b37a5397e092d3954
-SHA256 (bash/bash32-048) = 74cb56764274f393676f68738eb22a3ed8fa388c0487feeadf0d78a45b549749
-SIZE (bash/bash32-048) = 1948
+MD5 (bash/bash-4.0.tar.gz) = a90a1b5a6db4838483f05438e05e8eb9
+SHA256 (bash/bash-4.0.tar.gz) = 9793d394f640a95030c77d5ac989724afe196921956db741bcaf141801c50518
+SIZE (bash/bash-4.0.tar.gz) = 6230779
 MD5 (bash/FAQ) = IGNORE
 SHA256 (bash/FAQ) = IGNORE
diff --git a/shells/bash/files/patch-lib::readline::display.c b/shells/bash/files/patch-lib::readline::display.c
index 53d0b4f4249a..f05f78b72c7d 100644
--- a/shells/bash/files/patch-lib::readline::display.c
+++ b/shells/bash/files/patch-lib::readline::display.c
@@ -1,24 +1,11 @@
-#
-# Fix handling of `read -e' while PS1 is set longer than the screen width
-#
-# http://lists.gnu.org/archive/html/bug-bash/2004-11/msg00220.html
-# http://lists.gnu.org/archive/html/bug-bash/2004-11/msg00266.html
-#
---- lib/readline/display.c.orig	Wed Nov 30 17:05:02 2005
-+++ lib/readline/display.c	Wed Dec 28 20:13:15 2005
-@@ -594,11 +594,10 @@
- 
+--- lib/readline/display.c.orig	2009-01-04 11:32:32.000000000 -0800
++++ lib/readline/display.c	2009-03-08 00:51:31.000000000 -0800
+@@ -654,5 +654,8 @@ rl_redisplay ()
    /* inv_lbreaks[i] is where line i starts in the buffer. */
    inv_lbreaks[newlines = 0] = 0;
--#if 0
--  lpos = out - wrap_offset;
--#else
--  lpos = prompt_physical_chars + modmark;
--#endif
 +  if (local_prompt)
-+    lpos = prompt_physical_chars + modmark;
+   lpos = prompt_physical_chars + modmark;
 +  else
 +    lpos = 0;
  
  #if defined (HANDLE_MULTIBYTE)
-   memset (_rl_wrapped_line, 0, vis_lbsize);
diff --git a/shells/bash/files/xpatch-colonbreakswords b/shells/bash/files/xpatch-colonbreakswords
index cd565ca232dd..a37b742f4e17 100644
--- a/shells/bash/files/xpatch-colonbreakswords
+++ b/shells/bash/files/xpatch-colonbreakswords
@@ -1,10 +1,6 @@
-#
-# new shopt `colonbreakswords'
-# http://lists.gnu.org/archive/html/bug-bash/2004-10/msg00190.html
-#
---- bashline.c.orig	Sat Nov  5 18:07:02 2005
-+++ bashline.c	Wed Dec 28 19:44:28 2005
-@@ -212,6 +212,11 @@
+--- bashline.c.orig	2009-01-08 06:29:24.000000000 -0800
++++ bashline.c	2009-03-08 01:00:50.000000000 -0800
+@@ -226,6 +226,11 @@ int bash_readline_initialized = 0;
     host list. */
  int perform_hostname_completion = 1;
  
@@ -16,7 +12,7 @@
  /* If non-zero, we don't do command completion on an empty line. */
  int no_empty_command_completion;
  
-@@ -222,7 +227,8 @@
+@@ -239,7 +244,8 @@ int dircomplete_spelling = 0;
  
  static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
  static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
@@ -26,7 +22,7 @@
  
  static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
  
-@@ -325,6 +331,80 @@
+@@ -351,6 +357,80 @@ enable_hostname_completion (on_or_off)
    return (old_value);
  }
  
@@ -107,7 +103,7 @@
  /* Called once from parse.y if we are going to use readline. */
  void
  initialize_readline ()
-@@ -485,8 +565,12 @@
+@@ -517,11 +597,16 @@ initialize_readline ()
       completion is enabled. */
    enable_hostname_completion (perform_hostname_completion);
  
@@ -117,34 +113,38 @@
 +  enable_colon_wordbreak (colon_is_wordbreak);
 +
    /* characters that need to be quoted when appearing in filenames. */
--  rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{";	/*}*/
+ #if 0
+   rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{";	/*}*/
+ #else
+-  rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
++//  rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~";	/*}*/
+ #endif
    rl_filename_quoting_function = bash_quote_filename;
    rl_filename_dequoting_function = bash_dequote_filename;
-   rl_char_is_quoted_p = char_is_quoted;
---- builtins/shopt.def.orig	Wed Dec 28 19:38:09 2005
-+++ builtins/shopt.def	Wed Dec 28 19:44:28 2005
-@@ -83,6 +83,8 @@
- extern int hist_verify, history_reediting, perform_hostname_completion;
- extern int no_empty_command_completion;
- extern int force_fignore;
+--- builtins/shopt.def.orig	2009-01-13 05:43:16.000000000 -0800
++++ builtins/shopt.def	2009-03-08 01:03:39.000000000 -0800
+@@ -96,6 +97,8 @@ extern int force_fignore;
+ extern int dircomplete_spelling;
+ 
+ extern int enable_hostname_completion __P((int));
 +extern int colon_is_wordbreak;
 +extern int enable_colon_wordbreak __P((int));
- extern int enable_hostname_completion __P((int));
  #endif
  
-@@ -121,6 +123,9 @@
-   { "checkwinsize", &check_window_size, (shopt_set_func_t *)NULL },
- #if defined (HISTORY)
-   { "cmdhist", &command_oriented_history, (shopt_set_func_t *)NULL },
-+#endif
+ #if defined (PROGRAMMABLE_COMPLETION)
+@@ -147,6 +150,9 @@ static struct {
+ #if defined (READLINE)
+   { "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
+ #endif
 +#if defined (READLINE)
 +  { "colonbreakswords", &colon_is_wordbreak, enable_colon_wordbreak },
- #endif
++#endif
    { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },
    { "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL },
---- doc/bash.1.orig	Wed Dec 28 19:38:09 2005
-+++ doc/bash.1	Wed Dec 28 19:44:28 2005
-@@ -7972,6 +7972,18 @@
+   { "expand_aliases", &expand_aliases, (shopt_set_func_t *)NULL },
+--- doc/bash.1.orig	2009-03-08 00:53:01.000000000 -0800
++++ doc/bash.1	2009-03-08 01:05:32.000000000 -0800
+@@ -8473,6 +8473,18 @@ attempts to save all lines of a multiple
  command in the same history entry.  This allows
  easy re-editing of multi-line commands.
  .TP 8
@@ -160,12 +160,12 @@
 +above).
 +This is enabled by default.
 +.TP 8
- .B dotglob
- If set, 
+ .B compat31
+ If set,
  .B bash
---- doc/bashref.texi.orig	Wed Dec 28 19:38:09 2005
-+++ doc/bashref.texi	Wed Dec 28 19:44:28 2005
-@@ -3598,6 +3598,11 @@
+--- doc/bashref.texi.orig	2009-03-08 00:53:01.000000000 -0800
++++ doc/bashref.texi	2009-03-08 01:07:00.000000000 -0800
+@@ -4321,6 +4321,11 @@ attempts to save all lines of a multiple
  command in the same history entry.  This allows
  easy re-editing of multi-line commands.
  
@@ -174,6 +174,3 @@
 +separating word being completed (@pxref{Commands For Completion}).
 +This option is enabled by default.
 +
- @item dotglob
- If set, Bash includes filenames beginning with a `.' in
- the results of filename expansion.