From e7de333bb512ac6af8081d7c70e84972fbe917ba Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Wed, 4 Dec 2013 21:02:07 +0100
Subject: [PATCH 01/19] Add MinimizeAll recipe

---
 .../minimizeall/minimizeall-1.0.0.recipe      | 71 +++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 haiku-apps/minimizeall/minimizeall-1.0.0.recipe

diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
new file mode 100644
index 000000000..58bb1f9d8
--- /dev/null
+++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
@@ -0,0 +1,71 @@
+SUMMARY="Minimize all your apps with the press of a button!"
+DESCRIPTION="
+	MinimizeAll is a small app that minimizes all your apps with
+	the press of a button on the Deskbar, or with a keypress.
+	The app contains two parts: A standalone app that minimizes the whole app,
+	and a replicant for your Deskbar. Both do the same: Minimize all your apps!
+	"
+
+HOMEPAGE="https://github.com/HaikuArchives/MinimizeAll/"
+SRC_URI="git://github.com/HaikuArchives/MinimizeAll.git#12fefdf26131375f695693a680bf01edb35d57a9"
+
+REVISION="1"
+
+COPYRIGHT="
+	2001-2008 Werner Freytag
+	2009 Haiku
+	"
+
+LICENSE="MIT"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+
+PROVIDES="
+	MinimizeAll = $portVersion
+	app:MinimizeAll = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:xres
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD()
+{
+	cd trunk
+	mkdir bin || true
+
+	# Step 1 - Building the app
+	cd app
+	gcc -o ../bin/MinimizeAll -lbe main.cpp ../minimize.cpp
+	rc -o ../bin/MinimizeAll.rsrc Application.rdef
+	xres -o ../bin/MinimizeAll ../bin/MinimizeAll.rsrc
+	mimeset -f ../bin/MinimizeAll
+	cd ..
+
+	# Step 2 - The DeskBar AddOn!
+	cd "deskbar add-on"
+	gcc -o ../bin/DeskbarAddOn -lbe DeskbarView.cpp ../minimize.cpp
+	rc -o ../bin/DeskbarAddOn.rsrc DeskbarAddOn.rdef
+	xres -o ../bin/DeskbarAddOn ../bin/DeskbarAddOn.rsrc
+	mimeset -f ../bin/DeskbarAddOn
+	cd ..
+
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/MinimizeAll
+	cp trunk/bin/MinimizeAll $appsDir/MinimizeAll/MinimizeAll
+	cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn
+	addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll
+	mkdir -p "$dataDir/deskbar/menu/Desktop applets"
+	ln -s $appsDir/MinimizeAll/DeskbarAddOn "$dataDir/deskbar/menu/Desktop applets/MinimizeAll"
+}

From b7b41c7c00f81da5bec062be5479ff74d41db382 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Sat, 14 Dec 2013 12:16:20 +0000
Subject: [PATCH 02/19] MinimizeAll: ln -> symlinkRelative, removed error about
 dir existing

---
 haiku-apps/minimizeall/minimizeall-1.0.0.recipe | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
index 58bb1f9d8..9d7ddc1bd 100644
--- a/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
+++ b/haiku-apps/minimizeall/minimizeall-1.0.0.recipe
@@ -40,7 +40,7 @@ BUILD_REQUIRES="
 BUILD()
 {
 	cd trunk
-	mkdir bin || true
+	mkdir -p bin
 
 	# Step 1 - Building the app
 	cd app
@@ -67,5 +67,6 @@ INSTALL()
 	cp trunk/bin/DeskbarAddOn $appsDir/MinimizeAll/DeskbarAddOn
 	addAppDeskbarSymlink $appsDir/MinimizeAll/MinimizeAll
 	mkdir -p "$dataDir/deskbar/menu/Desktop applets"
-	ln -s $appsDir/MinimizeAll/DeskbarAddOn "$dataDir/deskbar/menu/Desktop applets/MinimizeAll"
+	symlinkRelative -s "$appsDir/MinimizeAll/DeskbarAddOn"  \
+		"$dataDir/deskbar/menu/Desktop applets/MinimizeAll"
 }

From 8cd0e1d77a65b2ba724e32775bc3c46cd70eec5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Wed, 18 Dec 2013 22:43:38 +0000
Subject: [PATCH 03/19] Boost 1.55 First recipe

---
 dev-libs/boost/boost-1.55.0.recipe | 185 ++++++++++++++++++++++++++---
 1 file changed, 167 insertions(+), 18 deletions(-)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index 3269e6f00..03723af63 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -16,6 +16,7 @@ ARCHITECTURES="?x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="x86"
 SOURCE_DIR="boost_1_55_0"	
 PATCHES="boost-1.55.0.patch"
+DISABLE_SOURCE_PACKAGE=yes
 
 PROVIDES="
 	lib:boost = 1.55.0
@@ -33,38 +34,43 @@ BUILD_PREREQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	devel:libiconv
+	devel:libbz2
+	devel:libz
 	"
 
 REQUIRES="
 	lib:libiconv
