From 18e404972020de2b71a98f298ebe6b57407d3c95 Mon Sep 17 00:00:00 2001
From: augiedoggie <augiedoggie@users.noreply.github.com>
Date: Fri, 28 Jan 2022 22:33:26 -0700
Subject: [PATCH] ninja: fix build and add zsh subpackage (#6581)

---
 dev-util/ninja/ninja-1.10.2.recipe | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/dev-util/ninja/ninja-1.10.2.recipe b/dev-util/ninja/ninja-1.10.2.recipe
index 8638da6c0..cc80b5538 100644
--- a/dev-util/ninja/ninja-1.10.2.recipe
+++ b/dev-util/ninja/ninja-1.10.2.recipe
@@ -9,7 +9,7 @@ it can build LLVM, KDE, Blender, etc."
 HOMEPAGE="https://ninja-build.org/"
 COPYRIGHT="2012-2019 Google Inc."
 LICENSE="Apache v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://github.com/ninja-build/ninja/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed"
 PATCHES="ninja-$portVersion.patchset"
@@ -29,7 +29,7 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= r1~alpha4_pm_hrev51418-1
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	cmd:as$secondaryArchSuffix
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
@@ -37,15 +37,30 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
+PROVIDES_zsh="
+	ninja_zsh$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_zsh="
+	ninja$secondaryArchSuffix == $portVersion base
+	zsh >= 5.0
+	"
+
 BUILD()
 {
-	cmake -Bbuild $cmakeDirArgs .
-	cmake --build build $jobArgs
+	cmake -DCMAKE_BUILD_TYPE="Release" -Bbuild $cmakeDirArgs .
+	cd build
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cmake --install build
+	cd build
+	make install
+
+	# build our zsh completion package
+	mkdir -p $dataDir/zsh/site-functions
+	cp -af $sourceDir/misc/zsh-completion $dataDir/zsh/site-functions/_ninja
+	packageEntries zsh $dataDir
 }
 
 TEST()