From 1f9fbfceba1dadcf65273a32f7c19497b4387547 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 23 Jan 2021 08:03:55 +0100
Subject: [PATCH] grep, revbump for rebuild with pcre (#5620)

---
 sys-apps/grep/grep-2.14.recipe |  2 +-
 sys-apps/grep/grep-2.22.recipe |  2 +-
 sys-apps/grep/grep-2.24.recipe |  2 +-
 sys-apps/grep/grep-3.6.recipe  | 57 ++++++++++++++++++++++------------
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/sys-apps/grep/grep-2.14.recipe b/sys-apps/grep/grep-2.14.recipe
index b7c596ff5..602b8f4c3 100644
--- a/sys-apps/grep/grep-2.14.recipe
+++ b/sys-apps/grep/grep-2.14.recipe
@@ -11,7 +11,7 @@ SOURCE_URI="http://ports-space.haiku-files.org/source/grep-2.14.tar.bz2"
 CHECKSUM_SHA256="0aa728dbb92eeec776f9551fcee1931717984a91cfd8c3df3dfb40709243ae6f"
 PATCHES="grep-2.14-gcc2.patch"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+ARCHITECTURES="?x86_gcc2 x86_64 arm"
 
 PROVIDES="
 	grep = $portVersion compat >= 2
diff --git a/sys-apps/grep/grep-2.22.recipe b/sys-apps/grep/grep-2.22.recipe
index 43cebd52e..0cd620983 100644
--- a/sys-apps/grep/grep-2.22.recipe
+++ b/sys-apps/grep/grep-2.22.recipe
@@ -11,7 +11,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/grep/grep-$portVersion.tar.xz"
 CHECKSUM_SHA256="ca91d22f017bfcb503d4bc3b44295491c89a33a3df0c3d8b8614f2d3831836eb"
 PATCHES="grep-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+ARCHITECTURES="?x86_gcc2 x86_64 arm"
 
 PROVIDES="
 	grep = $portVersion compat >= 2
diff --git a/sys-apps/grep/grep-2.24.recipe b/sys-apps/grep/grep-2.24.recipe
index 0984b84d7..558c856d7 100644
--- a/sys-apps/grep/grep-2.24.recipe
+++ b/sys-apps/grep/grep-2.24.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/grep/grep-$portVersion.tar.xz"
 CHECKSUM_SHA256="f248beb9098c5aab94d2fdd03b5a21d705e5ba8a3ce4d8c9f607a670498eec14"
 PATCHES="grep-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
+ARCHITECTURES="?x86_gcc2 x86_64 arm"
 
 PROVIDES="
 	grep = $portVersion compat >= 2
diff --git a/sys-apps/grep/grep-3.6.recipe b/sys-apps/grep/grep-3.6.recipe
index 28ac1d344..60de26ef7 100644
--- a/sys-apps/grep/grep-3.6.recipe
+++ b/sys-apps/grep/grep-3.6.recipe
@@ -5,50 +5,67 @@ matching lines."
 HOMEPAGE="https://www.gnu.org/software/grep/"
 COPYRIGHT="1992-2016 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://ftp.gnu.org/gnu/grep/grep-$portVersion.tar.xz"
 CHECKSUM_SHA256="667e15e8afe189e93f9f21a7cd3a7b3f776202f417330b248c2ad4f997d9373e"
 PATCHES="grep-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64 ?arm"
+ARCHITECTURES="!x86_gcc2 x86_64 ?arm"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
-	grep = $portVersion compat >= 3
-	cmd:egrep = $portVersion compat >= 2
-	cmd:fgrep = $portVersion compat >= 2
-	cmd:grep = $portVersion compat >= 2
+	grep$secondaryArchSuffix = $portVersion compat >= 3
+	cmd:egrep$commandSuffix = $portVersion compat >= 2
+	cmd:fgrep$commandSuffix = $portVersion compat >= 2
+	cmd:grep$commandSuffix = $portVersion compat >= 2
 	"
 REQUIRES="
-	haiku
-	lib:libiconv
-	lib:libintl
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libpcre$secondaryArchSuffix
 	"
 
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	REPLACES="
+		grep
+		"
+fi
+
 BUILD_REQUIRES="
-	devel:libiconv
-	devel:libintl
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libpcre$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:gcc
-	cmd:gettext
-	cmd:ld
-	cmd:libtoolize
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:makeinfo
+	cmd:pkg_config$secondaryArchSuffix
 	"
 
-defineDebugInfoPackage grep \
-	$binDir/grep
+defineDebugInfoPackage grep$secondaryArchSuffix \
+	$commandBinDir/grep
 
 BUILD()
 {
 	autoreconf -f -I m4
-	runConfigure ./configure \
-		--disable-perl-regexp --disable-gcc-warnings
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir \
+		--without-included-regex --disable-gcc-warnings
 	make $jobArgs
 }