ZSH: bump (#3278)

app-shells/zsh/patches/zsh-5.6.2.patchset

@@ -1,4 +1,4 @@
-From 48856051b2d420e2201161451de0fda8fbe640e7 Mon Sep 17 00:00:00 2001
+From f518920889121f807c33f134222e61159d677472 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Wed, 18 Sep 2013 03:11:28 -0600
 Subject: Fix for gcc2
@@ -58,7 +58,7 @@ index 581ca49..ebe5a1b 100644
  		int oldsize = sibuf;
  		sibuf += (pastelen >= sibuf) ? pastelen + 1 : sibuf;
 diff --git a/Src/Zle/zle_vi.c b/Src/Zle/zle_vi.c
-index e0923db..ec66f6a 100644
+index a5ff920..14a885b 100644
 --- a/Src/Zle/zle_vi.c
 +++ b/Src/Zle/zle_vi.c
 @@ -183,11 +183,12 @@ getvirange(int wf)
@@ -76,10 +76,10 @@ index e0923db..ec66f6a 100644
  	    selectlocalmap(km);
  	/* Now we need to execute the movement command, to see where it *
 diff --git a/Src/params.c b/Src/params.c
-index 36f5f06..c7d04db 100644
+index a1c299f..fc06708 100644
 --- a/Src/params.c
 +++ b/Src/params.c
-@@ -5021,7 +5021,7 @@ arrfixenv(char *s, char **t)
+@@ -5037,7 +5037,7 @@ arrfixenv(char *s, char **t)
  int
  zputenv(char *str)
  {
@@ -89,10 +89,10 @@ index 36f5f06..c7d04db 100644
      /*
       * If we are using unsetenv() to remove values from the
 diff --git a/configure.ac b/configure.ac
-index d15a6cd..5b8aec5 100644
+index 5513e25..a58ccad 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -874,7 +874,7 @@ if test x$enable_cap = xyes; then
+@@ -850,7 +850,7 @@ if test x$enable_cap = xyes; then
    AC_CHECK_LIB(cap, cap_get_proc)
  fi
  
@@ -102,17 +102,17 @@ index d15a6cd..5b8aec5 100644
  
  case $LIBS in
 -- 
-2.17.0
+2.19.1
 
 
-From ae08f42563fc3b3e4831da9de566e0f496544aba Mon Sep 17 00:00:00 2001
+From 40d50af747f6f90261c9ba5c1e773b6e2f703dff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Wed, 11 Jan 2017 18:17:20 +0100
 Subject: Haiku rusage fix
 
 
 diff --git a/Src/jobs.c b/Src/jobs.c
-index 330ee6b..aa2d314 100644
+index db2e87e..d42f3de 100644
 --- a/Src/jobs.c
 +++ b/Src/jobs.c
 @@ -977,7 +977,7 @@ should_report_time(Job j)
@@ -125,20 +125,20 @@ index 330ee6b..aa2d314 100644
  	j->procs->ti.ru_maxrss / 1024 > reportmemory)
  	return 1;
 -- 
-2.17.0
+2.19.1
 
 
-From b02514e4def8ad607e2d19d36a013dadb285430d Mon Sep 17 00:00:00 2001
+From c06b45685bb56dbee9c8eea1e897f202d08f4fa0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Thu, 17 Aug 2017 16:16:21 +0200
 Subject: Enable dynamic modules on Haiku
 
 
 diff --git a/configure.ac b/configure.ac
-index 5b8aec5..395c7bb 100644
+index a58ccad..31cca13 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -868,6 +868,7 @@ fi
+@@ -844,6 +844,7 @@ fi
  
  if test "x$dynamic" = xyes; then
    AC_CHECK_LIB(dl, dlopen)
@@ -146,7 +146,7 @@ index 5b8aec5..395c7bb 100644
  fi
  
  if test x$enable_cap = xyes; then
-@@ -2902,7 +2903,8 @@ char *argv[];
+@@ -2815,7 +2816,8 @@ char *argv[];
      aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
      solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
      darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
@@ -157,20 +157,20 @@ index 5b8aec5..395c7bb 100644
        if test x$zsh_cv_sys_elf = xyes; then
  	DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
 -- 
-2.17.0
+2.19.1
 
 
-From 4f73ea2426a76e4e8d07c91cf8cc4f4a967ef815 Mon Sep 17 00:00:00 2001
+From 32ad1f3dddb638431f825e6ca3256c3370501989 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Sat, 14 Apr 2018 18:11:49 +0000
 Subject: C89 fixes for gcc2 compatibility
 
 
 diff --git a/Src/exec.c b/Src/exec.c
-index 216057a..9149489 100644
+index b9af9ea..6948e07 100644
 --- a/Src/exec.c
 +++ b/Src/exec.c
-@@ -3034,10 +3034,11 @@ execcmd_exec(Estate state, Execcmd_params eparams,
+@@ -3121,10 +3121,11 @@ execcmd_exec(Estate state, Execcmd_params eparams,
  		}
  		if (exec_argv0) {
  		    char *str, *s;
@@ -184,10 +184,10 @@ index 216057a..9149489 100644
  		    strcpy(s, "ARGV0=");
  		    s+=6;
 diff --git a/Src/init.c b/Src/init.c
-index c537266..1686a3c 100644
+index e9e6be9..233a856 100644
 --- a/Src/init.c
 +++ b/Src/init.c
-@@ -1275,8 +1275,9 @@ run_init_scripts(void)
+@@ -1276,8 +1276,9 @@ run_init_scripts(void)
  		sourcehome(".profile");
  
  	    if (interact) {
@@ -199,7 +199,7 @@ index c537266..1686a3c 100644
  		    s = dupstring(s);
  		    if (!parsestr(&s)) {
 diff --git a/Src/parse.c b/Src/parse.c
-index 47e5a24..38890e5 100644
+index 83383f1..8e783be 100644
 --- a/Src/parse.c
 +++ b/Src/parse.c
 @@ -403,8 +403,9 @@ ecstrcode(char *s)
@@ -214,7 +214,7 @@ index 47e5a24..38890e5 100644
  	case 4: c |= ((wordcode) STOUC(s[2])) << 19;
  	case 3: c |= ((wordcode) STOUC(s[1])) << 11;
 diff --git a/Src/utils.c b/Src/utils.c
-index b418517..d026e02 100644
+index 075d272..6aca3dc 100644
 --- a/Src/utils.c
 +++ b/Src/utils.c
 @@ -138,10 +138,11 @@ set_widearray(char *mb_array, Widechar_array wca)
@@ -230,7 +230,7 @@ index b418517..d026e02 100644
  
      if (cmd) {
  	if (unset(SHINSTDIN) || locallevel) {
-@@ -2765,6 +2766,7 @@ int
+@@ -2802,6 +2803,7 @@ int
  checkrmall(char *s)
  {
      DIR *rmd;
@@ -238,7 +238,7 @@ index b418517..d026e02 100644
      int count = 0;
      if (!shout)
  	return 1;
-@@ -2774,7 +2776,6 @@ checkrmall(char *s)
+@@ -2811,7 +2813,6 @@ checkrmall(char *s)
  	else
  	    s = dyncat("/", s);
      }
@@ -247,5 +247,32 @@ index b418517..d026e02 100644
  	int ignoredots = !isset(GLOBDOTS);
  	char *fname;
 -- 
-2.17.0
+2.19.1
+
+
+From 020542256d5a9120e3d020c20b30065d168ec455 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sat, 27 Oct 2018 10:36:50 +0200
+Subject: Some other function resides in libroot
+
+
+diff --git a/configure.ac b/configure.ac
+index 31cca13..c20c2a1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -746,10 +746,12 @@ dnl and might not be compiled into the zsh executable.
+ dnl On ReliantUNIX -lc better be the last library, else funny things
+ dnl may happen.
+ AC_CHECK_LIB(c, printf, [LIBS="$LIBS -lc"])
++AC_CHECK_LIB(root, printf)
+ 
+ AC_CHECK_LIB(m, pow)
+ 
+ AC_CHECK_LIB(rt, clock_gettime)
++AC_CHECK_LIB(root, clock_gettime)
+ 
+ dnl Various features of ncurses depend on having the right header
+ dnl (the system's own curses.h may well not be good enough).
+-- 
+2.19.1
 

app-shells/zsh/zsh-5.6.2.recipe

@@ -7,11 +7,11 @@ HOMEPAGE="https://www.zsh.org/"
 COPYRIGHT="1992-2018 The Zsh Development Group"
 LICENSE="ZSH
 	GNU GPL v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz"
-CHECKSUM_SHA256="e1c38808fcbe0cc1344d55c9a758349f7ba1e317325b154621ac37eddac4aa80"
+CHECKSUM_SHA256="a50bd66c0557e8eca3b8fa24e85d0de533e775d7a22df042da90488623752e9e"
 SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz"
-CHECKSUM_SHA256_2="41ce13a89a6bc7e709b6f110e54288d59f02ba2becd2646895d28188d4dd6283"
+CHECKSUM_SHA256_2="98973267547cbdd8471b52e3a2bbe415be2c2c473246536ed8914f685e260114"
 PATCHES="zsh-$portVersion.patchset"
 ADDITIONAL_FILES="
 	zprofile
@@ -44,6 +44,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
+	lib:libgdbm
 	lib:libiconv
 	lib:libncursesw
 	lib:libpcre
@@ -55,6 +56,7 @@ PROVIDES_doc="
 
 BUILD_REQUIRES="
 	haiku_devel
+	devel:libgdbm
 	devel:libiconv
 	devel:libncursesw
 	devel:libpcre
@@ -66,7 +68,13 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:grep
 	cmd:make
+	cmd:man
+	cmd:nroff
 	cmd:sed
+	cmd:texi2any
+	cmd:texi2dvi
+	cmd:texi2html
+	cmd:texi2pdf
 	"
 
 BUILD()