+	lib:libbz2
+	lib:libz
 	"
 
 BUILD()
 {
 	./bootstrap.sh \
 		--without-icu \
-		--prefix=`finddir B_SYSTEM_DIRECTORY` \
-		--exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \
-		--libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \
-		#--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` 
+		--prefix=$prefix \
+		--exec-prefix=$binDir \
+		--libdir=$libDir \
+		--includedir=$includeDir
 	./bjam \
-		 -sICU_PATH=`finddir B_SYSTEM_DIRECTORY` \
-		 -sICONV_PATH=`finddir B_SYSTEM_DIRECTORY` \
+		 -sICU_PATH=$prefix \
+		 -sICONV_PATH=$prefix \
 		-d2 \
 		--without-mpi \
-		--prefix=`finddir B_SYSTEM_DIRECTORY` \
-		--exec-prefix=`finddir B_SYSTEM_BIN_DIRECTORY` \
-		--libdir=`finddir B_SYSTEM_LIB_DIRECTORY` \
-		#--includedir=`finddir B_SYSTEM_HEADERS_DIRECTORY` \
+		--prefix=$prefix \
+		--exec-prefix=$binDir \
+		--libdir=$libDir \
+		--includedir=$includeDir \
 		--enable-threads=posix \
 		--enable-thread-local-alloc \
-		--enable-parallel-mark \
+ 		--enable-parallel-mark \
 		inlining=on \
-		linkflags=-L`finddir B_SYSTEM_LIB_DIRECTORY` \
+		linkflags=-L$libDir \
 		threading=multi \
 		variant=release \
 		link=shared \
 		runtime-link=shared
+		--without-python
 }
 
 INSTALL()
@@ -72,17 +78,160 @@ INSTALL()
 	./bjam install \
 		-d2 \
 		--prefix=$prefix \
-		#--exec-prefix=${DESTDIR}/`finddir B_SYSTEM_BIN_DIRECTORY` \
-		#--libdir=${DESTDIR}/`finddir B_SYSTEM_LIB_DIRECTORY` \		
-		#--includedir=${DESTDIR}/`finddir B_SYSTEM_HEADERS_DIRECTORY` \
+		--exec-prefix=$binDir \
+		--libdir=$libDir \		
+		--includedir=$includeDir \
 		inlining=on \
