From 5a036e5d2923af07790c08c2d066781d4a37a8c7 Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Fri, 12 Dec 2014 19:23:36 +0200
Subject: [PATCH 1/4] Fixed the recipe for apr_x86-1.5.0

---
 dev-libs/apr/apr-1.5.0.recipe | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe
index 33f922f0b..b0a6c1112 100644
--- a/dev-libs/apr/apr-1.5.0.recipe
+++ b/dev-libs/apr/apr-1.5.0.recipe
@@ -6,23 +6,27 @@ COPYRIGHT="2012 The Apache Software Foundation."
 LICENSE="Apache v2"
 REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PATCHES="apr-1.5.0.patch"
 
 PROVIDES="
-	apr = $portVersion compat >= 1
-	lib:libapr_1 = 0.5.0 compat >= 0
+	apr$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0
+	cmd:apr_1_config$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku >= $haikuVersion
+	lib:libnetwork$secondaryArchSuffix >= $haikuVersion
+	lib:libroot$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:ld
 	cmd:libtoolize
 	cmd:make
@@ -109,3 +113,4 @@ PROVIDES_devel="
 REQUIRES_devel="
 	apr == $portVersion base
 	"
+

From 781dfed6b51d9f2e3dc36c6084ca06b4e244e9e0 Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Fri, 12 Dec 2014 19:30:26 +0200
Subject: [PATCH 2/4] Fixed the recipe for apr_x86-1.5.0

---
 dev-libs/apr/apr-1.5.0.recipe | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe
index b0a6c1112..f70fae35b 100644
--- a/dev-libs/apr/apr-1.5.0.recipe
+++ b/dev-libs/apr/apr-1.5.0.recipe
@@ -13,7 +13,6 @@ PATCHES="apr-1.5.0.patch"
 PROVIDES="
 	apr$secondaryArchSuffix = $portVersion compat >= 1
 	lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0
-	cmd:apr_1_config$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku >= $haikuVersion
@@ -106,11 +105,11 @@ following:
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	apr_devel = portVersion compat >= 1
-	cmd:apr_1_config = portVersion compat >= 1
-	devel:libapr_1 = 0.5.0 compat >= 0
+	apr_devel$secondaryArchSuffix = portVersion compat >= 1
+	cmd:apr_1_config$secondaryArchSuffix = portVersion compat >= 1
+	devel:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0
 	"
 REQUIRES_devel="
-	apr == $portVersion base
+	apr$secondaryArchSuffix == $portVersion base
 	"
 

From fb18f921871fd8adc1dfa9aa808b97454cdb5b2e Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Fri, 12 Dec 2014 22:24:57 +0200
Subject: [PATCH 3/4] Fixed revision at apr-1.5.0.recipe

---
 dev-libs/apr/apr-1.5.0.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe
index f70fae35b..72cace833 100644
--- a/dev-libs/apr/apr-1.5.0.recipe
+++ b/dev-libs/apr/apr-1.5.0.recipe
@@ -4,7 +4,7 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-1.5.0.tar.gz"
 CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7"
 COPYRIGHT="2012 The Apache Software Foundation."
 LICENSE="Apache v2"
-REVISION="2"
+REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 

From 241ab26fd972518776cdd803499766a42c9c64c4 Mon Sep 17 00:00:00 2001
From: Nav <nav@unlicrea.com>
Date: Fri, 12 Dec 2014 23:12:11 +0200
Subject: [PATCH 4/4] Updated recipe

---
 dev-libs/apr/apr-1.5.0.recipe | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-libs/apr/apr-1.5.0.recipe b/dev-libs/apr/apr-1.5.0.recipe
index 72cace833..4c42f26ff 100644
--- a/dev-libs/apr/apr-1.5.0.recipe
+++ b/dev-libs/apr/apr-1.5.0.recipe
@@ -4,7 +4,7 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-1.5.0.tar.gz"
 CHECKSUM_SHA256="9879f02054cb22e99f605f6fdbf47f4c028af4cd4f351cf64186a7ee447f35d7"
 COPYRIGHT="2012 The Apache Software Foundation."
 LICENSE="Apache v2"
-REVISION="1"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
@@ -15,9 +15,7 @@ PROVIDES="
 	lib:libapr_1$secondaryArchSuffix = 0.5.0 compat >= 0
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libnetwork$secondaryArchSuffix >= $haikuVersion
-	lib:libroot$secondaryArchSuffix
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"