From 9fa9ab06099ce3d3ee852eb77ba58b0b93cfeee8 Mon Sep 17 00:00:00 2001
From: hgy59 <hpgy59@gmail.com>
Date: Fri, 1 Mar 2024 10:11:29 +0100
Subject: [PATCH] zsh: include pcre and cap libraries (#6021)

* zsh: include pcre and cap libraries (#6014)
* remove libcap dependency for unsupported archs
---
 cross/zsh/Makefile      | 13 +++++++++++--
 spk/zsh-static/Makefile |  2 +-
 spk/zsh/Makefile        |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/cross/zsh/Makefile b/cross/zsh/Makefile
index 897a4551e59..fc5404bc4dd 100644
--- a/cross/zsh/Makefile
+++ b/cross/zsh/Makefile
@@ -5,14 +5,23 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.zsh.org/pub
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-DEPENDS = cross/ncursesw cross/gdbm
+DEPENDS = cross/ncursesw cross/gdbm cross/pcre
+OPTIONAL_DEPENDS = cross/libcap
 
 HOMEPAGE = https://www.zsh.org/
 COMMENT  = Zsh is a shell designed for interactive use, although it is also a powerful scripting language.
 LICENSE  = Custom
 
 GNU_CONFIGURE = 1
-CONFIGURE_ARGS = --enable-gdbm
+CONFIGURE_ARGS  = --enable-gdbm
+CONFIGURE_ARGS += --enable-pcre
+
+include ../../mk/spksrc.archs.mk
+
+ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS) $(ARMv5_ARCHS)),$(ARCH))
+DEPENDS += cross/libcap
+CONFIGURE_ARGS += --enable-cap
+endif
 
 PRE_COMPILE_TARGET = zsh_pre_compile
 
diff --git a/spk/zsh-static/Makefile b/spk/zsh-static/Makefile
index 5d8b746f4bf..f263fc8ed10 100644
--- a/spk/zsh-static/Makefile
+++ b/spk/zsh-static/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = zsh-static
 SPK_CONFLICT = zsh
-SPK_REV = 9
+SPK_REV = 10
 
 export ZSH_STATIC_MODULES=true
 
diff --git a/spk/zsh/Makefile b/spk/zsh/Makefile
index 1174f148fdf..e66f4dc9bac 100644
--- a/spk/zsh/Makefile
+++ b/spk/zsh/Makefile
@@ -4,7 +4,7 @@ SPK_VERS = 5.9
 SPK_CONFLICT ?= zsh-static
 # Allow overriding the revision, used by spk/zsh-static.
 # If you rev here, please also rev spk/zsh-static.
-SPK_REV ?= 13
+SPK_REV ?= 14
 SPK_ICON = ../zsh/src/zsh.png
 
 DEPENDS = cross/zsh
@@ -16,7 +16,7 @@ DESCRIPTION_GER = Die Z shell \(zsh\) ist eine Unix-Shell, die sowohl als intera
 DESCRIPTION_ITA = La Z shell \(zsh\) è una shell che può essere utilizzata come linea di comando interattiva e come un potente interprete per script di shell. Zsh può essere vista come un\'estensione della Bourne shell dotata di numerose migliorie, fra le quali alcune caratteristiche mutuate da bash, ksh e tcsh.
 DISPLAY_NAME = Z shell
 STARTABLE = no
-CHANGELOG = "Update to v5.9. For incompatiblities with former version please read the <a target=\"_blank\" href=\"https://zsh.sourceforge.io/releases.html\">release notes</a>."
+CHANGELOG = "1. Update to v5.9. For incompatiblities with former version please read the <a target=\"_blank\" href=\"https://zsh.sourceforge.io/releases.html\">release notes</a>.<br/>2. Include pcre library.<br/>3. Include cap (linux capabilities) library for supported archs."
 
 HOMEPAGE = https://www.zsh.org
 LICENSE = Custom