-		--without-mpi 
+		--without-mpi \
+		--without-python
+		
+	packageEntries devel $includeDir
+	packageEntries atomic $libDir/*atomic*
+	packageEntries chrono $libDir/*chrono*
+	packageEntries date_time $libDir/*date_time*
+	packageEntries exception $libDir/*exception*
+	packageEntries filesystem $libDir/*filesystem*
+	packageEntries graph $libDir/*graph*
+	packageEntries iostreams $libDir/*iostreams*
+	packageEntries locale $libDir/*locale*
+	packageEntries log $libDir/*log*
+	packageEntries math $libDir/*math*
+	packageEntries program_options $libDir/*program_options*
+	packageEntries random $libDir/*random*
+	packageEntries regex $libDir/*regex*
+	packageEntries serialization $libDir/*serialization*
+	packageEntries signals $libDir/*signals*
+	packageEntries system $libDir/*system* 
+	packageEntries test $libDir/*test*
+	packageEntries thread $libDir/*thread*
+	packageEntries timer $libDir/*timer*
+	packageEntries wave $libDir/*wave*
 }
 
 PROVIDES_devel="
-	boost${secondaryArchSuffix} = $portVersion
+	boost_devel$secondaryArchSuffix = $portVersion
 	"
 	
 REQUIRES_devel="
-	boost${secondaryArchSuffix} == $portVersion base
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+PROVIDES_atomic="
+	boost_atomic$secondaryArchSuffix = $portVersion
+"
+REQUIRES_atomic="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_chrono="
+	boost_chrono$secondaryArchSuffix = $portVersion
+"
+REQUIRES_chrono="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_date_time="
+	boost_date_time$secondaryArchSuffix = $portVersion
+"
+REQUIRES_date_time="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_exception="
+	boost_exception$secondaryArchSuffix = $portVersion
+"
+REQUIRES_exception="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_filesystem="
+	boost_filesystem$secondaryArchSuffix = $portVersion
+"
+REQUIRES_filesystem="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_graph="
+	boost_graph$secondaryArchSuffix = $portVersion
+"
+REQUIRES_graph="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_iostreams="
+	boost_iostreams$secondaryArchSuffix = $portVersion
+"
+REQUIRES_iostreams="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_locale="
+	boost_locale$secondaryArchSuffix = $portVersion
+"
+REQUIRES_locale="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_log="
+	boost_log$secondaryArchSuffix = $portVersion
+"
+REQUIRES_log="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_math="
+	boost_math$secondaryArchSuffix = $portVersion
+"
+REQUIRES_math="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_program_options="
+	boost_program_options$secondaryArchSuffix = $portVersion
+"
+REQUIRES_program_options="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_random="
+	boost_random$secondaryArchSuffix = $portVersion
+"
+REQUIRES_random="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_regex="
+	boost_regex$secondaryArchSuffix = $portVersion
+"
+REQUIRES_regex="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_serialization="
+	boost_serialization$secondaryArchSuffix = $portVersion
+"
+REQUIRES_serialization="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_signals="
+	boost_signals$secondaryArchSuffix = $portVersion
+"
+REQUIRES_signals="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_system="
+	boost_system$secondaryArchSuffix = $portVersion
+"
+REQUIRES_system="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_test="
+	boost_test$secondaryArchSuffix = $portVersion
+"
+REQUIRES_test="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_thread="
+	boost_thread$secondaryArchSuffix = $portVersion
+"
+REQUIRES_thread="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_timer="
+	boost_timer$secondaryArchSuffix = $portVersion
+"
+REQUIRES_timer="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+PROVIDES_wave="
+	boost_wave$secondaryArchSuffix = $portVersion
+"
+REQUIRES_wave="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"

From 75b9915aa3dab2bbc6f5696256ee601ac10124bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Wed, 18 Dec 2013 23:08:38 +0000
Subject: [PATCH 04/19] Fixed dependencies

---
 dev-libs/boost/boost-1.55.0.recipe | 172 ++++++++++++++++++-----------
 1 file changed, 106 insertions(+), 66 deletions(-)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index 03723af63..a60c44c22 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -69,8 +69,9 @@ BUILD()
 		threading=multi \
 		variant=release \
 		link=shared \
-		runtime-link=shared
-		--without-python
+		runtime-link=shared \
+		--without-python \
+		--disable-icu 
 }
 
 INSTALL()
@@ -111,127 +112,166 @@ INSTALL()
 PROVIDES_devel="
 	boost_devel$secondaryArchSuffix = $portVersion
 	"
-	
-REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	"
 PROVIDES_atomic="
 	boost_atomic$secondaryArchSuffix = $portVersion
 "
-REQUIRES_atomic="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_chrono="
 	boost_chrono$secondaryArchSuffix = $portVersion
 "
-REQUIRES_chrono="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_date_time="
 	boost_date_time$secondaryArchSuffix = $portVersion
 "
-REQUIRES_date_time="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_exception="
 	boost_exception$secondaryArchSuffix = $portVersion
 "
-REQUIRES_exception="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_filesystem="
 	boost_filesystem$secondaryArchSuffix = $portVersion
 "
-REQUIRES_filesystem="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_graph="
 	boost_graph$secondaryArchSuffix = $portVersion
 "
-REQUIRES_graph="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_iostreams="
 	boost_iostreams$secondaryArchSuffix = $portVersion
 "
-REQUIRES_iostreams="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_locale="
 	boost_locale$secondaryArchSuffix = $portVersion
 "
-REQUIRES_locale="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_log="
 	boost_log$secondaryArchSuffix = $portVersion
 "
-REQUIRES_log="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_math="
 	boost_math$secondaryArchSuffix = $portVersion
 "
-REQUIRES_math="
-	haiku$secondaryArchSuffix >= $haikuVersion
+PROVIDES_random="
+	boost_random$secondaryArchSuffix = $portVersion
 "
 PROVIDES_program_options="
 	boost_program_options$secondaryArchSuffix = $portVersion
 "
-REQUIRES_program_options="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
-PROVIDES_random="
-	boost_random$secondaryArchSuffix = $portVersion
-"
-REQUIRES_random="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_regex="
 	boost_regex$secondaryArchSuffix = $portVersion
 "
-REQUIRES_regex="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_serialization="
 	boost_serialization$secondaryArchSuffix = $portVersion
 "
-REQUIRES_serialization="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_signals="
 	boost_signals$secondaryArchSuffix = $portVersion
 "
-REQUIRES_signals="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_system="
 	boost_system$secondaryArchSuffix = $portVersion
 "
-REQUIRES_system="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_test="
 	boost_test$secondaryArchSuffix = $portVersion
 "
-REQUIRES_test="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_thread="
 	boost_thread$secondaryArchSuffix = $portVersion
 "
-REQUIRES_thread="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_timer="
 	boost_timer$secondaryArchSuffix = $portVersion
 "
-REQUIRES_timer="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
 PROVIDES_wave="
 	boost_wave$secondaryArchSuffix = $portVersion
 "
-REQUIRES_wave="
+
+REQUIRES_devel="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+REQUIRES_atomic="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
+
+REQUIRES_chrono="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_system$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_date_time="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_exception="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_filesystem="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_system$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_graph="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_regex$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_iostreams="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_locale="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_chrono$secondaryArchSuffix = $portVersion
+	boost_system$secondaryArchSuffix = $portVersion
+	boost_thread$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_log="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_chrono$secondaryArchSuffix = $portVersion
+	boost_system$secondaryArchSuffix = $portVersion
+	boost_date_time$secondaryArchSuffix = $portVersion
+	boost_thread$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_math="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_program_options="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_random="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_regex="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_serialization="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_signals="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_system="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_test="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
+REQUIRES_thread="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_system$secondaryArchSuffix = $portVersion
+	boost_chrono$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_timer="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_chrono$secondaryArchSuffix = $portVersion
+	boost_system$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_wave="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	boost_chrono$secondaryArchSuffix = $portVersion
+	boost_date_time$secondaryArchSuffix = $portVersion
+	boost_filesystem$secondaryArchSuffix = $portVersion
+	boost_system$secondaryArchSuffix = $portVersion
+	boost_thread$secondaryArchSuffix = $portVersion
+"

From 4a486704d8337bf59ddbaf424724a30018ddad1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 19 Dec 2013 00:07:34 +0000
Subject: [PATCH 05/19] Fixed dependecies equals

---
 dev-libs/boost/boost-1.55.0.recipe | 38 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index a60c44c22..0537980f5 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -183,7 +183,7 @@ REQUIRES_atomic="
 
 REQUIRES_chrono="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_system$secondaryArchSuffix = $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
 "
 
 REQUIRES_date_time="
@@ -196,12 +196,12 @@ REQUIRES_exception="
 
 REQUIRES_filesystem="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_system$secondaryArchSuffix = $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
 "
 
 REQUIRES_graph="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_regex$secondaryArchSuffix = $portVersion
+	boost_regex$secondaryArchSuffix == $portVersion
 "
 
 REQUIRES_iostreams="
@@ -210,17 +210,17 @@ REQUIRES_iostreams="
 
 REQUIRES_locale="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_chrono$secondaryArchSuffix = $portVersion
-	boost_system$secondaryArchSuffix = $portVersion
-	boost_thread$secondaryArchSuffix = $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
 "
 
 REQUIRES_log="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_chrono$secondaryArchSuffix = $portVersion
-	boost_system$secondaryArchSuffix = $portVersion
-	boost_date_time$secondaryArchSuffix = $portVersion
-	boost_thread$secondaryArchSuffix = $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_date_time$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
 "
 
 REQUIRES_math="
@@ -257,21 +257,21 @@ REQUIRES_test="
 
 REQUIRES_thread="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_system$secondaryArchSuffix = $portVersion
-	boost_chrono$secondaryArchSuffix = $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
 "
 
 REQUIRES_timer="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_chrono$secondaryArchSuffix = $portVersion
-	boost_system$secondaryArchSuffix = $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
 "
 
 REQUIRES_wave="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_chrono$secondaryArchSuffix = $portVersion
-	boost_date_time$secondaryArchSuffix = $portVersion
-	boost_filesystem$secondaryArchSuffix = $portVersion
-	boost_system$secondaryArchSuffix = $portVersion
-	boost_thread$secondaryArchSuffix = $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_date_time$secondaryArchSuffix == $portVersion
+	boost_filesystem$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
 "

From 1cc9bfe6f60692ecfad837a495cde021b132f56f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 19 Dec 2013 01:10:38 +0000
Subject: [PATCH 06/19] TypeTraits patch

---
 dev-libs/boost/boost-1.55.0.recipe       |  5 ++++-
 dev-libs/boost/patches/type_traits.patch | 26 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 dev-libs/boost/patches/type_traits.patch

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index 0537980f5..d03754488 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -15,7 +15,10 @@ COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
 ARCHITECTURES="?x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="x86"
 SOURCE_DIR="boost_1_55_0"	
-PATCHES="boost-1.55.0.patch"
+PATCHES="
+	boost-1.55.0.patch
+	type_traits.patch
+"
 DISABLE_SOURCE_PACKAGE=yes
 
 PROVIDES="
diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch
new file mode 100644
index 000000000..a2c26785d
--- /dev/null
+++ b/dev-libs/boost/patches/type_traits.patch
@@ -0,0 +1,26 @@
+diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
+index 1b15c7e..e953f00 100644
+--- a/boost/config/platform/haiku.hpp
++++ b/boost/config/platform/haiku.hpp
+@@ -10,13 +10,21 @@
+ #define BOOST_PLATFORM "Haiku"
+ 
+ #define BOOST_NO_INTRINSIC_WCHAR_T
++#define BOOST_NO_STD_WSTRING
+ #define BOOST_HAS_UNISTD_H
++#define BOOST_EXCEPTION_DISABLE
++#define BOOST_NO_EXCEPTIONS
++#define BOOST_NO_AUTO_PTR
++#define GLIBC_HAVE_LONG_LONG
+ 	
+ #define BOOST_HAS_BETHREADS
+ 	
+ #ifndef BOOST_DISABLE_THREADS
+ #   define BOOST_HAS_THREADS
+ #endif
++#define BOOST_NO_CXX11_HDR_TYPE_TRAITS
++#define BOOST_NO_CXX11_ATOMIC_SMART_PTR
++
+ 
+ //
+ // thread API's not auto detected:

From 7040721b486f2448311fbea9a6520c595228d6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 19 Dec 2013 01:24:34 +0000
Subject: [PATCH 07/19] Context package

---
 dev-libs/boost/boost-1.55.0.recipe | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index d03754488..d132ceaaf 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -92,6 +92,7 @@ INSTALL()
 	packageEntries devel $includeDir
 	packageEntries atomic $libDir/*atomic*
 	packageEntries chrono $libDir/*chrono*
+	packageEntries context $libDir/*context*
 	packageEntries date_time $libDir/*date_time*
 	packageEntries exception $libDir/*exception*
 	packageEntries filesystem $libDir/*filesystem*
@@ -121,6 +122,9 @@ PROVIDES_atomic="
 PROVIDES_chrono="
 	boost_chrono$secondaryArchSuffix = $portVersion
 "
+PROVIDES_context="
+	boost_context$secondaryArchSuffix = $portVersion
+"
 PROVIDES_date_time="
 	boost_date_time$secondaryArchSuffix = $portVersion
 "
@@ -189,6 +193,10 @@ REQUIRES_chrono="
 	boost_system$secondaryArchSuffix == $portVersion
 "
 
+REQUIRES_context="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
+
 REQUIRES_date_time="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "

From ad64fd97bcb9f9d8ad6b0727a7a413320b098a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 19 Dec 2013 01:39:49 +0000
Subject: [PATCH 08/19] Pacthes modified

---
 dev-libs/boost/patches/type_traits.patch | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch
index a2c26785d..e1c12c434 100644
--- a/dev-libs/boost/patches/type_traits.patch
+++ b/dev-libs/boost/patches/type_traits.patch
@@ -1,17 +1,14 @@
 diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
-index 1b15c7e..e953f00 100644
+index 1b15c7e..c1b8e74 100644
 --- a/boost/config/platform/haiku.hpp
 +++ b/boost/config/platform/haiku.hpp
-@@ -10,13 +10,21 @@
- #define BOOST_PLATFORM "Haiku"
+@@ -11,12 +11,18 @@
  
  #define BOOST_NO_INTRINSIC_WCHAR_T
-+#define BOOST_NO_STD_WSTRING
  #define BOOST_HAS_UNISTD_H
-+#define BOOST_EXCEPTION_DISABLE
-+#define BOOST_NO_EXCEPTIONS
 +#define BOOST_NO_AUTO_PTR
 +#define GLIBC_HAVE_LONG_LONG
++#define BOOST_HAS_STDINT_H
  	
  #define BOOST_HAS_BETHREADS
  	

From 119fc87aec8b083ca29fd76b0f68006e81120871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 19 Dec 2013 01:51:47 +0000
Subject: [PATCH 09/19] Try to fix boost::thread

---
 dev-libs/boost/patches/type_traits.patch | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch
index e1c12c434..0da167cce 100644
--- a/dev-libs/boost/patches/type_traits.patch
+++ b/dev-libs/boost/patches/type_traits.patch
@@ -1,14 +1,15 @@
 diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
-index 1b15c7e..c1b8e74 100644
+index 1b15c7e..a0bfb8c 100644
 --- a/boost/config/platform/haiku.hpp
 +++ b/boost/config/platform/haiku.hpp
-@@ -11,12 +11,18 @@
+@@ -11,12 +11,19 @@
  
  #define BOOST_NO_INTRINSIC_WCHAR_T
  #define BOOST_HAS_UNISTD_H
 +#define BOOST_NO_AUTO_PTR
 +#define GLIBC_HAVE_LONG_LONG
 +#define BOOST_HAS_STDINT_H
++#define BOOST_NOT_STD_WSTRING
  	
  #define BOOST_HAS_BETHREADS
  	

From 93aa86c4d351fff52a68f63a6232e93a69534bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 19 Dec 2013 06:12:30 +0000
Subject: [PATCH 10/19] Pacthed finished

---
 dev-libs/boost/patches/type_traits.patch | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/dev-libs/boost/patches/type_traits.patch b/dev-libs/boost/patches/type_traits.patch
index 0da167cce..02b4a07cb 100644
--- a/dev-libs/boost/patches/type_traits.patch
+++ b/dev-libs/boost/patches/type_traits.patch
@@ -1,15 +1,19 @@
 diff --git a/boost/config/platform/haiku.hpp b/boost/config/platform/haiku.hpp
-index 1b15c7e..a0bfb8c 100644
+index 1b15c7e..9a3becd 100644
 --- a/boost/config/platform/haiku.hpp
 +++ b/boost/config/platform/haiku.hpp
-@@ -11,12 +11,19 @@
+@@ -9,18 +9,29 @@
  
- #define BOOST_NO_INTRINSIC_WCHAR_T
+ #define BOOST_PLATFORM "Haiku"
+ 
+-#define BOOST_NO_INTRINSIC_WCHAR_T
++//#define BOOST_NO_INTRINSIC_WCHAR_T
  #define BOOST_HAS_UNISTD_H
 +#define BOOST_NO_AUTO_PTR
 +#define GLIBC_HAVE_LONG_LONG
 +#define BOOST_HAS_STDINT_H
-+#define BOOST_NOT_STD_WSTRING
++//#define BOOST_NOT_STD_WSTRING
++#define BOOST_HASH_NO_EXTENSIONS
  	
  #define BOOST_HAS_BETHREADS
  	
@@ -18,7 +22,14 @@ index 1b15c7e..a0bfb8c 100644
  #endif
 +#define BOOST_NO_CXX11_HDR_TYPE_TRAITS
 +#define BOOST_NO_CXX11_ATOMIC_SMART_PTR
-+
++#define BOOST_NO_CXX11_STATIC_ASSERT
++#define BOOST_NO_CXX11_VARIADIC_MACROS
  
  //
  // thread API's not auto detected:
+ //
++#define BOOST_HAS_SCHED_YIELD
++#define BOOST_HAS_PTHREAD_YIELD
+ #define BOOST_HAS_GETTIMEOFDAY
+ 
+ // boilerplate code:

From 6374b32d8efab0280a5dbbf9384d383d30d1dd6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 19 Dec 2013 06:19:24 +0000
Subject: [PATCH 11/19] Coroutine library

---
 dev-libs/boost/boost-1.55.0.recipe | 157 +++++++++++++----------------
 1 file changed, 72 insertions(+), 85 deletions(-)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index d132ceaaf..a9663b525 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -93,6 +93,7 @@ INSTALL()
 	packageEntries atomic $libDir/*atomic*
 	packageEntries chrono $libDir/*chrono*
 	packageEntries context $libDir/*context*
+	packageEntries coroutine $libDir/*coroutine*
 	packageEntries date_time $libDir/*date_time*
 	packageEntries exception $libDir/*exception*
 	packageEntries filesystem $libDir/*filesystem*
@@ -116,116 +117,80 @@ INSTALL()
 PROVIDES_devel="
 	boost_devel$secondaryArchSuffix = $portVersion
 	"
+REQUIRES_devel="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
 PROVIDES_atomic="
 	boost_atomic$secondaryArchSuffix = $portVersion
 "
+REQUIRES_atomic="
+	haiku$secondaryArchSuffix >= $haikuVersion
+"
 PROVIDES_chrono="
 	boost_chrono$secondaryArchSuffix = $portVersion
 "
-PROVIDES_context="
-	boost_context$secondaryArchSuffix = $portVersion
-"
-PROVIDES_date_time="
-	boost_date_time$secondaryArchSuffix = $portVersion
-"
-PROVIDES_exception="
-	boost_exception$secondaryArchSuffix = $portVersion
-"
-PROVIDES_filesystem="
-	boost_filesystem$secondaryArchSuffix = $portVersion
-"
-PROVIDES_graph="
-	boost_graph$secondaryArchSuffix = $portVersion
-"
-PROVIDES_iostreams="
-	boost_iostreams$secondaryArchSuffix = $portVersion
-"
-PROVIDES_locale="
-	boost_locale$secondaryArchSuffix = $portVersion
-"
-PROVIDES_log="
-	boost_log$secondaryArchSuffix = $portVersion
-"
-PROVIDES_math="
-	boost_math$secondaryArchSuffix = $portVersion
-"
-PROVIDES_random="
-	boost_random$secondaryArchSuffix = $portVersion
-"
-PROVIDES_program_options="
-	boost_program_options$secondaryArchSuffix = $portVersion
-"
-PROVIDES_regex="
-	boost_regex$secondaryArchSuffix = $portVersion
-"
-PROVIDES_serialization="
-	boost_serialization$secondaryArchSuffix = $portVersion
-"
-PROVIDES_signals="
-	boost_signals$secondaryArchSuffix = $portVersion
-"
-PROVIDES_system="
-	boost_system$secondaryArchSuffix = $portVersion
-"
-PROVIDES_test="
-	boost_test$secondaryArchSuffix = $portVersion
-"
-PROVIDES_thread="
-	boost_thread$secondaryArchSuffix = $portVersion
-"
-PROVIDES_timer="
-	boost_timer$secondaryArchSuffix = $portVersion
-"
-PROVIDES_wave="
-	boost_wave$secondaryArchSuffix = $portVersion
-"
-
-REQUIRES_devel="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	"
-
-REQUIRES_atomic="
-	haiku$secondaryArchSuffix >= $haikuVersion
-"
-
 REQUIRES_chrono="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	boost_system$secondaryArchSuffix == $portVersion
 "
-
+PROVIDES_context="
+	boost_context$secondaryArchSuffix = $portVersion
+"
 REQUIRES_context="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_coroutine="
+	boost_coroutine$secondaryArchSuffix = $portVersion
+"
+REQUIRES_coroutine="
+	boost_context$secondaryArchSuffix == $portVersion
+"
+PROVIDES_date_time="
+	boost_date_time$secondaryArchSuffix = $portVersion
+"
 REQUIRES_date_time="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_exception="
+	boost_exception$secondaryArchSuffix = $portVersion
+"
 REQUIRES_exception="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_filesystem="
+	boost_filesystem$secondaryArchSuffix = $portVersion
+"
 REQUIRES_filesystem="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	boost_system$secondaryArchSuffix == $portVersion
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+"
+PROVIDES_graph="
+	boost_graph$secondaryArchSuffix = $portVersion
 "
-
 REQUIRES_graph="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	boost_regex$secondaryArchSuffix == $portVersion
 "
-
+PROVIDES_iostreams="
+	boost_iostreams$secondaryArchSuffix = $portVersion
+"
 REQUIRES_iostreams="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_locale="
+	boost_locale$secondaryArchSuffix = $portVersion
+"
 REQUIRES_locale="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	boost_chrono$secondaryArchSuffix == $portVersion
 	boost_system$secondaryArchSuffix == $portVersion
 	boost_thread$secondaryArchSuffix == $portVersion
 "
-
+PROVIDES_log="
+	boost_log$secondaryArchSuffix = $portVersion
+"
 REQUIRES_log="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	boost_chrono$secondaryArchSuffix == $portVersion
@@ -233,51 +198,73 @@ REQUIRES_log="
 	boost_date_time$secondaryArchSuffix == $portVersion
 	boost_thread$secondaryArchSuffix == $portVersion
 "
-
+PROVIDES_math="
+	boost_math$secondaryArchSuffix = $portVersion
+"
 REQUIRES_math="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_program_options="
+	boost_program_options$secondaryArchSuffix = $portVersion
+"
 REQUIRES_program_options="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_random="
+	boost_random$secondaryArchSuffix = $portVersion
+"
 REQUIRES_random="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_regex="
+	boost_regex$secondaryArchSuffix = $portVersion
+"
 REQUIRES_regex="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_serialization="
+	boost_serialization$secondaryArchSuffix = $portVersion
+"
 REQUIRES_serialization="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_signals="
+	boost_signals$secondaryArchSuffix = $portVersion
+"
 REQUIRES_signals="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_system="
+	boost_system$secondaryArchSuffix = $portVersion
+"
 REQUIRES_system="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_test="
+	boost_test$secondaryArchSuffix = $portVersion
+"
 REQUIRES_test="
 	haiku$secondaryArchSuffix >= $haikuVersion
 "
-
+PROVIDES_thread="
+	boost_thread$secondaryArchSuffix = $portVersion
+"
 REQUIRES_thread="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	boost_system$secondaryArchSuffix == $portVersion
 	boost_chrono$secondaryArchSuffix == $portVersion
 "
-
+PROVIDES_timer="
+	boost_timer$secondaryArchSuffix = $portVersion
+"
 REQUIRES_timer="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	boost_chrono$secondaryArchSuffix == $portVersion
 	boost_system$secondaryArchSuffix == $portVersion
 "
-
+PROVIDES_wave="
+	boost_wave$secondaryArchSuffix = $portVersion
+"
 REQUIRES_wave="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	boost_chrono$secondaryArchSuffix == $portVersion

From 62cbcc8576cefa1b35f0ba4acd736477133fec4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Thu, 19 Dec 2013 06:49:26 +0000
Subject: [PATCH 12/19] Boost installation

---
 dev-libs/boost/boost-1.55.0.recipe | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index a9663b525..db56d6e75 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -33,6 +33,8 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:jam
 	cmd:iconv
+	cmd:make
+	binutils
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -79,15 +81,21 @@ BUILD()
 
 INSTALL()
 {
-	./bjam install \
-		-d2 \
-		--prefix=$prefix \
-		--exec-prefix=$binDir \
-		--libdir=$libDir \		
-		--includedir=$includeDir \
-		inlining=on \
-		--without-mpi \
-		--without-python
+	#./bjam install \
+	#	-d2 \
+	#	--prefix=$prefix \
+	#	--exec-prefix=$binDir \
+	#	--libdir=$libDir \		
+	#	--includedir=$includeDir \
+	#	inlining=on \
+	#	--without-mpi \
+	#	--without-python \
+	#	--disable-icu 
+	mkdir -p $includeDir
+	mkdir -p $libDir
+	
+	cp -rf boost $includeDir
+	cp stage/lib/* $libDir
 		
 	packageEntries devel $includeDir
 	packageEntries atomic $libDir/*atomic*

From 67d6b061f151855f96c7b5e8ae1933466c47b403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Fri, 20 Dec 2013 18:38:59 +0000
Subject: [PATCH 13/19] Removed comments

---
 dev-libs/boost/boost-1.55.0.recipe | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index db56d6e75..74d270f35 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -19,7 +19,6 @@ PATCHES="
 	boost-1.55.0.patch
 	type_traits.patch
 "
-DISABLE_SOURCE_PACKAGE=yes
 
 PROVIDES="
 	lib:boost = 1.55.0
@@ -81,16 +80,6 @@ BUILD()
 
 INSTALL()
 {
-	#./bjam install \
-	#	-d2 \
-	#	--prefix=$prefix \
-	#	--exec-prefix=$binDir \
-	#	--libdir=$libDir \		
-	#	--includedir=$includeDir \
-	#	inlining=on \
-	#	--without-mpi \
-	#	--without-python \
-	#	--disable-icu 
 	mkdir -p $includeDir
 	mkdir -p $libDir
 	

From ba7b6295bddfe671568675f0caebeaaa6ef2a637 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?=
 <adrian.arroyocalle@gmail.com>
Date: Fri, 20 Dec 2013 21:07:30 +0000
Subject: [PATCH 14/19] Changed architectures

---
 dev-libs/boost/boost-1.55.0.recipe | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index 74d270f35..b1a2daff6 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -12,8 +12,11 @@ CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354"
 REVISION="1"
 LICENSE="Boost v1.0"
 COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
-ARCHITECTURES="?x86_gcc2 ?x86"
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86 ?x86_64"
 SOURCE_DIR="boost_1_55_0"	
 PATCHES="
 	boost-1.55.0.patch

From 54d1cf8641a3ea0bce857046692b8b53aa9f38d1 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 21 Dec 2013 02:37:13 -0800
Subject: [PATCH 15/19] Fixed lcms on x86

---
 media-libs/lcms/lcms-2.5.recipe | 45 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/media-libs/lcms/lcms-2.5.recipe b/media-libs/lcms/lcms-2.5.recipe
index f8874d21a..6bde06ecd 100644
--- a/media-libs/lcms/lcms-2.5.recipe
+++ b/media-libs/lcms/lcms-2.5.recipe
@@ -8,32 +8,35 @@ LICENSE="MIT"
 COPYRIGHT="2007 Marti Maria"
 
 ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	lcms = 2.5 compat >= 2
-	lib:liblcms2
-	cmd:jpgicc
-	cmd:linkicc
-	cmd:psicc
-	cmd:tificc
-	cmd:transicc	
+	lcms$secondaryArchSuffix = 2.5 compat >= 2
+	lib:liblcms2$secondaryArchSuffix
+	cmd:jpgicc$secondaryArchSuffix
+	cmd:linkicc$secondaryArchSuffix
+	cmd:psicc$secondaryArchSuffix
+	cmd:tificc$secondaryArchSuffix
+	cmd:transicc$secondaryArchSuffix
 	"
 
 REQUIRES="
-	haiku
-	lib:libjpeg
-	lib:libpng
-	lib:libtiff
-	lib:libz"
+	haiku >= $haikuVersion
+	lib:libjpeg$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libtiff$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
 
 BUILD_REQUIRES="
-	devel:libjpeg
-	devel:libpng
-	devel:libtiff
-	devel:libz"
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libjpeg$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libtiff$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
 
 BUILD_PREREQUIRES="
-	haiku_devel
 	cmd:gcc${secondaryArchSuffix}
 	cmd:ld${secondaryArchSuffix}
 	cmd:libtoolize
@@ -71,10 +74,10 @@ INSTALL()
 # ----- devel package ---------------------------------------
 
 PROVIDES_devel="
-	lcms_devel = $portVersion
-	devel:lcms = 2.5 compat >= 2
-	devel:liblcms2 = 2.0.1 compat >= 2
+	lcms${secondaryArchSuffix}_devel = $portVersion
+	devel:lcms$secondaryArchSuffix = 2.5 compat >= 2
+	devel:liblcms2$secondaryArchSuffix = 2.0.1 compat >= 2
 	"
 REQUIRES_devel="
-	lcms == $portVersion base
+	lcms$secondaryArchSuffix == $portVersion base
 	"

From c53a8bdace6a483fcccf0d900690301668dc63aa Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 21 Dec 2013 02:40:53 -0800
Subject: [PATCH 16/19] Moved haiku_devel to BUILD_REQUIRES in fluidsynth
 recipe.  Runs into PTHREAD not found when running cmake.

---
 media-sound/fluidsynth/fluidsynth-1.1.6.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
index a48739939..de09af679 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
@@ -23,10 +23,10 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:cmake
 	cmd:make
 	cmd:gcc$secondaryArchSuffix

From e760dedf497e33471161ceff9139fa1555e79576 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 21 Dec 2013 02:43:17 -0800
Subject: [PATCH 17/19] Moved haiku_devel to BUILD_REQUIRES in fluidsynth
 recipe.  Runs into PTHREAD not found when running cmake.

---
 media-sound/fluidsynth/fluidsynth-1.1.6.recipe | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
index de09af679..9ee32b4fa 100644
--- a/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
+++ b/media-sound/fluidsynth/fluidsynth-1.1.6.recipe
@@ -7,8 +7,8 @@ LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2007-2012 Josh Green, Pedro Lopez-Cabanillas, David Henningsson"
 
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
 
 PROVIDES="
 	fluidsynth$secondaryArchSuffix = $portVersion

From 06ffcf777c45a8c13fbd4e4f67153d00e9c7a98c Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 21 Dec 2013 02:57:58 -0800
Subject: [PATCH 18/19] Updated libart recipe for secondaryArchSuffix support

---
 .../libart_lgpl/libart_lgpl-2.3.21.recipe     | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
index 40dfb8b7c..6f7fd5535 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21.recipe
@@ -7,20 +7,23 @@ REVISION="1"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="2001-2010 Mathieu Lacage and Raph Levien"
 
-ARCHITECTURES="x86 x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	libart_lgpl= $portVersion
-	cmd:libart2_config = $portVersion compat >= 2
-	lib:libart_lgpl_2 = 2.3.21 compat >= 2
-	" 
+	libart_lgpl$secondaryArchSuffix = $portVersion
+	lib:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2
+	"
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
+
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	"
+
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoreconf
 	cmd:libtool
@@ -28,6 +31,7 @@ BUILD_PREREQUIRES="
 	cmd:ld${secondaryArchSuffix}
 	cmd:gcc${secondaryArchSuffix}
 	"
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -45,15 +49,18 @@ INSTALL()
 	
 	# devel package
 	packageEntries devel \
-		$developDir
+		$developDir \
+		$binDir
 }
 
 # ----- devel package
 
 PROVIDES_devel="
-	libart_lgpl_2 = $portVersion
-	devel:libart_lgpl_2 = 2.3.21 compat >= 2
+	libart_lgpl_2$secondaryArchSuffix = $portVersion
+	devel:libart_lgpl_2$secondaryArchSuffix = 2.3.21 compat >= 2
+	cmd:libart2_config$secondaryArchSuffix = $portVersion compat >= 2
 	"
+
 REQUIRES_devel="
-	libart_lgpl_2 == $portVersion base
+	libart_lgpl_2$secondaryArchSuffix == $portVersion base
 	"

From c50f9398ee338d7db1120383911f5a21fe77601a Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sat, 21 Dec 2013 03:25:01 -0800
Subject: [PATCH 19/19] Update jasper for proper secondaryArchSuffix support

---
 media-libs/jasper/jasper-1.900.1.recipe | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/media-libs/jasper/jasper-1.900.1.recipe b/media-libs/jasper/jasper-1.900.1.recipe
index 9d521657a..780d42167 100644
--- a/media-libs/jasper/jasper-1.900.1.recipe
+++ b/media-libs/jasper/jasper-1.900.1.recipe
@@ -8,8 +8,8 @@ CHECKSUM_MD5="a342b2b4495b3e1394e161eb5d85d754"
 LICENSE="JasPer v2"
 COPYRIGHT="1999-2007 Michael D. Adams"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86_gcc2 ?x86"
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	jasper$secondaryArchSuffix = $portVersion compat >= 1.0.0
@@ -89,14 +89,13 @@ REQUIRES_devel="
 if [ -z "$secondaryArchSuffix" ]; then
 	SUMMARY_tools="The jasper tools"
 	PROVIDES_tools="
-		jasper_tools = $portVersion
-		cmd:imgcmp = $portVersion
-		cmd:imginfo = $portVersion
-		cmd:jasper = $portVersion
-		cmd:tmrdemo = $portVersion
+		jasper_tools$secondaryArchSuffix = $portVersion
+		cmd:imgcmp$secondaryArchSuffix = $portVersion
+		cmd:imginfo$secondaryArchSuffix = $portVersion
+		cmd:jasper$secondaryArchSuffix = $portVersion
+		cmd:tmrdemo$secondaryArchSuffix = $portVersion
 		"
 	REQUIRES_tools="
-		haiku >= $haikuVersion
-		jasper == $portVersion base
+		jasper$secondaryArchSuffix == $portVersion base
 		"
-fi
\ No newline at end of file
+fi