From 7f99c58c703e954d2f8070cd2832d7b93d4aedc7 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 2 Oct 2021 11:12:13 +0200
Subject: [PATCH] fribidi, bump version (#6223)

---
 ...di-1.0.10.recipe => fribidi-1.0.11.recipe} | 34 +++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)
 rename dev-libs/fribidi/{fribidi-1.0.10.recipe => fribidi-1.0.11.recipe} (72%)

diff --git a/dev-libs/fribidi/fribidi-1.0.10.recipe b/dev-libs/fribidi/fribidi-1.0.11.recipe
similarity index 72%
rename from dev-libs/fribidi/fribidi-1.0.10.recipe
rename to dev-libs/fribidi/fribidi-1.0.11.recipe
index 780d98ef3..c8c34f618 100644
--- a/dev-libs/fribidi/fribidi-1.0.10.recipe
+++ b/dev-libs/fribidi/fribidi-1.0.11.recipe
@@ -12,17 +12,23 @@ COPYRIGHT="2004 Sharif FarsiWeb, Inc
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://github.com/fribidi/fribidi/releases/download/v$portVersion/fribidi-$portVersion.tar.xz"
-CHECKSUM_SHA256="7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01"
+CHECKSUM_SHA256="30f93e9c63ee627d1a2cedcf59ac34d45bf30240982f99e44c6e015466b4e73d"
 
 ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 libVersion="0.4.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	fribidi$secondaryArchSuffix = $portVersion
-	cmd:fribidi$secondaryArchSuffix = $portVersion
 	lib:libfribidi$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -37,6 +43,17 @@ REQUIRES_devel="
 	fribidi$secondaryArchSuffix == $portVersion base
 	"
 
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES_tools="
+		fribidi${secondaryArchSuffix}_tools = $portVersion
+		cmd:fribidi$commandSuffix = $portVersion
+		"
+	REQUIRES_tools="
+		fribidi$secondaryArchSuffix == $portVersion base
+		haiku$secondaryArchSuffix
+		"
+fi
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -60,7 +77,8 @@ defineDebugInfoPackage fribidi$secondaryArchSuffix \
 BUILD()
 {
 	autoreconf -vfi
-	runConfigure ./configure
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir
 	make $jobArgs
 }
 
@@ -70,6 +88,11 @@ INSTALL()
 
 	rm $libDir/libfribidi.la
 
+		# remove command for secondary architecture
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf "$commandBinDir"
+	fi
+
 	prepareInstalledDevelLibs libfribidi
 	fixPkgconfig
 
@@ -84,6 +107,11 @@ INSTALL()
 	packageEntries devel \
 		"$developDir" \
 		${maybe_manDir:+"$maybe_manDir"}
+
+	if [ -z "$secondaryArchSuffix" ]; then
+		packageEntries tools \
+			"$commandBinDir"
+	fi
 }
 
 TEST()