From 68791e400b82a4a021cb99b01fc50799166daea9 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Wed, 16 Nov 2016 08:45:16 +0000
Subject: [PATCH] bash: bump to 4.4.005, simplify patch and rename it to
 patchset.

---
 .../{bash-4.4.recipe => bash-4.4.005.recipe}  | 32 +++++++++++++------
 .../{bash-4.4.patch => bash-4.4.patchset}     |  7 ++--
 2 files changed, 25 insertions(+), 14 deletions(-)
 rename app-shells/bash/{bash-4.4.recipe => bash-4.4.005.recipe} (62%)
 rename app-shells/bash/patches/{bash-4.4.patch => bash-4.4.patchset} (75%)

diff --git a/app-shells/bash/bash-4.4.recipe b/app-shells/bash/bash-4.4.005.recipe
similarity index 62%
rename from app-shells/bash/bash-4.4.recipe
rename to app-shells/bash/bash-4.4.005.recipe
index 36609daf97..aaa2b57e24 100644
--- a/app-shells/bash/bash-4.4.recipe
+++ b/app-shells/bash/bash-4.4.005.recipe
@@ -2,18 +2,27 @@ SUMMARY="The GNU Bourne Again Shell"
 DESCRIPTION="Bash is an sh-compatible command language interpreter that \
 executes commands read from the standard input or from a file. Bash also \
 incorporates useful features from the Korn and C shells (ksh and csh)."
-HOMEPAGE="http://www.gnu.org/software/bash/"
-SOURCE_URI="https://ftp.gnu.org/gnu/bash/bash-$portVersion.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/bash/"
+COPYRIGHT="1987-2016 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz"
 CHECKSUM_SHA256="d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb"
+for i in {001..005}; do
+	eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-$i#noarchive\""
+done
+CHECKSUM_SHA256_001="3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f"
+CHECKSUM_SHA256_002="7020a0183e17a7233e665b979c78c184ea369cfaf3e8b4b11f5547ecb7c13c53"
+CHECKSUM_SHA256_003="51df5a9192fdefe0ddca4bdf290932f74be03ffd0503a3d112e4199905e718b2"
+CHECKSUM_SHA256_004="ad080a30a4ac6c1273373617f29628cc320a35c8cd06913894794293dc52c8b3"
+CHECKSUM_SHA256_005="221e4b725b770ad0bb6924df3f8d04f89eeca4558f6e4c777dfa93e967090529"
 
+SOURCE_DIR="bash-4.4"
 PATCHES="
 	bash-kill_by_name.patch
-	bash-$portVersion.patch
+	bash-4.4.patchset
 	"
-SOURCE_DIR="bash-$portVersion"
-REVISION="1"
-LICENSE="GNU GPL v3"
-COPYRIGHT="1987-2016 Free Software Foundation, Inc."
+
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
@@ -22,10 +31,9 @@ PROVIDES="
 	cmd:bashbug = $portVersion
 	cmd:sh
 	"
-
 REQUIRES="
 	haiku
-	lib:libreadline
+	lib:libreadline >= 7
 	lib:libncursesw
 	lib:libintl
 	lib:libiconv
@@ -33,7 +41,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku_devel
-	devel:libreadline
+	devel:libreadline >= 7
 	devel:libncursesw
 	devel:libintl
 	"
@@ -52,6 +60,10 @@ GLOBAL_WRITABLE_FILES="settings/bashrc keep-old"
 
 PATCH()
 {
+	for i in {001..005}; do
+		echo "Applying patch $i..."
+		sed -e "s/\.\.\/bash-4.4\///" ../../sources-$i/bash44-$i | patch -p0
+	done
 	# store bash settings under ~/config/settings
 	find -type f | xargs sed -i -e 's,~/\.,~/config/settings/,g'
 }
diff --git a/app-shells/bash/patches/bash-4.4.patch b/app-shells/bash/patches/bash-4.4.patchset
similarity index 75%
rename from app-shells/bash/patches/bash-4.4.patch
rename to app-shells/bash/patches/bash-4.4.patchset
index e082946f1d..3a767b9a2d 100644
--- a/app-shells/bash/patches/bash-4.4.patch
+++ b/app-shells/bash/patches/bash-4.4.patchset
@@ -8,19 +8,18 @@ Subject: [PATCH 1/1] fix gcc2 build
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/shell.c b/shell.c
-index 84f752b..4021475 100644
+index 45b77f9..4034599 100644
 --- a/shell.c
 +++ b/shell.c
-@@ -584,8 +584,8 @@ main (argc, argv, env)
+@@ -584,7 +584,7 @@ main (argc, argv, env)
     */
    if (interactive_shell)
      {
 -      char *term, *emacs, *inside_emacs;;
++      char *term, *emacs, *inside_emacs;
        int emacs_term, in_emacs;
-+      char *term, *emacs, *inside_emacs;;
  
        term = get_string_value ("TERM");
-       emacs = get_string_value ("EMACS");
 -- 
 2.7.0