12 files changed, 93 insertions, 139 deletions

diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 0551848c7c70..c42cc5365710 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		bash
-PORTVERSION=		3.0.${PATCHLEVEL}
-PORTREVISION=		1
+PORTVERSION=		3.1.${PATCHLEVEL:S/^0//g}
 CATEGORIES=		shells
 MASTER_SITES=		${MASTER_SITE_GNU:S/$/:bash/} \
 			http://cnswww.cns.cwru.edu/~chet/%SUBDIR%/:faq \
@@ -20,7 +19,7 @@ EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=		ftp://ftp.cwru.edu/pub/%SUBDIR%/:bash
 PATCH_SITE_SUBDIR=	${PORTNAME}/${DISTNAME}-patches/:bash
-.for patch in		01 02 03 04 05 06 07 08 09 10 11 12 13 14 15 16
+.for patch in		01 02 03 04 05 06 07 08 09 10
 PATCHFILES+=		${PORTNAME}${PORTVERSION:R:S/.//g}-0${patch}:bash
 PATCHLEVEL=		${patch}
 .endfor
@@ -42,7 +41,6 @@ EXTRA_PATCHES+=		${PATCHDIR}/xpatch-colonbreakswords
 MAN1=			bash.1 bashbug.1
 INFO=			bash
 
-USE_REINPLACE=		yes
 GNU_CONFIGURE=		yes
 
 .if !defined(NOPORTDOCS)
@@ -60,12 +58,12 @@ CONFIGURE_ARGS=		--without-bash-malloc \
 .if !defined(WITHOUT_NLS)
 WITHOUT_NLS=yes
 .endif
-CONFIGURE_ARGS+= --enable-static-link
+CONFIGURE_ARGS+=	--enable-static-link
 PKGNAMESUFFIX=	-static
 .else
-CONFIGURE_ARGS+= --enable-static-link=no
+CONFIGURE_ARGS+=	--enable-static-link=no
 .endif
-			
+
 .if defined(WITHOUT_HELP)
 CONFIGURE_ARGS+=	--disable-help-builtin
 PLIST_SUB+=		HELP="@comment "
@@ -95,10 +93,6 @@ CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600006
-CONFIGURE_ARGS+=	--with-installed-readline
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/bash.1
 
diff --git a/shells/bash/distinfo b/shells/bash/distinfo
index e10f5d3fb7c0..679064ec80d5 100644
--- a/shells/bash/distinfo
+++ b/shells/bash/distinfo
@@ -1,53 +1,35 @@
-MD5 (bash/bash-3.0.tar.gz) = 26c4d642e29b3533d8d754995bc277b3
-SHA256 (bash/bash-3.0.tar.gz) = 72d3f9d80fb4622e79ee5019314668b7bd6747182fa0928c8742002b7568586f
-SIZE (bash/bash-3.0.tar.gz) = 2418293
-MD5 (bash/bash30-001) = 24a83f78a44a6029024371f02da174dd
-SHA256 (bash/bash30-001) = cc10d8f92d612c3b223d5bd93747fbda157d43dd2dc46931b6c4a413dc025990
-SIZE (bash/bash30-001) = 4999
-MD5 (bash/bash30-002) = 6f4cf2aa975a1fcc0cb43a406bd47ca5
-SHA256 (bash/bash30-002) = e6ee9bafa05a3c9208243ab2cdcc811022355df81223c6268ebdf2f6490b127d
-SIZE (bash/bash30-002) = 2119
-MD5 (bash/bash30-003) = c8bf41e78cda16d391b9099eeba01386
-SHA256 (bash/bash30-003) = cd1ebed48b14d97d1e95406b7e622c97ae8b30ef87a4aa343b3f5f38626e5acc
-SIZE (bash/bash30-003) = 4669
-MD5 (bash/bash30-004) = c069dffbb3f442aac3660b883ddd97f5
-SHA256 (bash/bash30-004) = 7bada92d85abf50c1283986f633ea05448b59ea81ad34ee8776732b164c0deec
-SIZE (bash/bash30-004) = 3372
-MD5 (bash/bash30-005) = ad06309c623ff8e1b9f039d3b7eb97c2
-SHA256 (bash/bash30-005) = 94cbd9ec49581d2eea24ced3a9e8fa7482145d2edff9de71c304d1a8a807fbc0
-SIZE (bash/bash30-005) = 1776
-MD5 (bash/bash30-006) = f162bf93a76759bab37b29509a4a6e20
-SHA256 (bash/bash30-006) = 7db67f299605d93fe6cba3e30930d98dfadb042938deb1772e774dcb3a5bd218
-SIZE (bash/bash30-006) = 4258
-MD5 (bash/bash30-007) = 89903d92ca620921aecb3f1f30c05ebe
-SHA256 (bash/bash30-007) = b0c46db80a84588a1b51ff6e48a781c56c97677d0573ac0e793d6c811c6b3c47
-SIZE (bash/bash30-007) = 1808
-MD5 (bash/bash30-008) = 9a295c02f46bc867fc096862c7380a88
-SHA256 (bash/bash30-008) = 5cf87ad11a4592f741e25ca80571fcb5b3900d1a52318f64fe8a9e885958c6a6
-SIZE (bash/bash30-008) = 1220
-MD5 (bash/bash30-009) = 786c7e2af1dca5104af92bbdc60f7474
-SHA256 (bash/bash30-009) = 0aca61348118b2538b3892916f508f2633528e49713830c848ac0515a747aca8
-SIZE (bash/bash30-009) = 2828
-MD5 (bash/bash30-010) = f2d90d06ed445a285c8406016e9d9c13
-SHA256 (bash/bash30-010) = 61f92dd3bd49113a2c8e8dd0ed89ffbaa0f60127bd09fc60aba385729a78b5e0
-SIZE (bash/bash30-010) = 3193
-MD5 (bash/bash30-011) = 9506c56968c58332489986633319a186
-SHA256 (bash/bash30-011) = 3bb9986e4264f4bf900c3d2a91e0bea69d06fd921f7dab6356e7fada8ce5ac2c
-SIZE (bash/bash30-011) = 2635
-MD5 (bash/bash30-012) = 2753d4de0b57fc8890488463c5e86d3f
-SHA256 (bash/bash30-012) = 818b5014fdb046736e4469817dae66f0e7273516e69fa7dd562c03ab38752649
-SIZE (bash/bash30-012) = 1395
-MD5 (bash/bash30-013) = 5de5be8289764c11a3206b06351d81a6
-SHA256 (bash/bash30-013) = 43f46a3185fab5b79ecce01599629a7956887b625b2883fa561a99ccbe649926
-SIZE (bash/bash30-013) = 1963
-MD5 (bash/bash30-014) = d4b531e02b6a0287cffdbf527134ca29
-SHA256 (bash/bash30-014) = 0f7cc21dc0490f24fc5d807d0884c40547788d6e2812f0dce21356ed0e12475f
-SIZE (bash/bash30-014) = 1165
-MD5 (bash/bash30-015) = adc1ab952b42ed0c0f53d1c308a32101
-SHA256 (bash/bash30-015) = dadff53e74f0c7123336c4af0354b57c0d18953fc7710800fd2f96325430182c
-SIZE (bash/bash30-015) = 1480
-MD5 (bash/bash30-016) = a3bb09a185e4c6a813227f3e84e4f6e5
-SHA256 (bash/bash30-016) = 7b71cc18a21e5ecb4df1ef072b9d36ada268f33cc8492a70e4892ecda1f6bfb2
-SIZE (bash/bash30-016) = 2453
+MD5 (bash/bash-3.1.tar.gz) = ef5304c4b22aaa5088972c792ed45d72
+SHA256 (bash/bash-3.1.tar.gz) = d6952b2c38f9bf417559dd3b071860e1099ddfb8a12c0228f22afaf47f79d3b9
+SIZE (bash/bash-3.1.tar.gz) = 2533934
+MD5 (bash/bash31-001) = c0d33bdfed6e4e6a9ae9200b77cd5c99
+SHA256 (bash/bash31-001) = 3b6d9151ca7a45dbcf43ebd1c6a647ef90c4b8eb54a245936fd6ffadc61fe727
+SIZE (bash/bash31-001) = 2708
+MD5 (bash/bash31-002) = 0c9be3bad344d04b79c4eac9eb39624c
+SHA256 (bash/bash31-002) = ecd248b1ca027368dae967502af5b28019eeee8fa3ee8d6a0210677789658f08
+SIZE (bash/bash31-002) = 7169
+MD5 (bash/bash31-003) = 04750485f335972f7a980a1bfe048dba
+SHA256 (bash/bash31-003) = 96cb8a42162a5876b2392b76fbfc78d073f50735e1e8a14e67e03b6e9c2b215d
+SIZE (bash/bash31-003) = 1324
+MD5 (bash/bash31-004) = 0c2856794ab16a4c224223c1964140c2
+SHA256 (bash/bash31-004) = a50ecd3f51e9a79f34855c68c61c9523fccb66da0870eade936cc1f64ba04415
+SIZE (bash/bash31-004) = 1470
+MD5 (bash/bash31-005) = 943233d7227071fa040c8b9eb016fa0c
+SHA256 (bash/bash31-005) = 3b057498f01cb2b528a154b9043261cb059846b23222409f7de95a7971dc6664
+SIZE (bash/bash31-005) = 1322
+MD5 (bash/bash31-006) = 68a41a9da7c669b4358837d06556a06f
+SHA256 (bash/bash31-006) = d155030ed49de27812d9ae01211283f7afe5e718ea4ed9babe1f121d25acf778
+SIZE (bash/bash31-006) = 1561
+MD5 (bash/bash31-007) = f6ca4950256fefd88d49c5702338e501
+SHA256 (bash/bash31-007) = fa89a6c808490e07cd7350ecb3390ce0ae6dc71d634c61c62991aafab97962c4
+SIZE (bash/bash31-007) = 3254
+MD5 (bash/bash31-008) = 4fd01140cb5875fe020939aab02791f0
+SHA256 (bash/bash31-008) = c30fe9da56261c7100c5b6794d4341b6b1fb6aa0ecc25b1010ac4ac25b07d1c7
+SIZE (bash/bash31-008) = 1422
+MD5 (bash/bash31-009) = 37aad0d5aa57881742ec6419faf9e480
+SHA256 (bash/bash31-009) = cfdc6dd92d0f47988ee59e2a26e8e62a87558e03908a26ee33dd0394228ac255
+SIZE (bash/bash31-009) = 2000
+MD5 (bash/bash31-010) = 19b95889211ebac076d7c9708fc7cb6e
+SHA256 (bash/bash31-010) = 465f6d8245cc21a7aa5339bab9b591daa78fc551096f4d19eb8dbcdacfd5c509
+SIZE (bash/bash31-010) = 1829
 MD5 (bash/FAQ) = IGNORE
 SHA256 (bash/FAQ) = IGNORE
diff --git a/shells/bash/files/patch-builtins::Makefile.in b/shells/bash/files/patch-builtins::Makefile.in
index 45d34668a9c9..6ff8ae5d6d75 100644
--- a/shells/bash/files/patch-builtins::Makefile.in
+++ b/shells/bash/files/patch-builtins::Makefile.in
@@ -1,11 +1,11 @@
---- builtins/Makefile.in.orig	Mon Oct 11 15:32:28 2004
-+++ builtins/Makefile.in	Mon Oct 11 15:32:58 2004
-@@ -177,7 +177,7 @@
+--- builtins/Makefile.in.orig	Wed Dec 28 19:49:25 2005
++++ builtins/Makefile.in	Wed Dec 28 19:50:01 2005
+@@ -178,7 +178,7 @@
  
  install-help:
  	@-if test -n "${HELPDIR}" && test -d helpfiles ; then \
 -		test -d ${HELPDIR} || ${SHELL} ${MKDIRS} $(DESTDIR)$(HELPDIR) ;\
 +		test -d ${DESTDIR}${HELPDIR} || ${SHELL} ${MKDIRS} $(DESTDIR)$(HELPDIR) ;\
- 		( cd helpfiles ; \
- 		  for f in *; do \
+ 		( for f in helpfiles/*; do \
  			echo installing $$f; \
+ 			${INSTALL_DATA} $$f $(DESTDIR)$(HELPDIR); \
diff --git a/shells/bash/files/patch-config-top.h b/shells/bash/files/patch-config-top.h
index 39c10151d5c4..415b137d33e9 100644
--- a/shells/bash/files/patch-config-top.h
+++ b/shells/bash/files/patch-config-top.h
@@ -1,5 +1,5 @@
---- config-top.h.orig	Tue Aug  5 16:36:12 2003
-+++ config-top.h	Mon Oct 11 16:55:40 2004
+--- config-top.h.orig	Wed Dec 28 19:52:23 2005
++++ config-top.h	Wed Dec 28 19:54:12 2005
 @@ -52,18 +52,18 @@
  /* The default value of the PATH variable. */
  #ifndef DEFAULT_PATH_VALUE
@@ -18,7 +18,7 @@
  
  /* Default primary and secondary prompt strings. */
 -#define PPROMPT "\\s-\\v\\$ "
-+#define PPROMPT "\\u@\\h\\$ "
++#define PPROMPT "[\\u@\\h \\w]\\$ "
  #define SPROMPT "> "
  
  /* Undefine this if you don't want the ksh-compatible behavior of reprinting
diff --git a/shells/bash/files/patch-configure b/shells/bash/files/patch-configure
deleted file mode 100644
index 3941f575db2a..000000000000
--- a/shells/bash/files/patch-configure
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Fix process substitution on FreeBSD systems without fdescfs
-#
-# http://lists.gnu.org/archive/html/bug-bash/2004-10/msg00089.html
-#
---- configure.orig	Fri Oct  8 12:46:28 2004
-+++ configure	Fri Oct  8 12:48:44 2004
-@@ -23803,7 +23803,14 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test -d /dev/fd  && test -r /dev/fd/0 < /dev/null; then
--   bash_cv_dev_fd=standard
-+# check for systems like FreeBSD 5 that only provide /dev/fd/[012]
-+   exec 3<&0
-+   if test -r /dev/fd/3; then
-+     bash_cv_dev_fd=standard
-+   else
-+     bash_cv_dev_fd=absent
-+   fi
-+   exec 3<&-
-  elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then
-    bash_cv_dev_fd=whacky
-  else
diff --git a/shells/bash/files/patch-doc::Makefile.in b/shells/bash/files/patch-doc::Makefile.in
index b14453a5e531..4bd0159a793e 100644
--- a/shells/bash/files/patch-doc::Makefile.in
+++ b/shells/bash/files/patch-doc::Makefile.in
@@ -1,5 +1,5 @@
---- doc/Makefile.in.orig	Tue Aug 31 00:34:30 2004
-+++ doc/Makefile.in	Tue Aug 31 00:36:03 2004
+--- doc/Makefile.in.orig	Wed Dec 28 20:00:02 2005
++++ doc/Makefile.in	Wed Dec 28 20:00:58 2005
 @@ -161,14 +161,11 @@
  bashref.dvi: $(BASHREF_FILES) $(HSUSER) $(RLUSER)
  	${SET_TEXINPUTS} $(TEXI2DVI) $(srcdir)/bashref.texi
diff --git a/shells/bash/files/patch-doc::bash.1 b/shells/bash/files/patch-doc::bash.1
index f02dfdc9fa36..7aad7f51aa2f 100644
--- a/shells/bash/files/patch-doc::bash.1
+++ b/shells/bash/files/patch-doc::bash.1
@@ -1,6 +1,6 @@
---- doc/bash.1.orig	Mon Oct 11 16:08:41 2004
-+++ doc/bash.1	Mon Oct 11 16:09:35 2004
-@@ -1843,7 +1843,7 @@
+--- doc/bash.1.orig	Wed Dec 28 19:44:28 2005
++++ doc/bash.1	Wed Dec 28 20:03:12 2005
+@@ -1897,7 +1897,7 @@
  .SM
  .B PROMPTING
  below) and used as the primary prompt string.  The default value is
@@ -9,7 +9,7 @@
  .TP
  .B PS2
  The value of this parameter is expanded as with
-@@ -8636,7 +8636,7 @@
+@@ -8784,7 +8784,7 @@
  .SH FILES
  .PD 0
  .TP
diff --git a/shells/bash/files/patch-doc::bashref.texi b/shells/bash/files/patch-doc::bashref.texi
index 555fbd522c66..add4d9b2944b 100644
--- a/shells/bash/files/patch-doc::bashref.texi
+++ b/shells/bash/files/patch-doc::bashref.texi
@@ -1,5 +1,5 @@
---- doc/bashref.texi.orig	Wed Sep  1 22:37:32 2004
-+++ doc/bashref.texi	Wed Sep  1 22:30:57 2004
+--- doc/bashref.texi.orig	Wed Dec 28 19:44:28 2005
++++ doc/bashref.texi	Wed Dec 28 20:09:16 2005
 @@ -1,6 +1,6 @@
  \input texinfo.tex @c -*- texinfo -*-
  @c %**start of header
@@ -17,12 +17,12 @@
  
  This is Edition @value{EDITION}, last updated @value{UPDATED},
  of @cite{The GNU Bash Reference Manual},
-@@ -4218,7 +4218,7 @@
+@@ -4277,7 +4277,7 @@
  
  
  @item PS1
 -The primary prompt string.  The default value is @samp{\s-\v\$ }.
-+The primary prompt string.  The default value is @samp{\u@@\h\$ }.
++The primary prompt string.  The default value is @samp{[\u@@\h \w]\$ }.
  @xref{Printing a Prompt}, for the complete list of escape
  sequences that are expanded before @env{PS1} is displayed.
  
diff --git a/shells/bash/files/patch-lib::readline::display.c b/shells/bash/files/patch-lib::readline::display.c
index 269f52ee03d7..53d0b4f4249a 100644
--- a/shells/bash/files/patch-lib::readline::display.c
+++ b/shells/bash/files/patch-lib::readline::display.c
@@ -4,9 +4,9 @@
 # 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	2004-11-18 16:24:46.000000000 +0000
-+++ lib/readline/display.c	2004-11-18 17:12:32.904903404 +0000
-@@ -572,11 +572,10 @@
+--- 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 @@
  
    /* inv_lbreaks[i] is where line i starts in the buffer. */
    inv_lbreaks[newlines = 0] = 0;
diff --git a/shells/bash/files/patch-support::mkversion.sh b/shells/bash/files/patch-support::mkversion.sh
index c7c4d609d230..0f8b460281cb 100644
--- a/shells/bash/files/patch-support::mkversion.sh
+++ b/shells/bash/files/patch-support::mkversion.sh
@@ -1,5 +1,5 @@
---- support/mkversion.sh.orig	Tue Oct 12 11:20:53 2004
-+++ support/mkversion.sh	Tue Oct 12 11:21:10 2004
+--- support/mkversion.sh.orig	Sat Sep 11 11:08:31 2004
++++ support/mkversion.sh	Wed Dec 28 20:15:34 2005
 @@ -67,7 +67,7 @@
  # increment the build version if that's what's required
  
diff --git a/shells/bash/files/xpatch-colonbreakswords b/shells/bash/files/xpatch-colonbreakswords
index c1cae42aaa09..cd565ca232dd 100644
--- a/shells/bash/files/xpatch-colonbreakswords
+++ b/shells/bash/files/xpatch-colonbreakswords
@@ -2,8 +2,8 @@
 # new shopt `colonbreakswords'
 # http://lists.gnu.org/archive/html/bug-bash/2004-10/msg00190.html
 #
---- bashline.c.orig	Wed Oct 13 18:39:13 2004
-+++ bashline.c	Wed Oct 13 19:02:53 2004
+--- bashline.c.orig	Sat Nov  5 18:07:02 2005
++++ bashline.c	Wed Dec 28 19:44:28 2005
 @@ -212,6 +212,11 @@
     host list. */
  int perform_hostname_completion = 1;
@@ -16,7 +16,7 @@
  /* If non-zero, we don't do command completion on an empty line. */
  int no_empty_command_completion;
  
-@@ -222,6 +227,7 @@
+@@ -222,7 +227,8 @@
  
  static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
  static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
@@ -25,7 +25,8 @@
 +/* ))) */
  
  static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
-@@ -323,6 +329,80 @@
+ 
+@@ -325,6 +331,80 @@
    return (old_value);
  }
  
@@ -106,7 +107,7 @@
  /* Called once from parse.y if we are going to use readline. */
  void
  initialize_readline ()
-@@ -479,8 +559,12 @@
+@@ -485,8 +565,12 @@
       completion is enabled. */
    enable_hostname_completion (perform_hostname_completion);
  
@@ -120,9 +121,9 @@
    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 Oct 13 19:07:57 2004
-+++ builtins/shopt.def	Wed Oct 13 19:10:37 2004
-@@ -82,6 +82,8 @@
+--- 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;
@@ -131,7 +132,7 @@
  extern int enable_hostname_completion __P((int));
  #endif
  
-@@ -120,6 +122,9 @@
+@@ -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 },
@@ -141,9 +142,9 @@
  #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 Oct 13 19:49:55 2004
-+++ doc/bash.1	Wed Oct 13 19:53:28 2004
-@@ -7866,6 +7866,18 @@
+--- 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 @@
  command in the same history entry.  This allows
  easy re-editing of multi-line commands.
  .TP 8
@@ -162,9 +163,9 @@
  .B dotglob
  If set, 
  .B bash
---- doc/bashref.texi.orig	Wed Oct 13 19:53:45 2004
-+++ doc/bashref.texi	Wed Oct 13 19:56:27 2004
-@@ -3577,6 +3577,11 @@
+--- 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 @@
  command in the same history entry.  This allows
  easy re-editing of multi-line commands.
  
diff --git a/shells/bash/files/xpatch-implicitcd b/shells/bash/files/xpatch-implicitcd
index bbd077cf6217..4d7efb6a00e1 100644
--- a/shells/bash/files/xpatch-implicitcd
+++ b/shells/bash/files/xpatch-implicitcd
@@ -2,8 +2,8 @@
 # new shopt `implicitcd'
 # http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00024.html
 #
---- execute_cmd.c.orig	Sun Jul  4 20:12:58 2004
-+++ execute_cmd.c	Wed Sep  1 22:28:29 2004
+--- execute_cmd.c.orig	Sat Nov  5 17:37:21 2005
++++ execute_cmd.c	Wed Dec 28 19:38:09 2005
 @@ -190,6 +190,9 @@
  /* The line number that the currently executing function starts on. */
  static int function_line_number;
@@ -14,7 +14,7 @@
  /* Set to 1 if fd 0 was the subject of redirection to a subshell.  Global
     so that reader_loop can set it to zero before executing a command. */
  int stdin_redir;
-@@ -2909,6 +2912,20 @@
+@@ -2913,6 +2916,20 @@
    this_command_name = words->word->word;
  
    QUIT;
@@ -35,11 +35,11 @@
  
    /* This command could be a shell builtin or a user-defined function.
       We have already found special builtins by this time, so we do not
---- builtins/shopt.def.orig	Wed Sep  1 22:32:59 2004
-+++ builtins/shopt.def	Wed Sep  1 22:31:27 2004
+--- builtins/shopt.def.orig	Sat Feb 19 19:25:03 2005
++++ builtins/shopt.def	Wed Dec 28 19:38:09 2005
 @@ -66,6 +66,7 @@
  extern int check_window_size;
- extern int glob_ignore_case;
+ extern int glob_ignore_case, match_ignore_case;
  extern int hup_on_exit;
 +extern int implicitcd;
  extern int xpg_echo;
@@ -53,7 +53,7 @@
    { "interactive_comments", &interactive_comments, set_shellopts_after_change },
  #if defined (HISTORY)
    { "lithist", &literal_history, (shopt_set_func_t *)NULL },
-@@ -252,6 +254,7 @@
+@@ -253,6 +255,7 @@
    cdable_vars = mail_warning = 0;
    no_exit_on_failed_exec = print_shift_error = 0;
    check_hashed_filenames = cdspelling = expand_aliases = check_window_size = 0;
@@ -61,9 +61,9 @@
  
    source_uses_path = promptvars = 1;
  
---- doc/bash.1.orig	Mon Jul 12 17:27:08 2004
-+++ doc/bash.1	Wed Sep  1 22:21:44 2004
-@@ -7970,6 +7970,15 @@
+--- doc/bash.1.orig	Wed Oct 12 12:40:52 2005
++++ doc/bash.1	Wed Dec 28 19:38:09 2005
+@@ -8090,6 +8090,15 @@
  .B SIGHUP
  to all jobs when an interactive login shell exits.
  .TP 8
@@ -79,13 +79,12 @@
  .B interactive_comments
  If set, allow a word beginning with
  .B #
---- doc/bashref.texi.orig	Wed Sep  1 22:37:32 2004
-+++ doc/bashref.texi	Wed Sep  1 22:30:57 2004
-@@ -3661,6 +3661,15 @@
- @item huponexit
+--- doc/bashref.texi.orig	Mon Oct  3 16:07:21 2005
++++ doc/bashref.texi	Wed Dec 28 19:38:09 2005
+@@ -3697,6 +3697,15 @@
  If set, Bash will send @code{SIGHUP} to all jobs when an interactive
  login shell exits (@pxref{Signals}).
-+
+ 
 +@item implicitcd
 +If this is set, a directory name typed as a command is treated as a
 +request to change to that directory.
@@ -94,6 +93,7 @@
 +Changing directory takes precedence over executing a like-named
 +command, but it is done after alias substitutions.
 +Tilde and variable expansions work as expected.
- 
++
  @item interactive_comments
  Allow a word beginning with @samp{#}
+ to cause that word and all remaining characters on that