From f79d5ccd7bcdc6325d67d9b0fbe32018699378f4 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 31 Dec 2022 10:49:28 +0100
Subject: [PATCH] zsh, enable 32bit (#7710)

---
 app-shells/zsh/zsh-5.8.1.recipe | 45 ++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/app-shells/zsh/zsh-5.8.1.recipe b/app-shells/zsh/zsh-5.8.1.recipe
index d3478bcdc..acf0c84a6 100644
--- a/app-shells/zsh/zsh-5.8.1.recipe
+++ b/app-shells/zsh/zsh-5.8.1.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="https://www.zsh.org/"
 COPYRIGHT="1992-2020 The Zsh Development Group"
 LICENSE="ZSH
 	GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://downloads.sf.net/zsh/zsh-$portVersion.tar.xz"
 CHECKSUM_SHA256="b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919"
 SOURCE_URI_2="https://downloads.sf.net/zsh/zsh-$portVersion-doc.tar.xz"
@@ -19,7 +19,15 @@ ADDITIONAL_FILES="
 	zshrc
 	"
 
-ARCHITECTURES="all ?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 GLOBAL_WRITABLE_FILES="
 	settings/zsh directory keep-old
@@ -39,35 +47,35 @@ USER_SETTINGS_FILES="
 	"
 
 PROVIDES="
-	zsh = $portVersion compat >= 5
-	cmd:zsh = $portVersion compat >= 5
-	cmd:zsh_$portVersion = $portVersion compat >= 5
+	zsh$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:zsh$commandSuffix = $portVersion compat >= 5
+	cmd:zsh_$portVersion$commandSuffix = $portVersion compat >= 5
 	"
 REQUIRES="
-	haiku
-	lib:libgdbm
-	lib:libiconv
-	lib:libncursesw
-	lib:libpcre
+	haiku$secondaryArchSuffix
+	lib:libgdbm$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libncursesw$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
 	"
 
 PROVIDES_doc="
-	zsh_doc = $portVersion
+	zsh${secondaryArchSuffix}_doc = $portVersion
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libgdbm
-	devel:libiconv
-	devel:libncursesw
-	devel:libpcre
+	haiku${secondaryArchSuffix}_devel
+	devel:libgdbm$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libncursesw$secondaryArchSuffix
+	devel:libpcre$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoreconf
 	cmd:awk
 	cmd:col
 	cmd:find
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:grep
 	cmd:make
 	cmd:man
@@ -89,7 +97,8 @@ BUILD()
 	autoupdate
 	autoreconf -vfi
 
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
 		--htmldir="$developDocDir/html" \
 		--enable-etcdir="$sysconfDir/zsh" \
 		--enable-zshenv="$sysconfDir/zsh/zshenv" \