From f32286b373d123109560b012ebbea8e5c2c52e36 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 21 Dec 2013 15:52:44 -0800
Subject: [PATCH] Fixed fribidi on x86

---
 dev-libs/fribidi/fribidi-0.19.5.recipe | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/dev-libs/fribidi/fribidi-0.19.5.recipe b/dev-libs/fribidi/fribidi-0.19.5.recipe
index 2e66680e7..350489585 100644
--- a/dev-libs/fribidi/fribidi-0.19.5.recipe
+++ b/dev-libs/fribidi/fribidi-0.19.5.recipe
@@ -11,19 +11,23 @@ COPYRIGHT="2004 Sharif FarsiWeb, Inc
 	1999,2000 Dov Grobgeld"
 
 ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	fribidi = $portVersion
-	cmd:fribidi = 0.19.5 compat >= 0.19
-	lib:libfribidi = 0.3.4 compat >= 0
+	fribidi$secondaryArchSuffix = $portVersion
+	cmd:fribidi$secondaryArchSuffix = 0.19.5 compat >= 0.19
+	lib:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0
 	"
+
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+
 BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
@@ -32,13 +36,14 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:make
 	"
+
 PATCH()
 {
 	sed -i 's/PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION/#/' configure.ac
 	sed -i 's/FRIBIDI_USE_GLIB=1/FRIBIDI_USE_GLIB=0/' configure.ac
 	sed -i 's/FRIBIDI_USE_GLIB=0)/#/' configure.ac
-
 }
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -70,10 +75,11 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	fribidi_devel = $portVersion
-	devel:libfribidi = 0.3.4 compat >= 0
-	devel:fribidi = 0.19.5 compat >= 0.19
+	fribidi${secondaryArchSuffix}_devel = $portVersion
+	devel:libfribidi$secondaryArchSuffix = 0.3.4 compat >= 0
+	devel:fribidi$secondaryArchSuffix = 0.19.5 compat >= 0.19
 	"
+
 REQUIRES_devel="
-	fribidi == $portVersion base
+	fribidi$secondaryArchSuffix == $portVersion base
 	"