From 85fd14ca9a33ffb43326b1c6d03aa7fc92499a32 Mon Sep 17 00:00:00 2001
From: noryb009 <noryb009@hotmail.com>
Date: Wed, 25 Dec 2013 00:03:36 -0500
Subject: [PATCH 01/23] Add OptiPNGTranslator recipe

---
 .../optipngtranslator-0.0.1.recipe            | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe

diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe
new file mode 100644
index 000000000..4930cc182
--- /dev/null
+++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe
@@ -0,0 +1,50 @@
+SUMMARY="Save optimized PNG files"
+DESCRIPTION="
+	The OptiPNGTranslator for Haiku allows you to save images as
+	PNG files which have been optimized by OptiPNG.
+	"
+HOMEPAGE="https://github.com/noryb009/OptiPNGTranslator/"
+SRC_URI="git://github.com/noryb009/OptiPNGTranslator.git#8e3996a92d840f3c097cf954e001d4f371265161"
+LICENSE="MIT"
+COPYRIGHT="2013 Luke (noryb009)"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+if [ $buildArchitecture = x86_gcc2 ] && \
+		[ $targetArchitecture = x86_gcc2 ]; then
+	optipngSuffix="_x86"
+fi
+
+PROVIDES="
+	optipngtranslator = $portVersion
+	app:optipngtranslator = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:optipng$optipngSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:as
+	cmd:gcc
+	makefile_engine
+	cmd:make
+	cmd:mkdepend
+	"
+
+BUILD()
+{
+	make \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY` \
+		TARGET_DIR=.
+}
+
+INSTALL()
+{
+	mkdir -p $addOnsDir/Translators
+	cp OptiPNGTranslator $addOnsDir/Translators
+}

From f50ad9c9af2cfb388a0bc6cbcbaa5d8245b220b2 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Thu, 26 Dec 2013 20:57:50 +0000
Subject: [PATCH 02/23] Add RemoteControl recipe

---
 haiku-apps/remotecontrol/licenses/Unknown     |  1 +
 .../remotecontrol/remotecontrol-1.1.recipe    | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 haiku-apps/remotecontrol/licenses/Unknown
 create mode 100644 haiku-apps/remotecontrol/remotecontrol-1.1.recipe

diff --git a/haiku-apps/remotecontrol/licenses/Unknown b/haiku-apps/remotecontrol/licenses/Unknown
new file mode 100644
index 000000000..6f00e7a6b
--- /dev/null
+++ b/haiku-apps/remotecontrol/licenses/Unknown
@@ -0,0 +1 @@
+The license is nowhere noted, but on BeBits and HaikuWare it says the license is Freeware.
diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
new file mode 100644
index 000000000..b0090db97
--- /dev/null
+++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
@@ -0,0 +1,54 @@
+SUMMARY="Remote control your Haiku machines with ease!"
+DESCRIPTION="
+	RemoteControl is an application that allows the user
+	to control a remote PC as if he was seating in front of it.
+	It can be useful if you have a PC with no screen,
+	keyboard or mouse connected, or simply if it is too far away.
+	"
+HOMEPAGE="https://github.com/HaikuArchives/RemoteControl"
+SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29"
+REVISION="1"
+LICENSE="Unknown"
+COPYRIGHT="2001 Thomas Thiriez"
+
+ARCHITECTURES="x86 x86_gcc2"
+
+
+PROVIDES="
+	remotecontrol = $portVersion
+	cmd:rcserver = $portVersion
+	cmd:rcclient = $portVersion
+	addon:rcinputfilter = $portVersion
+	addon:rcinputdevice = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:g++
+	cmd:xres
+	cmd:make
+	cmd:mkdepend
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+BUILD()
+{
+	cd sources
+	make -C RCClient
+	make -C RCInputDevice
+	make -C RCInputFilter
+	make -C RCServer
+}
+
+INSTALL()
+{
+	cd sources
+	make -C RCClient install INSTALL_DIR=$binDir
+	make -C RCServer install INSTALL_DIR=$binDir
+	make -C RCInputDevice install INSTALL_DIR=$addOnsDir/input_server/devices
+	make -C RCInputFilter install INSTALL_DIR=$addOnsDir/input_server/filters
+}

From 79654b99c84e036524afe4e084302f70cced88c4 Mon Sep 17 00:00:00 2001
From: noryb009 <noryb009@hotmail.com>
Date: Fri, 27 Dec 2013 02:41:58 -0500
Subject: [PATCH 03/23] Add Recibe recipe

---
 haiku-apps/recibe/recibe-1.0b1.recipe | 52 +++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 haiku-apps/recibe/recibe-1.0b1.recipe

diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe
new file mode 100644
index 000000000..9ae0fd70d
--- /dev/null
+++ b/haiku-apps/recibe/recibe-1.0b1.recipe
@@ -0,0 +1,52 @@
+SUMMARY="A cooking recipe manager"
+DESCRIPTION="
+	Recibe, written by DarkWyrm, is a cooking recipe manager. The 
+	database, which needs to be downloaded separately, includes
+	around 52,000 different recipes for you to try.
+	
+	If you download the recipe database, place it inside your settings
+	directory, which is likely `/boot/home/config/settings/' .
+	"
+HOMEPAGE="https://github.com/HaikuArchives/Recibe"
+SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad"
+LICENSE="MIT"
+COPYRIGHT="2007 DarkWyrm"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	recibe = $portVersion
+	app:recibe = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libsqlite3
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsqlite3
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc
+	makefile_engine
+	cmd:make
+	cmd:mkdepend
+	cmd:xres
+	"
+
+BUILD()
+{
+	cd sources
+	make OBJ_DIR=objects \
+		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp sources/objects/Recibe $appsDir
+	addAppDeskbarSymlink $appsDir/Recibe
+}

From a583f23662cb143449cd77f8f4b7fcb79121f66b Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Fri, 27 Dec 2013 10:02:09 +0000
Subject: [PATCH 04/23] RemoteControl: Fix DESCRIPTION

---
 haiku-apps/remotecontrol/remotecontrol-1.1.recipe | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
index b0090db97..6501984a1 100644
--- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
+++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
@@ -1,9 +1,9 @@
 SUMMARY="Remote control your Haiku machines with ease!"
 DESCRIPTION="
-	RemoteControl is an application that allows the user
-	to control a remote PC as if he was seating in front of it.
-	It can be useful if you have a PC with no screen,
-	keyboard or mouse connected, or simply if it is too far away.
+	With the Remote Control app, you can control another Haiku computer also
+	running the Remote Control app. The app is able to just view what's
+	on the screen, or also control the computer. This package contains the
+	RCClient client and RCServer server. Both are to be run in the terminal.
 	"
 HOMEPAGE="https://github.com/HaikuArchives/RemoteControl"
 SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29"

From 8b7e7a24bfa00b52968362d50022536d4e5f6d21 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Fri, 27 Dec 2013 10:19:40 +0000
Subject: [PATCH 05/23] Just rewrite it a bit more...

---
 haiku-apps/remotecontrol/remotecontrol-1.1.recipe | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
index 6501984a1..a5cbbc480 100644
--- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
+++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
@@ -1,9 +1,10 @@
 SUMMARY="Remote control your Haiku machines with ease!"
 DESCRIPTION="
 	With the Remote Control app, you can control another Haiku computer also
-	running the Remote Control app. The app is able to just view what's
-	on the screen, or also control the computer. This package contains the
-	RCClient client and RCServer server. Both are to be run in the terminal.
+	running the Remote Control app, no matter where it is.
+	The app is able to just view what's on the screen, or also control the computer. 
+	This package contains the RCClient client and RCServer server.
+	Both are to be run in the terminal.
 	"
 HOMEPAGE="https://github.com/HaikuArchives/RemoteControl"
 SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29"

From 313b29ceba4a315f84afa9641736ac195373ef58 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Thu, 26 Dec 2013 18:28:19 +0000
Subject: [PATCH 06/23] Fixed intltool-0.40.6 recipe to be compatible with
 .recipe format

---
 dev-util/intltool/intltool-0.40.6.recipe | 67 +++++++++++++++++++-----
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/dev-util/intltool/intltool-0.40.6.recipe b/dev-util/intltool/intltool-0.40.6.recipe
index 05eb668c7..c1864ceb3 100644
--- a/dev-util/intltool/intltool-0.40.6.recipe
+++ b/dev-util/intltool/intltool-0.40.6.recipe
@@ -1,25 +1,66 @@
-DESCRIPTION="intltool" 
-HOMEPAGE="http://www.gnome.org/" 
+SUMMARY="intltool is a set of tools to centralize translation of file formats."
+DESCRIPTION="intltool is a set of tools to centralize translation of many different file formats using GNU gettext-compatible PO files.
+
+The intltool collection can be used to do these things:
+
+* Extract translatable strings from various source files (.xml.in,
+glade, .desktop.in, .server.in, .oaf.in).
+
+* Collect the extracted strings together with messages from traditional
+source files (.c, .h) in po/PACKAGE.pot.
+
+* Merge back the translations from .po files into .xml, .desktop and
+oaf files. This merge step will happen at build resp. installation time."
+
+HOMEPAGE="http://freedesktop.org/wiki/Software/intltool"
 SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz"
 CHECKSUM_MD5="8e40f9d1c7308eddbfd24b22cd540631"
-REVISION="2"
-STATUS_HAIKU="stable"
-MESSAGE="Requires XML::Parser perl module installed"
-DEPEND=""
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc."
+
+REVISION="3"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	intltool = $portVersion
+	cmd:intltool_extract$secondaryArchSuffix = $portVersion
+	cmd:intltool_merge$secondaryArchSuffix = $portVersion
+	cmd:intltool_prepare$secondaryArchSuffix = $portVersion
+	cmd:intltool_update$secondaryArchSuffix = $portVersion
+	cmd:intltoolize$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:perl
+	xml_parser
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	xml_parser
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:autoconf
+	"
+
 BUILD()
 {
-	cd intltool-0.40.6
-	./configure --prefix="$(finddir B_COMMON_DIRECTORY)" \
-	--datarootdir="$(finddir B_COMMON_DATA_DIRECTORY)" \
-	--mandir="$(finddir B_COMMON_DOCUMENTATION_DIRECTORY)/man" \
+	runConfigure ./configure
 	make
 }
 
 INSTALL()
 {
-	cd intltool-0.40.6
 	make install
+}
+
+TEST ()
+{
 	make check
 }
-LICENSE="GNU GPL v2"
-COPYRIGHT="1994-1996, 1999-2002, 2004, 2005 Free Software Foundation, Inc."

From c5bb6aeca66099c1e3887e3e5bdf62e002709557 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Fri, 27 Dec 2013 13:15:03 +0000
Subject: [PATCH 07/23] Fixed libevent recipe (it was producing a broken
 symlink and throwed a policy warning when compiling on x86)

---
 dev-libs/libevent/libevent-2.0.21.recipe | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index 9a1b241b8..ca13be77a 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -7,14 +7,14 @@ CHECKSUM_MD5="b2405cc9ebf264aa47ff615d9de527a2"
 LICENSE="BSD (3-clause)"
 COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
 
-REVISION="3"
+REVISION="4"
 
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libevent${secondaryArchSuffix} = ${portVersion}
-	cmd:event_rpcgen.py
+	cmd:event_rpcgen.py$secondaryArchSuffix
 	lib:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
@@ -76,10 +76,11 @@ INSTALL()
 		libevent_pthreads \
 		libevent_openssl
 
-	mv .libs/libevent_core.* \
-		.libs/libevent_extra.* \
-		.libs/libevent_pthreads.* \
-		.libs/libevent_openssl.* \
+	cp .libs/libevent-*.so* \
+		.libs/libevent_core-*.so* \
+		.libs/libevent_extra-*.so* \
+		.libs/libevent_pthreads-*.so* \
+		.libs/libevent_openssl-*.so* \
 		$developLibDir
 	fixPkgconfig
 

From 08e04d1c9f3ff978c89d18c6dbf46fd42d1014af Mon Sep 17 00:00:00 2001
From: noryb009 <noryb009@hotmail.com>
Date: Fri, 27 Dec 2013 02:40:47 -0500
Subject: [PATCH 08/23] Update supported targets for OptiPNGTranslator

Mark x86 and x86_64 as supported targets in OptiPNG and
OptiPNGTranslator.
---
 haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe | 2 +-
 media-gfx/optipng/optipng-0.7.4.recipe                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe
index 4930cc182..bb58c9542 100644
--- a/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe
+++ b/haiku-apps/optipngtranslator/optipngtranslator-0.0.1.recipe
@@ -8,7 +8,7 @@ SRC_URI="git://github.com/noryb009/OptiPNGTranslator.git#8e3996a92d840f3c097cf95
 LICENSE="MIT"
 COPYRIGHT="2013 Luke (noryb009)"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 if [ $buildArchitecture = x86_gcc2 ] && \
 		[ $targetArchitecture = x86_gcc2 ]; then
diff --git a/media-gfx/optipng/optipng-0.7.4.recipe b/media-gfx/optipng/optipng-0.7.4.recipe
index b20530acf..1c7d493a2 100644
--- a/media-gfx/optipng/optipng-0.7.4.recipe
+++ b/media-gfx/optipng/optipng-0.7.4.recipe
@@ -11,7 +11,7 @@ CHECKSUM_MD5="8853d89aaf859065e95dcdf98b6bed73"
 LICENSE="Zlib"
 COPYRIGHT="2001-2012 Cosmin Truta"
 REVISION="2"
-ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	optipng$secondaryArchSuffix = $portVersion

From e2fb3046f87bf6ebf106a76942b265e176f87496 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Fri, 27 Dec 2013 19:05:34 +0000
Subject: [PATCH 09/23] Update license and change website

---
 haiku-apps/remotecontrol/licenses/RemoteControl Unknown | 2 ++
 haiku-apps/remotecontrol/licenses/Unknown               | 1 -
 haiku-apps/remotecontrol/remotecontrol-1.1.recipe       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 haiku-apps/remotecontrol/licenses/RemoteControl Unknown
 delete mode 100644 haiku-apps/remotecontrol/licenses/Unknown

diff --git a/haiku-apps/remotecontrol/licenses/RemoteControl Unknown b/haiku-apps/remotecontrol/licenses/RemoteControl Unknown
new file mode 100644
index 000000000..2ae52a044
--- /dev/null
+++ b/haiku-apps/remotecontrol/licenses/RemoteControl Unknown	
@@ -0,0 +1,2 @@
+There isn't a specific license set, but on BeBits and HaikuWare it says the license is Freeware. HaikuWare and BeBits also have the source when 
+you download it. The official website (http://thomas.thiriez.free.fr/beos/RemoteControl/index.html) also just says "freeware"
diff --git a/haiku-apps/remotecontrol/licenses/Unknown b/haiku-apps/remotecontrol/licenses/Unknown
deleted file mode 100644
index 6f00e7a6b..000000000
--- a/haiku-apps/remotecontrol/licenses/Unknown
+++ /dev/null
@@ -1 +0,0 @@
-The license is nowhere noted, but on BeBits and HaikuWare it says the license is Freeware.
diff --git a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
index a5cbbc480..24a2c4370 100644
--- a/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
+++ b/haiku-apps/remotecontrol/remotecontrol-1.1.recipe
@@ -6,10 +6,10 @@ DESCRIPTION="
 	This package contains the RCClient client and RCServer server.
 	Both are to be run in the terminal.
 	"
-HOMEPAGE="https://github.com/HaikuArchives/RemoteControl"
+HOMEPAGE="http://thomas.thiriez.free.fr/beos/RemoteControl/index.html"
 SRC_URI="git://github.com/HaikuArchives/RemoteControl#c59e89e3643e4693a75e5b5456596533d068cc29"
 REVISION="1"
-LICENSE="Unknown"
+LICENSE="RemoteControl Unknown"
 COPYRIGHT="2001 Thomas Thiriez"
 
 ARCHITECTURES="x86 x86_gcc2"

From 3f14b4c88b89ca79cc3b6b17b009f2651cef83ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 27 Dec 2013 21:50:21 +0100
Subject: [PATCH 10/23] jamvm: Update recipe

---
 dev-java/jamvm/jamvm-1.5.4.recipe | 54 ++++++++++++++++++++++++-------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe
index 771a21d35..2308cea60 100644
--- a/dev-java/jamvm/jamvm-1.5.4.recipe
+++ b/dev-java/jamvm/jamvm-1.5.4.recipe
@@ -1,28 +1,60 @@
-DESCRIPTION="JamVM" 
-HOMEPAGE="http://jamvm.sourceforge.net" 
+SUMMARY="JamVM"
+DESCRIPTION="JamVM is a new Java Virtual Machine which conforms to the JVM specification version 2 (blue book).
+	In comparison to most other VM's (free and commercial) it is extremely small,"
+HOMEPAGE="http://jamvm.sourceforge.net/" 
 SRC_URI="http://sourceforge.net/projects/jamvm/files/jamvm/JamVM%201.5.4/jamvm-1.5.4.tar.gz/download"
 REVISION="1"
-STATUS_HAIKU="stable"
 DEPEND=""
 CHECKSUM_MD5="7654e9657691f5f09c4f481ed4686176"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
+LICENSE="GNU GPL v2"
+COPYRIGHT="2003-2010 Robert Lougher"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	jamvm$secondaryArchSuffix = $portVersion
+	cmd:jamvm$secondaryArchSuffix = $portVersion
+	lib:libjvm_x86
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:aclocal
+	cmd:libtool
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+
+PATCHES="jamvm-1.5.4.patch"
 
 BUILD()
 {
-	cd jamvm-1.5.4
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--with-classpath-install-dir=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure \
+		--with-classpath-install-dir=
 	make
 }
 
 INSTALL()
 {
-	cd jamvm-1.5.4
 	make install
+	prepareInstalledDevelLibs
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="2003-2010 Robert Lougher"

From 4d5c0e3c569e3bcfe1df4933814fcfff2268b0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 27 Dec 2013 22:06:39 +0100
Subject: [PATCH 11/23] jamvm: Fix devel libs

---
 dev-java/jamvm/jamvm-1.5.4.recipe | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-java/jamvm/jamvm-1.5.4.recipe b/dev-java/jamvm/jamvm-1.5.4.recipe
index 2308cea60..e402dfc2f 100644
--- a/dev-java/jamvm/jamvm-1.5.4.recipe
+++ b/dev-java/jamvm/jamvm-1.5.4.recipe
@@ -22,7 +22,8 @@ SECONDARY_ARCHITECTURES="x86"
 PROVIDES="
 	jamvm$secondaryArchSuffix = $portVersion
 	cmd:jamvm$secondaryArchSuffix = $portVersion
-	lib:libjvm_x86
+	lib:libjvm$secondaryArchSuffix
+	devel:libjvm$secondaryArchSuffix
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -56,5 +57,5 @@ BUILD()
 INSTALL()
 {
 	make install
-	prepareInstalledDevelLibs
+	prepareInstalledDevelLib libjvm
 }

From 8e1c7cbcaa936193acdb024e1a4ff15c609fc221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 28 Dec 2013 09:22:20 +0100
Subject: [PATCH 12/23] recibe: Fix recipe (EOF due to backtick in description)

---
 haiku-apps/recibe/recibe-1.0b1.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe
index 9ae0fd70d..3d3516d93 100644
--- a/haiku-apps/recibe/recibe-1.0b1.recipe
+++ b/haiku-apps/recibe/recibe-1.0b1.recipe
@@ -5,7 +5,7 @@ DESCRIPTION="
 	around 52,000 different recipes for you to try.
 	
 	If you download the recipe database, place it inside your settings
-	directory, which is likely `/boot/home/config/settings/' .
+	directory, which is likely '/boot/home/config/settings/' .
 	"
 HOMEPAGE="https://github.com/HaikuArchives/Recibe"
 SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad"

From f754c72bb96d072527eefe13baa279134143d8fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 28 Dec 2013 09:55:15 +0100
Subject: [PATCH 13/23] getconf: Add recipe to build the FreeBSD getconf

We provide a makefile-engine makefile as a patch since
the existing makefile requires FreeBSD's buildsystem.
---
 sys-apps/getconf/getconf-r260000.recipe       |  46 +++++
 .../getconf/patches/getconf-makefile.patch    | 177 ++++++++++++++++++
 2 files changed, 223 insertions(+)
 create mode 100644 sys-apps/getconf/getconf-r260000.recipe
 create mode 100644 sys-apps/getconf/patches/getconf-makefile.patch

diff --git a/sys-apps/getconf/getconf-r260000.recipe b/sys-apps/getconf/getconf-r260000.recipe
new file mode 100644
index 000000000..b307ae299
--- /dev/null
+++ b/sys-apps/getconf/getconf-r260000.recipe
@@ -0,0 +1,46 @@
+SUMMARY="Prints out values of POSIX configuration variables"
+DESCRIPTION="FreeBSD getconf
+
+	The getconf command prints values of system configuration variables.
+	It is a command interface to the values returned by sysconf(3), confstr(3), and pathconf(3)."
+HOMEPAGE="http://www.freebsd.org/"
+COPYRIGHT="2000 Massachusetts Institute of Technology"
+LICENSE="MIT"
+SRC_URI="svn+http://svn.freebsd.org/base/head/usr.bin/getconf#260000"
+#CHECKSUM_MD5=""
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="getconf-makefile.patch"
+
+PROVIDES="
+	getconf = $portVersion
+	cmd:getconf = $portVersion
+"
+REQUIRES="
+	haiku >= $haikuVersion
+"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:mkdepend
+	cmd:gcc
+	cmd:make
+"
+
+BUILD()
+{
+	export COPYRIGHT
+	export LICENSE
+	export PORT_VERSION=$portVersion
+	make -f makefile.haiku $jobArgs
+}
+
+INSTALL()
+{
+	make -f makefile.haiku install INSTALL_DIR=$binDir
+	mkdir -p $manDir/man1
+	install -m 644 getconf.1 $manDir/man1/
+}
diff --git a/sys-apps/getconf/patches/getconf-makefile.patch b/sys-apps/getconf/patches/getconf-makefile.patch
new file mode 100644
index 000000000..62d05bc28
--- /dev/null
+++ b/sys-apps/getconf/patches/getconf-makefile.patch
@@ -0,0 +1,177 @@
+From 0ad9f5b07a4d3734402efb6519a5778f9fc18b20 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
+Date: Sat, 28 Dec 2013 09:49:05 +0100
+Subject: [PATCH] Add Haiku makefile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: François Revol <revol@free.fr>
+---
+ makefile.haiku | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 154 insertions(+)
+ create mode 100644 makefile.haiku
+
+diff --git a/makefile.haiku b/makefile.haiku
+new file mode 100644
+index 0000000..ed83568
+--- /dev/null
++++ b/makefile.haiku
+@@ -0,0 +1,154 @@
++%.c: %.gperf
++	LC_ALL=C awk -f ${CURDIR}/fake-gperf.awk $< >$@
++
++GENSRC=confstr.c limits.c pathconf.c progenv.c sysconf.c
++
++## BeOS Generic Makefile v2.5 ##
++
++## Fill in this file to specify the project being created, and the referenced
++## makefile-engine will do all of the hard work for you.  This handles both
++## Intel and PowerPC builds of the BeOS and Haiku.
++
++## Application Specific Settings ---------------------------------------------
++
++# specify the name of the binary
++NAME= getconf
++
++# specify the type of binary
++#	APP:	Application
++#	SHARED:	Shared library or add-on
++#	STATIC:	Static library archive
++#	DRIVER: Kernel Driver
++TYPE= APP
++
++# 	if you plan to use localization features 
++# 	specify the application MIME siganture
++APP_MIME_SIG= 
++
++#	add support for new Pe and Eddie features
++#	to fill in generic makefile
++
++#%{
++# @src->@ 
++
++#	specify the source files to use
++#	full paths or paths relative to the makefile can be included
++# 	all files, regardless of directory, will have their object
++#	files created in the common object directory.
++#	Note that this means this makefile will not work correctly
++#	if two source files with the same name (source.c or source.cpp)
++#	are included from different directories.  Also note that spaces
++#	in folder names do not work well with this makefile.
++SRCS= getconf.c $(GENSRC)
++
++#	specify the resource definition files to use
++#	full path or a relative path to the resource file can be used.
++RDEFS= 
++	
++#	specify the resource files to use. 
++#	full path or a relative path to the resource file can be used.
++#	both RDEFS and RSRCS can be defined in the same makefile.
++RSRCS= 
++
++# @<-src@ 
++#%}
++
++#	end support for Pe and Eddie
++
++#	specify additional libraries to link against
++#	there are two acceptable forms of library specifications
++#	-	if your library follows the naming pattern of:
++#		libXXX.so or libXXX.a you can simply specify XXX
++#		library: libbe.so entry: be
++#
++#	-	for version-independent linking of standard C++ libraries please add
++#		$(STDCPPLIBS) instead of raw "stdc++[.r4] [supc++]" library names
++#
++#	-	for localization support add following libs:
++#		locale localestub
++#		
++#	- 	if your library does not follow the standard library
++#		naming scheme you need to specify the path to the library
++#		and it's name
++#		library: my_lib.a entry: my_lib.a or path/my_lib.a
++LIBS= bsd
++
++#	specify additional paths to directories following the standard
++#	libXXX.so or libXXX.a naming scheme.  You can specify full paths
++#	or paths relative to the makefile.  The paths included may not
++#	be recursive, so include all of the paths where libraries can
++#	be found.  Directories where source files are found are
++#	automatically included.
++LIBPATHS= 
++
++#	additional paths to look for system headers
++#	thes use the form: #include <header>
++#	source file directories are NOT auto-included here
++SYSTEM_INCLUDE_PATHS = 
++
++#	additional paths to look for local headers
++#	thes use the form: #include "header"
++#	source file directories are automatically included
++LOCAL_INCLUDE_PATHS = 
++
++#	specify the level of optimization that you desire
++#	NONE, SOME, FULL
++OPTIMIZE= 
++
++# 	specify here the codes for languages you are going
++# 	to support in this application. The default "en"
++# 	one must be provided too. "make catkeys" will recreate only
++# 	locales/en.catkeys file. Use it as template for creating other
++# 	languages catkeys. All localization files must be placed
++# 	in "locales" sub-directory.
++LOCALES=
++
++#	specify any preprocessor symbols to be defined.  The symbols will not
++#	have their values set automatically; you must supply the value (if any)
++#	to use.  For example, setting DEFINES to "DEBUG=1" will cause the
++#	compiler option "-DDEBUG=1" to be used.  Setting DEFINES to "DEBUG"
++#	would pass "-DDEBUG" on the compiler's command line.
++DEFINES= 
++
++#	specify special warning levels
++#	if unspecified default warnings will be used
++#	NONE = supress all warnings
++#	ALL = enable all warnings
++WARNINGS = 
++
++#	specify whether image symbols will be created
++#	so that stack crawls in the debugger are meaningful
++#	if TRUE symbols will be created
++SYMBOLS = 
++
++#	specify debug settings
++#	if TRUE will allow application to be run from a source-level
++#	debugger.  Note that this will disable all optimzation.
++DEBUGGER = 
++
++#	specify additional compiler flags for all files
++COMPILER_FLAGS =
++
++#	specify additional linker flags
++LINKER_FLAGS =
++
++#	specify the version of this particular item
++#	(for example, -app 3 4 0 d 0 -short 340 -long "340 "`echo -n -e '\302\251'`"1999 GNU GPL") 
++#	This may also be specified in a resource.
++APP_VERSION = -long "$PORT_VERSION "`echo -n -e '\302\251'`"$COPYRIGHT ($LICENSE license)"
++
++#	(for TYPE == DRIVER only) Specify desired location of driver in the /dev
++#	hierarchy. Used by the driverinstall rule. E.g., DRIVER_PATH = video/usb will
++#	instruct the driverinstall rule to place a symlink to your driver's binary in
++#	~/add-ons/kernel/drivers/dev/video/usb, so that your driver will appear at
++#	/dev/video/usb when loaded. Default is "misc".
++DRIVER_PATH = 
++
++## include the makefile-engine
++DEVEL_DIRECTORY := \
++	$(shell findpaths -r "makefile_engine" B_FIND_PATH_DEVELOP_DIRECTORY)
++include $(DEVEL_DIRECTORY)/etc/makefile-engine
++
++clean :: FORCE
++	rm -r $(GENSRC)
++
+-- 
+1.8.3.4
+

From 13883e78b6a7891057b9b12a393b6e1305227e6d Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Fri, 27 Dec 2013 14:06:33 +0000
Subject: [PATCH 14/23] Transmission 2.82 recipe and patch

---
 .../patches/transmission-2.82.patch           | 108 ++++++++++++++++++
 net-p2p/transmission/transmission-2.82.recipe | 104 +++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 net-p2p/transmission/patches/transmission-2.82.patch
 create mode 100644 net-p2p/transmission/transmission-2.82.recipe

diff --git a/net-p2p/transmission/patches/transmission-2.82.patch b/net-p2p/transmission/patches/transmission-2.82.patch
new file mode 100644
index 000000000..d874f536a
--- /dev/null
+++ b/net-p2p/transmission/patches/transmission-2.82.patch
@@ -0,0 +1,108 @@
+diff -ur transmission-2.82/libtransmission/platform-quota.c transmission-2.82-haiku/libtransmission/platform-quota.c
+--- transmission-2.82/libtransmission/platform-quota.c	2013-08-09 02:45:44.822345728 +0000
++++ transmission-2.82-haiku/libtransmission/platform-quota.c	2013-12-27 10:29:53.872415232 +0000
+@@ -16,7 +16,7 @@
+ #include <unistd.h> /* getuid() */
+ #include <event2/util.h> /* evutil_ascii_strcasecmp () */
+ 
+-#ifndef WIN32
++#if !defined(WIN32) && !defined(__HAIKU__)
+  #include <sys/types.h> /* types needed by quota.h */
+  #if defined(__FreeBSD__) || defined(__OpenBSD__)
+   #include <ufs/ufs/quota.h> /* quotactl() */
+@@ -67,7 +67,7 @@
+ ****
+ ***/
+ 
+-#ifndef WIN32
++#if !defined(WIN32) && !defined(__HAIKU__)
+ static const char *
+ getdev (const char * path)
+ {
+@@ -300,7 +300,7 @@
+ {
+   int64_t ret = -1;
+ 
+-#ifndef WIN32
++#if !defined(WIN32) && !defined(__HAIKU__)
+ 
+   if (info->fstype && !evutil_ascii_strcasecmp(info->fstype, "xfs"))
+     {
+@@ -347,7 +347,7 @@
+ 
+   info = tr_new0 (struct tr_device_info, 1);
+   info->path = tr_strdup (path);
+-#ifndef WIN32
++#if !defined(WIN32) && !defined(__HAIKU__)
+   info->device = tr_strdup (getblkdev (path));
+   info->fstype = tr_strdup (getfstype (path));
+ #endif
+diff -ur transmission-2.82/third-party/miniupnp/connecthostport.c transmission-2.82-haiku/third-party/miniupnp/connecthostport.c
+--- transmission-2.82/third-party/miniupnp/connecthostport.c	2013-08-09 02:47:50.398196736 +0000
++++ transmission-2.82-haiku/third-party/miniupnp/connecthostport.c	2013-12-27 10:30:00.589037568 +0000
+@@ -24,6 +24,7 @@
+ #else /* #ifdef _WIN32 */
+ #include <unistd.h>
+ #include <sys/param.h>
++#include <sys/select.h>
+ #include <errno.h>
+ #define closesocket close
+ #include <netdb.h>
+diff -ur transmission-2.82/third-party/miniupnp/miniupnpc.c transmission-2.82-haiku/third-party/miniupnp/miniupnpc.c
+--- transmission-2.82/third-party/miniupnp/miniupnpc.c	2013-08-09 02:47:50.894435328 +0000
++++ transmission-2.82-haiku/third-party/miniupnp/miniupnpc.c	2013-12-27 10:30:00.625737728 +0000
+@@ -17,7 +17,7 @@
+ #endif
+ #endif
+ 
+-#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun)
++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(MACOSX) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__HAIKU__)
+ #define HAS_IP_MREQN
+ #endif
+ 
+diff -ur transmission-2.82/third-party/miniupnp/portlistingparse.c transmission-2.82-haiku/third-party/miniupnp/portlistingparse.c
+--- transmission-2.82/third-party/miniupnp/portlistingparse.c	2013-08-09 02:47:50.074186752 +0000
++++ transmission-2.82-haiku/third-party/miniupnp/portlistingparse.c	2013-12-27 10:30:00.638582784 +0000
+@@ -28,7 +28,7 @@
+ 
+ /* Helper function */
+ static UNSIGNED_INTEGER
+-atoui(const char * p, int l)
++my_atoui(const char * p, int l)
+ {
+ 	UNSIGNED_INTEGER r = 0;
+ 	while(l > 0 && *p)
+@@ -92,7 +92,7 @@
+ 		pm->remoteHost[l] = '\0';
+ 		break;
+ 	case NewExternalPort:
+-		pm->externalPort = (unsigned short)atoui(data, l);
++		pm->externalPort = (unsigned short)my_atoui(data, l);
+ 		break;
+ 	case NewProtocol:
+ 		if(l > 3)
+@@ -101,21 +101,21 @@
+ 		pm->protocol[l] = '\0';
+ 		break;
+ 	case NewInternalPort:
+-		pm->internalPort = (unsigned short)atoui(data, l);
++		pm->internalPort = (unsigned short)my_atoui(data, l);
+ 		break;
+ 	case NewInternalClient:
+ 		memcpy(pm->internalClient, data, l);
+ 		pm->internalClient[l] = '\0';
+ 		break;
+ 	case NewEnabled:
+-		pm->enabled = (unsigned char)atoui(data, l);
++		pm->enabled = (unsigned char)my_atoui(data, l);
+ 		break;
+ 	case NewDescription:
+ 		memcpy(pm->description, data, l);
+ 		pm->description[l] = '\0';
+ 		break;
+ 	case NewLeaseTime:
+-		pm->leaseTime = atoui(data, l);
++		pm->leaseTime = my_atoui(data, l);
+ 		break;
+ 	default:
+ 		break;
diff --git a/net-p2p/transmission/transmission-2.82.recipe b/net-p2p/transmission/transmission-2.82.recipe
new file mode 100644
index 000000000..f6e3acec1
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.82.recipe
@@ -0,0 +1,104 @@
+SUMMARY="Transmission is a cross-platform open source BitTorrent client"
+DESCRIPTION="Transmission is a cross-platform BitTorrent client that is:
+
+Open Source.
+
+Transmission is an open source, volunteer-based project. Unlike some BitTorrent clients, Transmission doesn't play games with its users to make money:
+
+Transmission doesn't bundle toolbars, pop-up ads, flash ads, twitter tools, or anything else.
+It doesn't hold some feaures back for a payware version.
+Its source code is available for anyone to review.
+We don't track our users, and our website and forums have no third-party ads or analytics.
+
+Easy.
+
+Transmission is designed for easy, powerful use. We've set the defaults to Just Work and it only takes a few clicks to configure advanced features like watch directories, bad peer blocklists, and the web interface.
+
+Lean.
+
+In separate benchmarks, Linux Format and Lacrocivious both found Transmission to use less CPU than any other GUI client. It even used less CPU than some non-GUI clients.
+
+Transmission also has the lowest memory footprint of any major BitTorrent client.
+
+Imageshack chose Transmission for its BitTorrent farms because the competition requires amounts of memory several times greater than Transmission.
+
+Transmission's small footprint is one reason why many home device manufacturers, such as FON, Belkin, and Networked Media Tank ship with Transmission. When Belkin and Vuze Inc. partnered to write a Torrent Genie to let people who ran Vuze and owned a Belkin router keep sharing files even when Vuze wasn't running, they decided to use Transmission -- not Vuze's own BitTorrent client -- on the router.
+
+Native.
+
+Unlike many cross-platform applications, Transmission integrates seamlessly with your operating system.
+
+Powerful.
+
+Transmission has the features you want from a BitTorrent client: encryption, a web interface, peer exchange, magnet links, DHT, µTP, UPnP and NAT-PMP port forwarding, webseed support, watch directories, tracker editing, global and per-torrent speed limits, and more."
+
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="https://transmission.cachefly.net/transmission-2.82.tar.xz"
+CHECKSUM_MD5="a5ef870c0410b12d10449c2d36fa4661"
+
+REVISION="1"
+
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
+
+PROVIDES="
+    transmission = $portVersion
+    cmd:transmission_cli$secondaryArchSuffix
+    cmd:transmission_create$secondaryArchSuffix
+    cmd:transmission_daemon$secondaryArchSuffix
+    cmd:transmission_edit$secondaryArchSuffix
+    cmd:transmission_remote$secondaryArchSuffix
+    cmd:transmission_show$secondaryArchSuffix
+    "
+REQUIRES="
+    haiku$secondaryArchSuffix >= $haikuVersion
+    lib:libssl$secondaryArchSuffix
+    lib:libcrypto$secondaryArchSuffix
+    lib:libcurl$secondaryArchSuffix
+    lib:libevent$secondaryArchSuffix
+    lib:libiconv$secondaryArchSuffix
+    lib:libintl$secondaryArchSuffix
+    lib:libz$secondaryArchSuffix
+    "
+BUILD_REQUIRES="
+    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+    devel:libssl$secondaryArchSuffix
+    devel:libcurl$secondaryArchSuffix
+    devel:libz$secondaryArchSuffix
+    devel:libevent$secondaryArchSuffix
+    devel:libiconv$secondaryArchSuffix
+    devel:libgettextlib$secondaryArchSuffix >= 0.14.1
+    intltool >= 0.40
+    "
+BUILD_PREREQUIRES="
+    cmd:gcc$secondaryArchSuffix
+    cmd:ld$secondaryArchSuffix
+    cmd:pkg_config$secondaryArchSuffix
+    cmd:make
+    "
+
+LICENSE="Transmission
+        MIT
+        GNU GPL v2
+        "
+COPYRIGHT="2005-2013. All code is copyrighted by the respective authors."
+
+PATCHES="transmission-2.82.patch"
+
+BUILD()
+{
+    runConfigure ./configure --without-gtk --datadir=$dataDir
+    make
+}
+
+INSTALL()
+{
+    make install
+}

From b15e9432673f95ceb5084f67cc431e8c94653dec Mon Sep 17 00:00:00 2001
From: Mrowqa <artur.jamro@gmail.com>
Date: Sat, 28 Dec 2013 14:21:37 +0100
Subject: [PATCH 15/23] Added cleaned recipe for neverball

---
 games-puzzle/neverball/neverball-1.5.4.recipe | 72 +++++++++++++++++++
 .../neverball/patches/neverball-1.5.4.patch   | 13 ++++
 2 files changed, 85 insertions(+)
 create mode 100644 games-puzzle/neverball/neverball-1.5.4.recipe
 create mode 100644 games-puzzle/neverball/patches/neverball-1.5.4.patch

diff --git a/games-puzzle/neverball/neverball-1.5.4.recipe b/games-puzzle/neverball/neverball-1.5.4.recipe
new file mode 100644
index 000000000..0320cce4a
--- /dev/null
+++ b/games-puzzle/neverball/neverball-1.5.4.recipe
@@ -0,0 +1,72 @@
+DESCRIPTION="
+	Neverball is part puzzle game, part action game, and entirely a test
+	of skill. Tilt the floor to roll a ball through an obstacle course
+	before time runs out.
+	"
+SUMMARY="Tilt the floor to roll a ball through an course before time runs out."
+HOMEPAGE="http://neverball.org"
+COPYRIGHT="2002-2010 The Neverball Team"
+LICENSE="GNU GPL v2"
+SRC_URI="http://neverball.org/neverball-1.5.4.tar.gz"
+CHECKSUM_MD5="c523b0f72c2035831310e821162f7bd7"
+REVISION="1"
+ARCHITECTURES="x86 ?x86_64"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
+PATCHES="neverball-1.5.4.patch"
+
+PROVIDES="
+	neverball$secondaryArchSuffix = $portVersion
+	app:neverball$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libphysfs$secondaryArchSuffix
+	lib:libsdl$secondaryArchSuffix
+	lib:libsdl_mixer$secondaryArchSuffix
+	lib:libsdl_ttf$secondaryArchSuffix
+	lib:libvorbis$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	
+	lib:libpng$secondaryArchSuffix
+	lib:libjpeg$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libphysfs$secondaryArchSuffix
+	devel:libsdl$secondaryArchSuffix
+	devel:libsdl_mixer$secondaryArchSuffix
+	devel:libsdl_ttf$secondaryArchSuffix
+	devel:libvorbis$secondaryArchSuffix
+	
+	devel:libpng$secondaryArchSuffix
+	devel:libjpeg$secondaryArchSuffix
+	devel:libogg$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	gettext$secondaryArchSuffix # it's needed
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:libpng_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/neverball
+	cp -rf neverball neverputt mapc README COPYING CHANGES data $appsDir/neverball
+	addAppDeskbarSymlink $appsDir/neverball/neverball
+}
diff --git a/games-puzzle/neverball/patches/neverball-1.5.4.patch b/games-puzzle/neverball/patches/neverball-1.5.4.patch
new file mode 100644
index 000000000..60a118e94
--- /dev/null
+++ b/games-puzzle/neverball/patches/neverball-1.5.4.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index a22fed1..e095a3a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -111,7 +111,7 @@ ifeq ($(ENABLE_WII),1)
+     TILT_LIBS := -lcwiimote -lbluetooth
+ endif
+ 
+-OGL_LIBS := -lGL -lm
++OGL_LIBS := -lGL -lintl
+ 
+ ifdef MINGW
+     ifneq ($(ENABLE_NLS),0)

From 833029bbb08981d11d53f2cdf41a27ee7bca2450 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Sat, 28 Dec 2013 13:39:09 +0000
Subject: [PATCH 16/23] Fixed more policy warnings and added cmd:python to
 REQUIRES and BUILD_PREREQUIRES for libevent

---
 dev-libs/libevent/libevent-2.0.21.recipe | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index ca13be77a..e8ffed740 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -30,6 +30,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	lib:libssl$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
+	cmd:python
 	"
 #	haiku${secondaryArchSuffix} doesn't define included libraries yet
 #	lib:libnetwork$secondaryArchSuffix >= $haikuVersion
@@ -48,6 +49,7 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
+	cmd:python
 	"
 SOURCE_DIR="libevent-${portVersion}-stable"
 
@@ -100,6 +102,7 @@ PROVIDES_devel="
 	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	devel:libevent$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
 	devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5	

From cef0053f87bd85b712c4024a244c3590cf5b2e99 Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Sat, 28 Dec 2013 23:24:16 +0000
Subject: [PATCH 17/23] Added tor 0.2.4.20 recipe

---
 net-misc/tor/licenses/Tor        | 141 +++++++++++++++++++++++++++++++
 net-misc/tor/tor-0.2.4.20.recipe |  73 ++++++++++++++++
 2 files changed, 214 insertions(+)
 create mode 100644 net-misc/tor/licenses/Tor
 create mode 100644 net-misc/tor/tor-0.2.4.20.recipe

diff --git a/net-misc/tor/licenses/Tor b/net-misc/tor/licenses/Tor
new file mode 100644
index 000000000..4ed3bd8da
--- /dev/null
+++ b/net-misc/tor/licenses/Tor
@@ -0,0 +1,141 @@
+                    This file contains the license for Tor,
+        a free software project to provide anonymity on the Internet.
+
+        It also lists the licenses for other components used by Tor.
+
+       For more information about Tor, see https://www.torproject.org/.
+
+             If you got this file as a part of a larger bundle,
+        there may be other license terms that you should be aware of.
+
+===============================================================================
+Tor is distributed under this license:
+
+Copyright (c) 2001-2004, Roger Dingledine
+Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
+Copyright (c) 2007-2013, The Tor Project, Inc.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+
+    * Neither the names of the copyright owners nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
+src/ext/strlcat.c and src/ext/strlcpy.c by Todd C. Miller are licensed
+under the following license:
+
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
+src/ext/tor_queue.h is licensed under the following license:
+
+ * Copyright (c) 1991, 1993
+ *      The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+
+===============================================================================
+src/config/geoip is licensed under the following license:
+
+OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
+
+Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
+
+All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgment:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+
+Redistribution and use with or without modification, are permitted provided
+that the following conditions are met:
+1. Redistributions must retain the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+2. All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgement:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+3. "MaxMind" may not be used to endorse or promote products derived from this
+database without specific prior written permission.
+
+THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+===============================================================================
+If you got Tor as a static binary with OpenSSL included, then you should know:
+ "This product includes software developed by the OpenSSL Project
+ for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+===============================================================================
diff --git a/net-misc/tor/tor-0.2.4.20.recipe b/net-misc/tor/tor-0.2.4.20.recipe
new file mode 100644
index 000000000..416a8dff6
--- /dev/null
+++ b/net-misc/tor/tor-0.2.4.20.recipe
@@ -0,0 +1,73 @@
+SUMMARY="A virtual layer that helps you improve privacy and anonymity"
+DESCRIPTION="Tor is a network of virtual tunnels that allows people and groups to improve their privacy and security on the Internet. It also enables software developers to create new communication tools with built-in privacy features. Tor provides the foundation for a range of applications that allow organizations and individuals to share information over public networks without compromising their privacy.
+
+Individuals use Tor to keep websites from tracking them and their family members, or to connect to news sites, instant messaging services, or the like when these are blocked by their local Internet providers. Tor's hidden services let users publish web sites and other services without needing to reveal the location of the site. Individuals also use Tor for socially sensitive communication: chat rooms and web forums for rape and abuse survivors, or people with illnesses.
+
+Journalists use Tor to communicate more safely with whistleblowers and dissidents. Non-governmental organizations (NGOs) use Tor to allow their workers to connect to their home website while they're in a foreign country, without notifying everybody nearby that they're working with that organization.
+
+Groups such as Indymedia recommend Tor for safeguarding their members' online privacy and security. Activist groups like the Electronic Frontier Foundation (EFF) recommend Tor as a mechanism for maintaining civil liberties online. Corporations use Tor as a safe way to conduct competitive analysis, and to protect sensitive procurement patterns from eavesdroppers. They also use it to replace traditional VPNs, which reveal the exact amount and timing of communication. Which locations have employees working late? Which locations have employees consulting job-hunting websites? Which research divisions are communicating with the company's patent lawyers?
+
+A branch of the U.S. Navy uses Tor for open source intelligence gathering, and one of its teams used Tor while deployed in the Middle East recently. Law enforcement uses Tor for visiting or surveilling web sites without leaving government IP addresses in their web logs, and for security during sting operations.
+
+The variety of people who use Tor is actually part of what makes it so secure. Tor hides you among the other users on the network, so the more populous and diverse the user base for Tor is, the more your anonymity will be protected."
+
+HOMEPAGE="https://www.torproject.org"
+SRC_URI="https://www.torproject.org/dist/tor-0.2.4.20.tar.gz"
+CHECKSUM_MD5="a8cd8e3b3a3f6a7770f2c22d280f19b8"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	tor = $portVersion
+	cmd:tor$secondaryArchSuffix
+	cmd:tor_gencert$secondaryArchSuffix
+	cmd:tor_resolve$secondaryArchSuffix
+	cmd:torify$secondaryArchSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libevent$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libevent$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+	
+LICENSE="Tor"
+COPYRIGHT="
+	2001-2004, Roger Dingledine
+	2004-2006, Roger Dingledine, Nick Mathewson
+	2007-2013, The Tor Project, Inc.
+	"
+
+USER_SETTINGS_FILES="
+	settings/tor directory
+	"
+	
+GLOBAL_WRITABLE_FILES="
+	settings/tor/torrc.sample auto-merge
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make	
+}
+
+INSTALL()
+{
+	make install	
+}

From f297bf2782a3eaa21246463cf1376549212ab7a8 Mon Sep 17 00:00:00 2001
From: noryb009 <noryb009@hotmail.com>
Date: Sun, 29 Dec 2013 01:25:13 -0500
Subject: [PATCH 18/23] Update recibe's recipe

Update recibe's recipe to include the recipe database.
---
 .../install_recipes_database.sh               | 22 +++++++++++++++
 haiku-apps/recibe/recibe-1.0b1.recipe         | 27 +++++++++++++++----
 2 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100755 haiku-apps/recibe/additional-files/install_recipes_database.sh

diff --git a/haiku-apps/recibe/additional-files/install_recipes_database.sh b/haiku-apps/recibe/additional-files/install_recipes_database.sh
new file mode 100755
index 000000000..4bbcf677c
--- /dev/null
+++ b/haiku-apps/recibe/additional-files/install_recipes_database.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+settingsDir="$(finddir B_USER_SETTINGS_DIRECTORY)"
+
+recibeSysDataDir="$(finddir B_SYSTEM_DATA_DIRECTORY)"
+recibeUserDataDir="$(finddir B_USER_DATA_DIRECTORY)"
+recibesFileBase="recibe/recipes.db.zip"
+
+if [ -f "$settingsDir/recipes.db" ]; then
+	exit 0 # already have a recipes database
+fi
+
+if [ -f "$recibeSysDataDir/$recibesFileBase" ]; then
+	recipesZipFile="$recibeSysDataDir/$recibesFileBase"
+elif [ -f "$recibeUserDataDir/$recibesFileBase" ]; then
+	recipesZipFile="$recibeUserDataDir/$recibesFileBase"
+else
+	exit 1 # couldn't find recipes.db
+fi
+
+cd "$settingsDir"
+unzip "$recipesZipFile"
diff --git a/haiku-apps/recibe/recibe-1.0b1.recipe b/haiku-apps/recibe/recibe-1.0b1.recipe
index 3d3516d93..aa060dc2f 100644
--- a/haiku-apps/recibe/recibe-1.0b1.recipe
+++ b/haiku-apps/recibe/recibe-1.0b1.recipe
@@ -1,19 +1,22 @@
 SUMMARY="A cooking recipe manager"
 DESCRIPTION="
 	Recibe, written by DarkWyrm, is a cooking recipe manager. The 
-	database, which needs to be downloaded separately, includes
-	around 52,000 different recipes for you to try.
-	
-	If you download the recipe database, place it inside your settings
-	directory, which is likely '/boot/home/config/settings/' .
+	included database contains around 52,000 different recipes for
+	you to try.
 	"
 HOMEPAGE="https://github.com/HaikuArchives/Recibe"
 SRC_URI="git://github.com/HaikuArchives/Recibe.git#c1d5a57264d8964a2592bc9b43588b3430bd48ad"
+SRC_URI_2="http://ports-space.haiku-files.org/recibe/recipes.db.zip#noarchive"
+CHECKSUM_MD5_2="1dda608c90b426521b69ab51311f0f15"
 LICENSE="MIT"
 COPYRIGHT="2007 DarkWyrm"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
+ADDITIONAL_FILES="
+	install_recipes_database.sh
+	"
+
 PROVIDES="
 	recibe = $portVersion
 	app:recibe = $portVersion
@@ -37,6 +40,14 @@ BUILD_PREREQUIRES="
 	cmd:xres
 	"
 
+USER_SETTINGS_FILES="
+	settings/recipes.db
+	settings/Recibe_favorites
+	"
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/install_recipes_database.sh
+	"
+
 BUILD()
 {
 	cd sources
@@ -49,4 +60,10 @@ INSTALL()
 	mkdir -p $appsDir
 	cp sources/objects/Recibe $appsDir
 	addAppDeskbarSymlink $appsDir/Recibe
+	
+	mkdir -p $dataDir/recibe
+	cp $sourceDir2/recipes.db.zip $dataDir/recibe
+	
+	mkdir -p $postInstallDir
+	cp $portDir/additional-files/install_recipes_database.sh $postInstallDir
 }

From 54479651f4c661e1b6f854e94f52b0eb618c76b3 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 29 Dec 2013 01:07:08 -0700
Subject: [PATCH 19/23] Fix bzip2 library location and symlinks

* Move the static library to $libDir on secondary arch builds

* Create libbz2.so symlink so things can actually find/use the shared lib

* Remove $binDir and $manDir on secondary arch builds
  The bin commands were already excluded from the package because of
  where they were installed.  This just gets rid of the policy warning
---
 app-arch/bzip2/bzip2-1.0.6.recipe | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe
index f9ffdcfcb..9cdb5608f 100644
--- a/app-arch/bzip2/bzip2-1.0.6.recipe
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -5,7 +5,7 @@ LICENSE="bzip2"
 COPYRIGHT="1996-2010 Julian R Seward"
 SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
 CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
-REVISION="4"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
@@ -57,8 +57,15 @@ INSTALL()
 	make install PREFIX=$prefix
 
 	mkdir -p $libDir
+
+	#move the static library to the right dir for secondary arch builds
+	if [ -n "$secondaryArchSuffix" ];then
+		mv $prefix/lib/libbz2.a $libDir
+	fi
+
 	# also install shared lib
-	cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir
+	ln -sf libbz2.so.1.0.6 libbz2.so
+	cp -a libbz2.so.1.0.6 libbz2.so.1.0 libbz2.so $libDir
 
 	# move man pages
 	mkdir -p $manDir
@@ -77,6 +84,12 @@ INSTALL()
 	# devel package
 	packageEntries devel \
 		$developDir
+
+	#remove bin commands and man pages when building for secondary arch
+	if [ -n "$secondaryArchSuffix" ];then
+		rm -rf $prefix/bin
+		rm -rf $manDir
+	fi
 }
 
 # ----- devel package -------------------------------------------------------

From af174e27ca5f0774a97c72b0e7d1b0cb5fcaec7d Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 29 Dec 2013 01:17:00 -0700
Subject: [PATCH 20/23] Make boost into a usable recipe ...

since apparently it wasn't tested when being merged

* Fixed the _devel package so that it actually contains devel stuff
  (in particular the static libs and shared lib symlinks)

* Fixed all of the REQUIRES/PROVIDES entries

* Enable ICU support

* Enable parallel building

There should probably be a _doc package and we might want to split the
_devel package with a separate package for each of the libs.
---
 dev-libs/boost/boost-1.55.0.recipe | 294 +++++++++++++++++++++--------
 1 file changed, 215 insertions(+), 79 deletions(-)

diff --git a/dev-libs/boost/boost-1.55.0.recipe b/dev-libs/boost/boost-1.55.0.recipe
index a7c54ba93..9ea43b1ff 100644
--- a/dev-libs/boost/boost-1.55.0.recipe
+++ b/dev-libs/boost/boost-1.55.0.recipe
@@ -9,12 +9,14 @@ SUMMARY="Boost is a set of libraries for the C++ programming language."
 HOMEPAGE="http://www.boost.org/" 
 SRC_URI="http://sourceforge.net/projects/boost/files/boost/1.55.0/boost_1_55_0.tar.bz2"
 CHECKSUM_MD5="d6eef4b4cacb2183f2bf265a5a03a354"
-REVISION="1"
+REVISION="2"
 LICENSE="Boost v1.0"
 COPYRIGHT="1998-2013 Beman Dawes, David Abrahams, Rene Rivera, et al."
 ARCHITECTURES="x86 ?x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
+else
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
 fi
 SECONDARY_ARCHITECTURES="x86 ?x86_64"
 
@@ -23,106 +25,189 @@ SOURCE_DIR="boost_1_55_0"
 PATCHES="boost-1.55.0.patchset"
 
 PROVIDES="
-	lib:boost = 1.55.0
+	boost$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libiconv$secondaryArchSuffix
-	lib:libbz2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
+	boost_atomic$secondaryArchSuffix == $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_context$secondaryArchSuffix == $portVersion
+	boost_coroutine$secondaryArchSuffix == $portVersion
+	boost_date_time$secondaryArchSuffix == $portVersion
+	boost_filesystem$secondaryArchSuffix == $portVersion
+	boost_graph$secondaryArchSuffix == $portVersion
+	boost_iostreams$secondaryArchSuffix == $portVersion
+	boost_locale$secondaryArchSuffix == $portVersion
+	boost_log$secondaryArchSuffix == $portVersion
+	boost_math$secondaryArchSuffix == $portVersion
+	boost_program_options$secondaryArchSuffix == $portVersion
+	boost_random$secondaryArchSuffix == $portVersion
+	boost_regex$secondaryArchSuffix == $portVersion
+	boost_serialization$secondaryArchSuffix == $portVersion
+	boost_signals$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_test$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
+	boost_timer$secondaryArchSuffix == $portVersion
+	boost_unit_test_framework$secondaryArchSuffix == $portVersion
+	boost_wave$secondaryArchSuffix == $portVersion
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:libiconv$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	devel:libicuuc$secondaryArchSuffix
+	devel:libicui18n$secondaryArchSuffix
+	devel:libicudata$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	boehm_gc
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:jam
-	cmd:iconv
-	cmd:make
-	binutils
 	"
 
 BUILD()
 {
 	./bootstrap.sh \
-		--without-icu \
 		--prefix=$prefix \
 		--exec-prefix=$binDir \
 		--libdir=$libDir \
 		--includedir=$includeDir
-	./bjam \
-		 -sICU_PATH=$prefix \
-		 -sICONV_PATH=$prefix \
-		-d2 \
+
+	./b2 $jobArgs \
 		--without-mpi \
-		--prefix=$prefix \
-		--exec-prefix=$binDir \
-		--libdir=$libDir \
-		--includedir=$includeDir \
 		--enable-threads=posix \
 		--enable-thread-local-alloc \
  		--enable-parallel-mark \
 		inlining=on \
-		linkflags=-L$libDir \
 		threading=multi \
 		variant=release \
-		link=shared \
+		link=static,shared \
 		runtime-link=shared \
-		--without-python \
-		--disable-icu 
+		--without-python
 }
 
 INSTALL()
 {
-	mkdir -p $includeDir
-	mkdir -p $libDir
-	
-	cp -rf boost $includeDir
-	cp stage/lib/* $libDir
-		
-	packageEntries devel $includeDir
-	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*
-	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*
+	./b2 $jobArgs \
+		--without-mpi \
+		--enable-threads=posix \
+		--enable-thread-local-alloc \
+ 		--enable-parallel-mark \
+		inlining=on \
+		threading=multi \
+		variant=release \
+		link=static,shared \
+		runtime-link=shared \
+		--without-python \
+		install
+
+	prepareInstalledDevelLibs libboost_atomic \
+		libboost_chrono libboost_context libboost_coroutine \
+		libboost_date_time libboost_filesystem libboost_iostreams \
+		libboost_locale libboost_log libboost_log_setup \
+		libboost_math_c99 libboost_math_c99f libboost_math_c99l \
+		libboost_math_tr1 libboost_math_tr1f libboost_math_tr1l \
+		libboost_program_options libboost_random libboost_regex \
+		libboost_serialization libboost_signals libboost_system \
+		libboost_thread libboost_timer libboost_unit_test_framework \
+		libboost_wave libboost_wserialization libboost_prg_exec_monitor \
+		libboost_exception libboost_graph libboost_test_exec_monitor
+
+	packageEntries devel $developDir
+	packageEntries atomic $libDir/libboost_atomic*
+	packageEntries chrono $libDir/libboost_chrono*
+	packageEntries context $libDir/libboost_context*
+	packageEntries coroutine $libDir/libboost_coroutine*
+	packageEntries date_time $libDir/libboost_date_time*
+#	packageEntries exception $libDir/libboost_exception*
+	packageEntries filesystem $libDir/libboost_filesystem*
+	packageEntries graph $libDir/libboost_graph*
+	packageEntries iostreams $libDir/libboost_iostreams*
+	packageEntries locale $libDir/libboost_locale*
+	packageEntries log $libDir/libboost_log*
+	packageEntries math $libDir/libboost_math*
+	packageEntries program_options $libDir/libboost_program_options*
+	packageEntries random $libDir/libboost_random*
+	packageEntries regex $libDir/libboost_regex*
+	packageEntries serialization $libDir/libboost_serialization* $libDir/libboost_wserialization*
+	packageEntries signals $libDir/libboost_signals*
+	packageEntries system $libDir/libboost_system* 
+	packageEntries test $libDir/libboost_prg_exec_monitor*
+	packageEntries thread $libDir/libboost_thread*
+	packageEntries timer $libDir/libboost_timer*
+	packageEntries unit_test_framework $libDir/libboost_unit_test_framework*
+	packageEntries wave $libDir/libboost_wave*
 }
 
 PROVIDES_devel="
 	boost_devel$secondaryArchSuffix = $portVersion
+	devel:libboost_atomic$secondaryArchSuffix = $portVersion
+	devel:libboost_chrono$secondaryArchSuffix = $portVersion
+	devel:libboost_context$secondaryArchSuffix = $portVersion
+	devel:libboost_coroutine$secondaryArchSuffix = $portVersion
+	devel:libboost_date_time$secondaryArchSuffix = $portVersion
+	devel:libboost_exception$secondaryArchSuffix = $portVersion
+	devel:libboost_filesystem$secondaryArchSuffix = $portVersion
+	devel:libboost_graph$secondaryArchSuffix = $portVersion
+	devel:libboost_iostreams$secondaryArchSuffix = $portVersion
+	devel:libboost_locale$secondaryArchSuffix = $portVersion
+	devel:libboost_log$secondaryArchSuffix = $portVersion
+	devel:libboost_log_setup$secondaryArchSuffix = $portVersion
+	devel:libboost_math_c99$secondaryArchSuffix = $portVersion
+	devel:libboost_math_c99f$secondaryArchSuffix = $portVersion
+	devel:libboost_math_c99l$secondaryArchSuffix = $portVersion
+	devel:libboost_math_tr1$secondaryArchSuffix = $portVersion
+	devel:libboost_math_tr1f$secondaryArchSuffix = $portVersion
+	devel:libboost_math_tr1l$secondaryArchSuffix = $portVersion
+	devel:libboost_prg_exec_monitor$secondaryArchSuffix = $portVersion
+	devel:libboost_program_options$secondaryArchSuffix = $portVersion
+	devel:libboost_random$secondaryArchSuffix = $portVersion
+	devel:libboost_regex$secondaryArchSuffix = $portVersion
+	devel:libboost_serialization$secondaryArchSuffix = $portVersion
+	devel:libboost_signals$secondaryArchSuffix = $portVersion
+	devel:libboost_system$secondaryArchSuffix = $portVersion
+	devel:libboost_test_exec_monitor$secondaryArchSuffix = $portVersion
+	devel:libboost_thread$secondaryArchSuffix = $portVersion
+	devel:libboost_timer$secondaryArchSuffix = $portVersion
+	devel:libboost_unit_test_framework$secondaryArchSuffix = $portVersion
+	devel:libboost_wave$secondaryArchSuffix = $portVersion
+	devel:libboost_wserialization$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_devel="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	boost$secondaryArchSuffix == $portVersion
+	boost_atomic$secondaryArchSuffix == $portVersion
+	boost_chrono$secondaryArchSuffix == $portVersion
+	boost_context$secondaryArchSuffix == $portVersion
+	boost_coroutine$secondaryArchSuffix == $portVersion
+	boost_date_time$secondaryArchSuffix == $portVersion
+#	boost_exception$secondaryArchSuffix == $portVersion
+	boost_filesystem$secondaryArchSuffix == $portVersion
+	boost_graph$secondaryArchSuffix == $portVersion
+	boost_iostreams$secondaryArchSuffix == $portVersion
+	boost_locale$secondaryArchSuffix == $portVersion
+	boost_log$secondaryArchSuffix == $portVersion
+	boost_math$secondaryArchSuffix == $portVersion
+	boost_program_options$secondaryArchSuffix == $portVersion
+	boost_random$secondaryArchSuffix == $portVersion
+	boost_regex$secondaryArchSuffix == $portVersion
+	boost_serialization$secondaryArchSuffix == $portVersion
+	boost_signals$secondaryArchSuffix == $portVersion
+	boost_system$secondaryArchSuffix == $portVersion
+	boost_test$secondaryArchSuffix == $portVersion
+	boost_thread$secondaryArchSuffix == $portVersion
+	boost_timer$secondaryArchSuffix == $portVersion
+	boost_unit_test_framework$secondaryArchSuffix == $portVersion
+	boost_wave$secondaryArchSuffix == $portVersion
 	"
 
 PROVIDES_atomic="
 	boost_atomic$secondaryArchSuffix = $portVersion
+	lib:libboost_atomic$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_atomic="
@@ -131,15 +216,17 @@ REQUIRES_atomic="
 
 PROVIDES_chrono="
 	boost_chrono$secondaryArchSuffix = $portVersion
+	lib:libboost_chrono$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_chrono="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
 	"
 
 PROVIDES_context="
 	boost_context$secondaryArchSuffix = $portVersion
+	lib:libboost_context$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_context="
@@ -148,81 +235,107 @@ REQUIRES_context="
 
 PROVIDES_coroutine="
 	boost_coroutine$secondaryArchSuffix = $portVersion
+	lib:libboost_coroutine$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_coroutine="
-	boost_context$secondaryArchSuffix == $portVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libboost_context$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
 	"
 
 PROVIDES_date_time="
 	boost_date_time$secondaryArchSuffix = $portVersion
+	lib:libboost_date_time$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_date_time="
 	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
-PROVIDES_exception="
-	boost_exception$secondaryArchSuffix = $portVersion
-	"
+#PROVIDES_exception="
+#	boost_exception$secondaryArchSuffix = $portVersion
+#	lib:libboost_exception$secondaryArchSuffix = $portVersion
+#	"
 
-REQUIRES_exception="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	"
+#REQUIRES_exception="
+#	haiku$secondaryArchSuffix >= $haikuVersion
+#	"
 
 PROVIDES_filesystem="
 	boost_filesystem$secondaryArchSuffix = $portVersion
+	lib:libboost_filesystem$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_filesystem="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
 	lib:libz$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	"
 
 PROVIDES_graph="
 	boost_graph$secondaryArchSuffix = $portVersion
+	lib:libboost_graph$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_graph="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_regex$secondaryArchSuffix == $portVersion
+	lib:libboost_regex$secondaryArchSuffix == $portVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
 	"
 
 PROVIDES_iostreams="
 	boost_iostreams$secondaryArchSuffix = $portVersion
+	lib:libboost_iostreams$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_iostreams="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
 	"
 
 PROVIDES_locale="
 	boost_locale$secondaryArchSuffix = $portVersion
+	lib:libboost_locale$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_locale="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_chrono$secondaryArchSuffix == $portVersion
-	boost_system$secondaryArchSuffix == $portVersion
-	boost_thread$secondaryArchSuffix == $portVersion
+	lib:libboost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_thread$secondaryArchSuffix == $portVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
 	"
 
 PROVIDES_log="
 	boost_log$secondaryArchSuffix = $portVersion
+	lib:libboost_log$secondaryArchSuffix = $portVersion
+	lib:libboost_log_setup$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_log="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_chrono$secondaryArchSuffix == $portVersion
-	boost_system$secondaryArchSuffix == $portVersion
-	boost_date_time$secondaryArchSuffix == $portVersion
-	boost_thread$secondaryArchSuffix == $portVersion
+	lib:libboost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_filesystem$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_date_time$secondaryArchSuffix == $portVersion
+	lib:libboost_thread$secondaryArchSuffix == $portVersion
 	"
 
 PROVIDES_math="
 	boost_math$secondaryArchSuffix = $portVersion
+	lib:libboost_math_c99$secondaryArchSuffix = $portVersion
+	lib:libboost_math_c99f$secondaryArchSuffix = $portVersion
+	lib:libboost_math_c99l$secondaryArchSuffix = $portVersion
+	lib:libboost_math_tr1$secondaryArchSuffix = $portVersion
+	lib:libboost_math_tr1f$secondaryArchSuffix = $portVersion
+	lib:libboost_math_tr1l$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_math="
@@ -231,6 +344,7 @@ REQUIRES_math="
 
 PROVIDES_program_options="
 	boost_program_options$secondaryArchSuffix = $portVersion
+	lib:libboost_program_options$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_program_options="
@@ -239,6 +353,7 @@ REQUIRES_program_options="
 
 PROVIDES_random="
 	boost_random$secondaryArchSuffix = $portVersion
+	lib:libboost_random$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_random="
@@ -247,14 +362,20 @@ REQUIRES_random="
 
 PROVIDES_regex="
 	boost_regex$secondaryArchSuffix = $portVersion
+	lib:libboost_regex$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_regex="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libicuuc$secondaryArchSuffix
+	lib:libicui18n$secondaryArchSuffix
+	lib:libicudata$secondaryArchSuffix
 	"
 
 PROVIDES_serialization="
 	boost_serialization$secondaryArchSuffix = $portVersion
+	lib:libboost_serialization$secondaryArchSuffix = $portVersion
+	lib:libboost_wserialization$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_serialization="
@@ -263,6 +384,7 @@ REQUIRES_serialization="
 
 PROVIDES_signals="
 	boost_signals$secondaryArchSuffix = $portVersion
+	lib:libboost_signals$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_signals="
@@ -271,6 +393,7 @@ REQUIRES_signals="
 
 PROVIDES_system="
 	boost_system$secondaryArchSuffix = $portVersion
+	lib:libboost_system$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_system="
@@ -279,6 +402,8 @@ REQUIRES_system="
 
 PROVIDES_test="
 	boost_test$secondaryArchSuffix = $portVersion
+	lib:libboost_prg_exec_monitor$secondaryArchSuffix = $portVersion
+#	lib:libboost_test_exec_monitor$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_test="
@@ -287,33 +412,44 @@ REQUIRES_test="
 
 PROVIDES_thread="
 	boost_thread$secondaryArchSuffix = $portVersion
+	lib:libboost_thread$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_thread="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_system$secondaryArchSuffix == $portVersion
-	boost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
 	"
 
 PROVIDES_timer="
 	boost_timer$secondaryArchSuffix = $portVersion
+	lib:libboost_timer$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES_timer="
 	haiku$secondaryArchSuffix >= $haikuVersion
-	boost_chrono$secondaryArchSuffix == $portVersion
-	boost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	"
+
+PROVIDES_unit_test_framework="
+	boost_unit_test_framework$secondaryArchSuffix = $portVersion
+	lib:libboost_unit_test_framework$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_unit_test_framework="
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 
 PROVIDES_wave="
 	boost_wave$secondaryArchSuffix = $portVersion
+	lib:libboost_wave$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
+	lib:libboost_chrono$secondaryArchSuffix == $portVersion
+	lib:libboost_date_time$secondaryArchSuffix == $portVersion
+	lib:libboost_filesystem$secondaryArchSuffix == $portVersion
+	lib:libboost_system$secondaryArchSuffix == $portVersion
+	lib:libboost_thread$secondaryArchSuffix == $portVersion
 	"

From dd8f97a9756cd3ffef2cef89eaf2b4248042a3a1 Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Sun, 29 Dec 2013 18:09:23 +0000
Subject: [PATCH 21/23] Add BlogPositive 0.3 recipe

---
 .../blogpositive/blogpositive-0.3.0.recipe    | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 haiku-apps/blogpositive/blogpositive-0.3.0.recipe

diff --git a/haiku-apps/blogpositive/blogpositive-0.3.0.recipe b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe
new file mode 100644
index 000000000..4ae39eebe
--- /dev/null
+++ b/haiku-apps/blogpositive/blogpositive-0.3.0.recipe
@@ -0,0 +1,63 @@
+SUMMARY="The one blog app to rule them all!"
+DESCRIPTION="
+	Want to blog, but WebPositive isn't quick enough?
+	Now you can use the new blog app: BlogPositive!
+	It can connect to Wordpress, LiveJournal and OnSugar blogs.
+	"
+HOMEPAGE="http://blogpositive.puckipedia.com"
+SRC_URI="git://github.com/puckipedia/BlogPositive.git#tags/v0.3"
+REVISION="1"
+
+LICENSE="MIT"
+COPYRIGHT="2013 :Puck Meerburg"
+
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+
+PROVIDES="
+	blogpositive = $portVersion
+	app:blogpositive = $portVersion
+	"
+
+REQUIRES="
+	lib:libcurl
+	lib:libz
+	haiku >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	makefile_engine
+	cmd:g++
+	cmd:xres
+	cmd:mkdepend
+	"
+BUILD_REQUIRES="
+	devel:libcurl
+	devel:libz
+	haiku_devel >= $haikuVersion
+	"
+
+USER_SETTINGS_FILES="
+	settings/BlogPositive directory
+	"
+
+BUILD()
+{
+	make
+	for i in BlogPositivePlugins/*; do
+		if [ -f $i/makefile ]; then
+			make -C $i
+		fi
+	done
+	make bindcatalogs
+}
+
+INSTALL()
+{
+	make install INSTALL_DIR=$appsDir
+	addAppDeskbarSymlink $appsDir/BlogPositive
+	
+	for i in BlogPositivePlugins/*; do
+		if [ -f $i/makefile ]; then
+			make -C $i install INSTALL_DIR=$addOnsDir/BlogPositive
+		fi
+	done
+}

From de5d8227ca526501f79add503b79dbb0b453bfff Mon Sep 17 00:00:00 2001
From: Theodore Kokkoris <t.kokkoris@gmail.com>
Date: Sun, 29 Dec 2013 18:32:37 +0000
Subject: [PATCH 22/23] Added CmakeHaiku recipe

---
 haiku-apps/cmake_haiku/cmake_haiku-git.recipe | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 haiku-apps/cmake_haiku/cmake_haiku-git.recipe

diff --git a/haiku-apps/cmake_haiku/cmake_haiku-git.recipe b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
new file mode 100644
index 000000000..1a78ab88d
--- /dev/null
+++ b/haiku-apps/cmake_haiku/cmake_haiku-git.recipe
@@ -0,0 +1,45 @@
+SUMMARY="Cmake GUI with Haiku Native Widgets"
+DESCRIPTION="cmake_haiku is a native GUI frontend for Cmake with features like configuring a project and generating files for other build systems like Makefiles, Ninja etc."
+
+HOMEPAGE="https://github.com/AdrianArroyoCalle/cmake-haiku"
+SRC_URI="git+https://github.com/AdrianArroyoCalle/cmake-haiku.git#a42d55b"
+
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2012-2013 Adrián Arroyo Calle <adrian.arroyocalle@gmail.com>"
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	cmake_haiku = $portVersion
+	app:cmake_haiku = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	cmd:cmake
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:cmake
+	cmd:make
+	"
+	
+BUILD()
+{
+	cmake .
+	make	
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp cmake-gui $appsDir/CmakeHaiku
+	
+	addAppDeskbarSymlink $appsDir/CmakeHaiku
+}

From c8891332288df08118628c724d5ab422691934a6 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Sun, 29 Dec 2013 20:53:25 -0800
Subject: [PATCH 23/23] Remove whitespace at end of line in gettext patch.

---
 sys-devel/gettext/patches/gettext-0.18.1.1.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/gettext/patches/gettext-0.18.1.1.patch b/sys-devel/gettext/patches/gettext-0.18.1.1.patch
index 0250765dc..6752ab563 100644
--- a/sys-devel/gettext/patches/gettext-0.18.1.1.patch
+++ b/sys-devel/gettext/patches/gettext-0.18.1.1.patch
@@ -5,7 +5,7 @@
  # define O_TEXT _O_TEXT
  #endif
 -#if defined __BEOS__ || defined __HAIKU__
-+#if defined __BEOS__ 
++#if defined __BEOS__
    /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect.  */
  # undef O_BINARY
  # undef O_TEXT