From 9fe58496ec64c385bb192891b25a030f1bdc86dd Mon Sep 17 00:00:00 2001
From: Gleb Posobin <posobin@gmail.com>
Date: Mon, 2 Dec 2013 22:33:29 +0400
Subject: [PATCH 01/28] Added Mr.Peeps port

---
 haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe    | 44 +++++++++++++++++++
 .../mrpeeps/patches/MrPeeps-1.2_beta.patch    | 30 +++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
 create mode 100644 haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch

diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
new file mode 100644
index 000000000..7f9b189fa
--- /dev/null
+++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
@@ -0,0 +1,44 @@
+SUMMARY="Easy to use powerful contact manager for haiku" 
+DESCRIPTION="MrPeeps is an app for managing People files that has more 
+	features than other contact managers. For more info read README file" 
+HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" 
+SRC_URI="git+https://github.com/HaikuArchives/MrPeeps#ce2e65"
+LICENSE="MIT"
+REVISION="1"
+PROVIDES="
+	MrPeeps = $portVersion
+	app:MrPeeps = $portVersion
+	cmd:MrPeeps = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
+PATCHES="MrPeeps-1.2_beta.patch"
+
+BUILD()
+{
+	cd src
+	cp Locale\ Support/* ./
+	g++ -lbe -ltranslation -lroot AboutWindow.cpp BitmapDump.cpp \
+		BitmapView.cpp BStringList.cpp DataView.cpp Formatting.cpp \
+		IntroView.cpp ListData.cpp MrPeeps.cpp NewTextControl.cpp \
+		PeepsItem.cpp PeepsWindow.cpp PeopleList.cpp LocaleRoster.cpp \
+		Locale.cpp TextFile.cpp -o ../MrPeeps	
+}
+
+INSTALL()
+{
+	mrPeepsDir=$appsDir/MrPeeps
+	mkdir -p $mrPeepsDir
+	[ -h $binDir ] || mkdir -p $binDir
+	cp -f ./MrPeeps $mrPeepsDir
+	ln -sfn $mrPeepsDir/MrPeeps $binDir/
+	addAppDeskbarSymlink $mrPeepsDir/MrPeeps
+}
+
+COPYRIGHT="2003 DarkWyrm"
diff --git a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
new file mode 100644
index 000000000..d3971b4e2
--- /dev/null
+++ b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
@@ -0,0 +1,30 @@
+diff -Naur -x .git /boot/home/MrPeeps/src/ListData.h ./src/ListData.h
+--- /boot/home/MrPeeps/src/ListData.h	2013-12-01 19:17:49.441188352 +0400
++++ ./src/ListData.h	2013-12-01 20:25:27.129236992 +0400
+@@ -2,6 +2,7 @@
+ #define LIST_DATA
+ 
+ #include <Entry.h>
++#include <Node.h>
+ #include <List.h>
+ #include <String.h>
+ #include "BStringList.h"
+diff -Naur -x .git /boot/home/MrPeeps/src/PeepsWindow.h ./src/PeepsWindow.h
+--- /boot/home/MrPeeps/src/PeepsWindow.h	2013-12-01 19:17:49.467927040 +0400
++++ ./src/PeepsWindow.h	2013-12-01 20:24:59.028573696 +0400
+@@ -8,6 +8,8 @@
+ #include <Button.h>
+ #include <Menu.h>
+ #include <MenuItem.h>
++#include <ListItem.h>
++#include <Entry.h>
+ #include "NewTextControl.h"
+ #include <Messenger.h>
+ #include "LocaleRoster.h"
+@@ -117,4 +119,4 @@
+ 
+ #define TRANSLATE(x) gCurrentLocale->Translate(x).String()
+ 
+-#endif
+\ No newline at end of file
++#endif

From bb139026da64b40f0db67ece5b9e8ee8be3561ce Mon Sep 17 00:00:00 2001
From: Gleb Posobin <posobin@gmail.com>
Date: Mon, 2 Dec 2013 23:38:15 +0400
Subject: [PATCH 02/28] edit Mr.Peeps port a little bit

---
 haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe    |  6 ++--
 .../mrpeeps/patches/MrPeeps-1.2_beta.patch    | 33 ++++++++++++++-----
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
index 7f9b189fa..fe9290f46 100644
--- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
+++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
@@ -4,11 +4,12 @@ DESCRIPTION="MrPeeps is an app for managing People files that has more
 HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" 
 SRC_URI="git+https://github.com/HaikuArchives/MrPeeps#ce2e65"
 LICENSE="MIT"
+COPYRIGHT="2003 DarkWyrm"
 REVISION="1"
+ARCHITECTURES="x86 x86_gcc2 x86_64"
 PROVIDES="
 	MrPeeps = $portVersion
 	app:MrPeeps = $portVersion
-	cmd:MrPeeps = $portVersion
 	"
 REQUIRES="
 	haiku >= $haikuVersion
@@ -17,7 +18,6 @@ BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:gcc
 	"
-ARCHITECTURES="x86 x86_gcc2 x86_64"
 PATCHES="MrPeeps-1.2_beta.patch"
 
 BUILD()
@@ -40,5 +40,3 @@ INSTALL()
 	ln -sfn $mrPeepsDir/MrPeeps $binDir/
 	addAppDeskbarSymlink $mrPeepsDir/MrPeeps
 }
-
-COPYRIGHT="2003 DarkWyrm"
diff --git a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
index d3971b4e2..ab4587221 100644
--- a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
+++ b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
@@ -1,26 +1,41 @@
 diff -Naur -x .git /boot/home/MrPeeps/src/ListData.h ./src/ListData.h
 --- /boot/home/MrPeeps/src/ListData.h	2013-12-01 19:17:49.441188352 +0400
-+++ ./src/ListData.h	2013-12-01 20:25:27.129236992 +0400
-@@ -2,6 +2,7 @@
- #define LIST_DATA
++++ ./src/ListData.h	2013-12-02 23:31:26.658767872 +0400
+@@ -3,6 +3,7 @@
  
  #include <Entry.h>
-+#include <Node.h>
  #include <List.h>
++#include <Node.h>
  #include <String.h>
  #include "BStringList.h"
+ #include <Bitmap.h>
 diff -Naur -x .git /boot/home/MrPeeps/src/PeepsWindow.h ./src/PeepsWindow.h
 --- /boot/home/MrPeeps/src/PeepsWindow.h	2013-12-01 19:17:49.467927040 +0400
-+++ ./src/PeepsWindow.h	2013-12-01 20:24:59.028573696 +0400
-@@ -8,6 +8,8 @@
++++ ./src/PeepsWindow.h	2013-12-02 23:32:59.641990656 +0400
+@@ -1,16 +1,18 @@
+ #ifndef PEEPSWINDOW_H
+ #define PEEPSWINDOW_H
+ 
+-#include <Window.h>
+-#include <View.h>
+-#include <TextControl.h>
+-#include <PopUpMenu.h>
  #include <Button.h>
++#include <Entry.h>
++#include <ListItem.h>
  #include <Menu.h>
  #include <MenuItem.h>
-+#include <ListItem.h>
-+#include <Entry.h>
- #include "NewTextControl.h"
+-#include "NewTextControl.h"
  #include <Messenger.h>
++#include <PopUpMenu.h>
++#include <TextControl.h>
++#include <View.h>
++#include <Window.h>
  #include "LocaleRoster.h"
++#include "NewTextControl.h"
+ 
+ class PeopleList;
+ class PeepsListItem;
 @@ -117,4 +119,4 @@
  
  #define TRANSLATE(x) gCurrentLocale->Translate(x).String()

From cd1ac560ffab374bb6a7ebf8bd1e122d7356da75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 8 Dec 2013 23:17:33 +0100
Subject: [PATCH 03/28] Fix and update the aranym recipe

---
 app-emulation/aranym/aranym-0.9.11_cvs.recipe | 25 ---------
 app-emulation/aranym/aranym-0.9.15_git.recipe | 52 +++++++++++++++++++
 2 files changed, 52 insertions(+), 25 deletions(-)
 delete mode 100644 app-emulation/aranym/aranym-0.9.11_cvs.recipe
 create mode 100644 app-emulation/aranym/aranym-0.9.15_git.recipe

diff --git a/app-emulation/aranym/aranym-0.9.11_cvs.recipe b/app-emulation/aranym/aranym-0.9.11_cvs.recipe
deleted file mode 100644
index b1900a133..000000000
--- a/app-emulation/aranym/aranym-0.9.11_cvs.recipe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="ARAnyM (Atari Running on Any Machine) is a multiplatform virtual machine for running Atari ST/TT/Falcon operating systems and applications."
-HOMEPAGE="http://aranym.org/"
-SRC_URI="cvs://:pserver:anoncvs@cvs.aranym.org:/var/repos/aranym"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="dev-libs/libcdio >= 0.82
-		media-libs/libsdl >= 1.2.10"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd aranym
-	./autogen.sh --help >/dev/null
-	./configure --prefix=/boot/apps/ARAnyM
-	make
-}
-
-INSTALL()
-{
-	cd aranym
-	make install
-}
-
-COPYRIGHT="2001-2010 ARAnyM developer team"
-LICENSE="GNU GPL v2"
diff --git a/app-emulation/aranym/aranym-0.9.15_git.recipe b/app-emulation/aranym/aranym-0.9.15_git.recipe
new file mode 100644
index 000000000..96c7b5286
--- /dev/null
+++ b/app-emulation/aranym/aranym-0.9.15_git.recipe
@@ -0,0 +1,52 @@
+SUMMARY="ARAnyM (Atari Running on Any Machine)"
+DESCRIPTION="ARAnyM (Atari Running on Any Machine)
+	is a multiplatform virtual machine for running
+	Atari ST/TT/Falcon operating systems and applications."
+HOMEPAGE="http://aranym.org/"
+SRC_URI="git://git.code.sf.net/p/aranym/code"
+REVISION="1"
+#CHECKSUM_MD5=""
+COPYRIGHT="2001-2010 ARAnyM developer team"
+LICENSE="GNU GPL v2"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+SOURCE_DIR="code"
+
+PROVIDES="
+	aranym = $portVersion
+	app:aranym = $portVersion
+	cmd:aranym = $portVersion
+	"
+REQUIRES="
+	haiku
+	libsdl
+	lib:libsdl_image_1.2
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsdl_1.2 >= 0.10
+	devel:libSDL_image_1.2 >= 0.8.4
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	cmd:gcc
+	cmd:sdl_config
+	"
+
+BUILD()
+{
+	./autogen.sh --help >/dev/null
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+	mimeset $prefix/bin/aranym
+	addAppDeskbarSymlink /bin/aranym ARAnyM
+}
+

From 66ff7b2ed2aa299e2bcc5f7f5fd48b85670387ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sun, 8 Dec 2013 23:44:57 +0100
Subject: [PATCH 04/28] Fix and update the Oricutron recipe

Note the makefile is supposed to get the svn revision, but I can't get
svnrevision to be either compiled or taken from my already installed
package, plus I suppose since we actually make a git repo from the
source it wouldn't work anyway... FIXME
---
 .../oricutron/oricutron-0.9_svn.recipe        | 22 ---------
 .../oricutron/oricutron-1.1_svn.recipe        | 48 +++++++++++++++++++
 2 files changed, 48 insertions(+), 22 deletions(-)
 delete mode 100644 app-emulation/oricutron/oricutron-0.9_svn.recipe
 create mode 100644 app-emulation/oricutron/oricutron-1.1_svn.recipe

diff --git a/app-emulation/oricutron/oricutron-0.9_svn.recipe b/app-emulation/oricutron/oricutron-0.9_svn.recipe
deleted file mode 100644
index ca7088f5b..000000000
--- a/app-emulation/oricutron/oricutron-0.9_svn.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Oricutron is an emulator for the Oric series of computers."
-HOMEPAGE="http://code.google.com/p/oriculator/"
-SRC_URI="svn://http://oriculator.googlecode.com/svn/trunk"
-REVISION="1"
-STATUS_HAIKU="untested"
-DEPEND="media-libs/libsdl >= 1.2.10"
-#CHECKSUM_MD5=""
-
-BUILD()
-{
-	cd trunk
-	make
-}
-
-INSTALL()
-{
-	cd trunk
-	make install
-}
-
-COPYRIGHT="2009-2012 Peter Gordon"
-LICENSE="GNU GPL v2"
diff --git a/app-emulation/oricutron/oricutron-1.1_svn.recipe b/app-emulation/oricutron/oricutron-1.1_svn.recipe
new file mode 100644
index 000000000..b029ea0d5
--- /dev/null
+++ b/app-emulation/oricutron/oricutron-1.1_svn.recipe
@@ -0,0 +1,48 @@
+SUMMARY="Oricutron is an emulator for the Oric series of computers."
+DESCRIPTION="Oricutron is an emulator for the Oric series of computers."
+HOMEPAGE="http://code.google.com/p/oriculator/"
+SRC_URI="svn+http://oriculator.googlecode.com/svn/trunk"
+REVISION="1"
+DEPEND="media-libs/libsdl >= 1.2.10"
+#CHECKSUM_MD5=""
+COPYRIGHT="2009-2012 Peter Gordon"
+LICENSE="GNU GPL v2"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+SOURCE_DIR="trunk"
+
+PROVIDES="
+	oricutron = $portVersion
+	app:oricutron = $portVersion
+	cmd:oricutron = $portVersion
+	"
+REQUIRES="
+	haiku
+	libsdl
+	"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libsdl_1.2 >= 0.10
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc
+	cmd:sdl_config
+	"
+#FIXME: Makefile uses svnversion to get the revision...
+#	subversion >= 1.6.18
+#	cmd:svnversion >= 1.6.18
+
+BUILD()
+{
+	make INSTALLDIR=$prefix/apps/Oricutron
+}
+
+INSTALL()
+{
+	make install INSTALLDIR=$prefix/apps/Oricutron
+	mimeset $prefix/apps/Oricutron/oricutron
+	#addAppDeskbarSymlink $prefix/apps/Oricutron/oricutron Oricutron
+}
+

From ee8152f4ca88136b3d8e4699fbdfe3c1c6884605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 00:18:17 +0100
Subject: [PATCH 05/28] Fix case on HTML::Parser perl module package naming

Somehow haikuporter doesn't like uppercase names,
it keeps waiting for the lowercase-named package to be activated
while the uppercase one is already...
---
 .../html_parser-3.70.recipe}                        | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
 rename dev-perl/{HTML_Parser/HTML_Parser-3.70.recipe => html_parser/html_parser-3.70.recipe} (82%)

diff --git a/dev-perl/HTML_Parser/HTML_Parser-3.70.recipe b/dev-perl/html_parser/html_parser-3.70.recipe
similarity index 82%
rename from dev-perl/HTML_Parser/HTML_Parser-3.70.recipe
rename to dev-perl/html_parser/html_parser-3.70.recipe
index 18e81d1e3..1815e7288 100644
--- a/dev-perl/HTML_Parser/HTML_Parser-3.70.recipe
+++ b/dev-perl/html_parser/html_parser-3.70.recipe
@@ -5,9 +5,12 @@ REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
 CHECKSUM_MD5="efe7699f5ece3a230d730a3682359c08"
 PROVIDES="
-	HTML_Parser = $portVersion
+	html_parser = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	perl
 	"
-REQUIRES="perl"
 COPYRIGHT="
 1995-2009 Gisle Aas. All rights reserved.
 1999-2000 Michael A. Chase.  All rights reserved.
@@ -17,7 +20,11 @@ LICENSE="
 	Artistic (Perl)
 "
 
-BUILD_REQUIRES="make"
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:perl"
 
 SOURCE_DIR="HTML-Parser-3.70"
 BUILD() {

From 8e420ec93e78996b70f5922b1c62926d0e85afad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 00:48:09 +0100
Subject: [PATCH 06/28] Fix install location for HTML::Parser; Add FIXME
 comments

---
 dev-perl/html_parser/html_parser-3.70.recipe | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-perl/html_parser/html_parser-3.70.recipe b/dev-perl/html_parser/html_parser-3.70.recipe
index 1815e7288..467457f6b 100644
--- a/dev-perl/html_parser/html_parser-3.70.recipe
+++ b/dev-perl/html_parser/html_parser-3.70.recipe
@@ -1,3 +1,5 @@
+#FIXME: Appending installation info to /packages/html_parser-3.70-1/.self/lib/perl5/5.18.1/BePC-haiku/perllocal.pod
+#FIXME: Warning: prerequisite HTML::Tagset 3 not found.
 SUMMARY="Encode or decode strings with HTML entities"
 HOMEPAGE="http://search.cpan.org/~gaas/HTML-Parser/"
 SRC_URI="http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/HTML-Parser-3.70.tar.gz"
@@ -28,12 +30,12 @@ BUILD_REQUIRES="
 
 SOURCE_DIR="HTML-Parser-3.70"
 BUILD() {
-	perl Makefile.PL
+	perl Makefile.PL PREFIX=$prefix
 	make
 }
 
 INSTALL() {
-	make install DESTDIR=$prefix
+	make install
 }
 
 DESCRIPTION="

From a96ddacd5c000d35dfe01deafde11ef3356a2545 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 8 Dec 2013 18:09:10 -0600
Subject: [PATCH 07/28] Mesa: Add Mesa 10.0.0.

* Remove 9.3 as it was a devel version
* This should work since haikuporter bug #21 was fixed
* I still need to get the Mesa-7.x port working
  for x86_gcc2 before Mesa can replace our OpenGL kit,
---
 sys-libs/mesa/mesa-10.0.0.recipe | 140 +++++++++++++++++++++++++++++++
 sys-libs/mesa/mesa-9.3.recipe    |  97 ---------------------
 2 files changed, 140 insertions(+), 97 deletions(-)
 create mode 100644 sys-libs/mesa/mesa-10.0.0.recipe
 delete mode 100644 sys-libs/mesa/mesa-9.3.recipe

diff --git a/sys-libs/mesa/mesa-10.0.0.recipe b/sys-libs/mesa/mesa-10.0.0.recipe
new file mode 100644
index 000000000..cf62a9dc2
--- /dev/null
+++ b/sys-libs/mesa/mesa-10.0.0.recipe
@@ -0,0 +1,140 @@
+SUMMARY="Multi-platform GL implementation"
+DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification.
+	The OpenGL specification documents a system for rendering interactive 3D graphics.
+
+	Mesa fills the role of the Haiku OpenGL kit providing 3D rendering to Haiku applications.
+	"
+HOMEPAGE="http://www.mesa3d.org/"
+COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
+LICENSE="MIT"
+SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/10.0/MesaLib-10.0.0.tar.bz2"
+CHECKSUM_MD5="f3fe55d9735bea158bbe97ed9a0da819"
+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"
+fi
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	mesa$secondaryArchSuffix = $portVersion compat >= 10.0
+	lib:libGL$secondaryArchSuffix = $portVersion compat >= 10.0
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+	
+# We're locked to LLVM 3.2 as 3.3 is broken at the moment on Haiku.
+# Mesa should build with any newer LLVM version however.
+# As LLVM is only linked into the swpipe renderer (and not libGL)
+# changing LLVM versions shouldn't introduce any abi issues.
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	libxml2_python
+	llvm == 3.2
+	cmd:bison
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:scons
+	cmd:sed
+	"
+
+SOURCE_DIR="Mesa-$portVersion"
+
+BUILD()
+{
+	if [ -n "$secondaryArchSuffix" ]; then
+		export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture"
+	fi
+	scons $jobArgs build=release
+	#scons $jobArgs build=debug
+}
+
+INSTALL()
+{
+	mesaBuildDir=build/haiku-$effectiveTargetArchitecture
+
+	mkdir -p $includeDir/GL
+	cp include/GL/gl.h $includeDir/GL/
+	cp include/GL/gl_mangle.h $includeDir/GL/
+	cp include/GL/glext.h $includeDir/GL/
+
+	# libGL.so makes up the core of our OpenGL kit
+	mkdir -p $libDir
+	cp $(find $mesaBuildDir -name 'libGL.so') $libDir
+
+	# Our rendering add-ons
+	mkdir -p $addOnsDir/opengl
+	cp $(find $mesaBuildDir -name 'libswrast.so') \
+		"$addOnsDir/opengl/Software Rasterizer"
+	cp $(find $mesaBuildDir -name 'libswpipe.so') \
+		"$addOnsDir/opengl/Software Pipe"
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# swpipe renderer package
+	packageEntries swpipe \
+		"$addOnsDir/opengl/Software Pipe"
+
+	# swrast renderer package
+	packageEntries swrast \
+		"$addOnsDir/opengl/Software Rasterizer"
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	mesa${secondaryArchSuffix}_devel = $portVersion
+	devel:libGL$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
+# ===== Mesa OpenGL Add-ons ==================================================
+# ----- swrast package -------------------------------------------------------
+
+SUMMARY_swrast="Mesa software rasterization renderer"
+DESCRIPTION_swrast="This 3D BGLRenderer add-on provides Mesa software
+	rasterization on Haiku systems. Software rasterization performs all
+	3D rendering on the systems CPU and doesn't require any specialized
+	hardware. Software rasterization is generally considered a fallback
+	3D rendering method as performance is limited.
+	"
+PROVIDES_swrast="
+	mesa${secondaryArchSuffix}_swrast = $portVersion
+	"
+REQUIRED_swrast="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
+# ===== Gallium OpenGL Add-ons ===============================================
+# ----- swpipe package -------------------------------------------------------
+
+SUMMARY_swpipe="Mesa LLVM enhanced Gallium software pipe renderer"
+DESCRIPTION_swpipe="This 3D BGLRenderer add-on provides Gallium LLVM
+	enhanced software rendering. Software pipe rendering performs all
+	3D rendering on the systems CPU and doesn't require any specialized
+	hardware. The usage of LLVM over traditional rasterization gives this
+	renderer a boost in performance.
+	
+	Gallium software pipe rendering is in an extremely early state as of
+	this version of Mesa, and may not function as expected.
+	"
+PROVIDES_swpipe="
+	mesa${secondaryArchSuffix}_swpipe = $portVersion
+	"
+
+REQUIRED_swpipe="
+	mesa$secondaryArchSuffix == $portVersion base
+	"
+
diff --git a/sys-libs/mesa/mesa-9.3.recipe b/sys-libs/mesa/mesa-9.3.recipe
deleted file mode 100644
index c21cae4aa..000000000
--- a/sys-libs/mesa/mesa-9.3.recipe
+++ /dev/null
@@ -1,97 +0,0 @@
-SUMMARY="Multi-platform GL implementation"
-DESCRIPTION="Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.
-
-Mesa fills the role of the Haiku OpenGL kit.
-"
-
-HOMEPAGE="http://www.mesa3d.org/"
-COPYRIGHT="1999-2013 Brian Paul All Rights Reserved."
-LICENSE="MIT"
-SRC_URI="git://anongit.freedesktop.org/mesa/mesa"
-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"
-fi
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	mesa$secondaryArchSuffix = $portVersion compat >= 9.3
-	lib:libGL$secondaryArchSuffix = $portVersion compat >= 9.3
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	"
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	libxml2_python
-	llvm >= 3.2
-	cmd:bison
-	cmd:find
-	cmd:flex
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:scons
-	cmd:sed
-	"
-
-SOURCE_DIR="Mesa-$portVersion"
-
-BUILD()
-{
-	if [ -n "$secondaryArchSuffix" ]; then
-		export HAIKU_SECONDARY_ARCH="$effectiveTargetArchitecture"
-	fi
-	scons $jobArgs build=release
-	#scons $jobArgs build=debug
-}
-
-INSTALL()
-{
-	mesaBuildDir=build/haiku-$effectiveTargetArchitecture
-
-	mkdir -p $includeDir/GL
-	cp include/GL/gl.h $includeDir/GL/
-	cp include/GL/gl_mangle.h $includeDir/GL/
-	cp include/GL/glext.h $includeDir/GL/
-
-	# libGL.so makes up the core of our OpenGL kit
-	mkdir -p $libDir
-	cp $(find $mesaBuildDir -name 'libGL.so') $libDir
-
-	# Our rendering add-ons
-	mkdir -p $addOnsDir/opengl
-	cp $(find $mesaBuildDir -name 'libswpipe.so') $addOnsDir/opengl/Softpipe
-
-	# devel package
-	packageEntries devel \
-		$developDir
-	# swpipe renderer package
-	packageEntries swpipe \
-		$addOnsDir
-}
-
-# ----- devel package -------------------------------------------------------
-
-PROVIDES_devel="
-	mesa${secondaryArchSuffix}_devel = $portVersion
-	devel:libGL$secondaryArchSuffix = $portVersion
-	"
-
-REQUIRES_devel="
-	mesa$secondaryArchSuffix == $portVersion base
-	"
-
-# ----- swpipe package -------------------------------------------------------
-
-PROVIDES_swpipe="
-	mesa${secondaryArchSuffix}_swpipe = $portVersion
-	"
-
-REQUIRED_swpipe="
-	mesa$secondaryArchSuffix == $portVersion base
-	"

From 17f6d35e902690291b04cede01a615242950a5bd Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 8 Dec 2013 20:04:02 -0600
Subject: [PATCH 08/28] db: Add db-4.8.30 port

* Needed by things like bitcoind
---
 dev-db/db/db-4.8.30.recipe        | 91 +++++++++++++++++++++++++++++++
 dev-db/db/patches/db-4.8.30.patch | 79 +++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)
 create mode 100644 dev-db/db/db-4.8.30.recipe
 create mode 100644 dev-db/db/patches/db-4.8.30.patch

diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe
new file mode 100644
index 000000000..7f7651450
--- /dev/null
+++ b/dev-db/db/db-4.8.30.recipe
@@ -0,0 +1,91 @@
+SUMMARY="The Oracle Berkeley Database"
+DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases provides developers with fast, reliable, local persistence with zero administration." 
+HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
+SRC_URI="http://download.oracle.com/berkeley-db/db-${portVersion}.tar.gz"
+CHECKSUM_MD5="f80022099c5742cd179343556179aa8c"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+LICENSE="SleepyCat"
+COPYRIGHT="1990-2013, Oracle
+	1990-1995, The Regents of the University of California
+	1996-1996, The President and Fellows of Harvard University
+	2000-2005, INRIA - France Telecom"
+
+PROVIDES="
+	db${secondaryArchSuffix} = $portVersion
+	cmd:db_archive
+	cmd:db_checkpoint
+	cmd:db_deadlock
+	cmd:db_dump
+	cmd:db_hotbackup
+	cmd:db_load
+	cmd:db_printlog
+	cmd:db_recover
+	cmd:db_stat
+	cmd:db_sql
+	cmd:db_upgrade
+	cmd:db_verify
+	lib:libdb_4.8
+	lib:libdb_4
+	lib:libdb
+	lib:libdb_cxx
+	lib:libdb_cxx_4.8
+	lib:libdb_cxx_4
+	"
+REQUIRES="
+    haiku${secondaryArchSuffix} >= $haikuVersion
+    "
+BUILD_REQUIRES="
+    "
+BUILD_PREREQUIRES="
+    haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+    cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:make
+	"
+
+PATCHES="db-${portVersion}.patch"
+SOURCE_DIR="db-${portVersion}"
+
+BUILD()
+{
+	cd build_unix
+	runConfigure ../dist/configure --enable-cxx
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build_unix
+	make install
+
+    # prepare develop/lib
+    prepareInstalledDevelLibs libdb libdb-4.8 libdb_cxx libdb_cxx-4.8
+    fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	cd build_unix
+	#make dbtest
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	db${secondaryArchSuffix}_devel = $portVersion
+	devel:libdb$secondaryArchSuffix = $portVersion
+	devel:libdb_4.8$secondaryArchSuffix = $portVersion
+	devel:libdb_cxx$secondaryArchSuffix = $portVersion
+	devel:libdb_cxx_4.8$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES_devel="
+	db$secondaryArchSuffix == $portVersion base
+    "
diff --git a/dev-db/db/patches/db-4.8.30.patch b/dev-db/db/patches/db-4.8.30.patch
new file mode 100644
index 000000000..0b176f9b4
--- /dev/null
+++ b/dev-db/db/patches/db-4.8.30.patch
@@ -0,0 +1,79 @@
+diff --git a/dist/Makefile.in b/dist/Makefile.in
+index c4b0739..d3860b4 100644
+--- a/dist/Makefile.in
++++ b/dist/Makefile.in
+@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
+ bindir=	@bindir@
+ includedir=@includedir@
+ libdir=	@libdir@
+-docdir=	$(prefix)/docs
++docdir=	@docdir@
+ 
+ dmode=	755
+ emode=	555
+diff --git a/dist/configure b/dist/configure
+index 295fec1..e05e451 100755
+--- a/dist/configure
++++ b/dist/configure
+@@ -4533,6 +4533,8 @@ irix*)	optimize_debug="-O2"
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
+ mpeix*)	CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
+ 	LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
++haiku*)
++	LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
+ osf*)	CPPFLAGS="$CPPFLAGS -pthread";;
+ *qnx*)	qnx_build="yes"
+ 	$as_echo "#define HAVE_QNX 1" >>confdefs.h
+diff --git a/dist/configure.ac b/dist/configure.ac
+index 4a99779..85dfb93 100644
+--- a/dist/configure.ac
++++ b/dist/configure.ac
+@@ -184,6 +184,8 @@ irix*)	optimize_debug="-O2"
+ 	CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";;
+ mpeix*)	CPPFLAGS="$CPPFLAGS -D_POSIX_SOURCE -D_SOCKET_SOURCE"
+ 	LIBSO_LIBS="$LIBSO_LIBS -lsocket -lsvipc";;
++haiku*)
++	LIBSO_LIBS="$LIBSO_LIBS -lnetwork";;
+ osf*)	CPPFLAGS="$CPPFLAGS -pthread";;
+ *qnx*)	qnx_build="yes"
+ 	AC_DEFINE(HAVE_QNX)
+@@ -519,6 +521,9 @@ AC_SEARCH_LIBS(sched_yield, rt)
+ # The Berkeley DB library calls fdatasync, only available in -lrt on Solaris.
+ AC_SEARCH_LIBS(fdatasync, rt)
+ 
++# Socket only available in -lnetwork on Haiku
++AC_SEARCH_LIBS(socket, network)
++
+ AC_SEARCH_LIBS(getaddrinfo, nsl socket)
+ AC_SEARCH_LIBS(hstrerror, resolv)
+ 
+diff --git a/repmgr/repmgr_posix.c b/repmgr/repmgr_posix.c
+index 741f378..6892469 100644
+--- a/repmgr/repmgr_posix.c
++++ b/repmgr/repmgr_posix.c
+@@ -488,11 +488,7 @@ __repmgr_wake_main_thread(env)
+  * PUBLIC: int __repmgr_writev __P((socket_t, db_iovec_t *, int, size_t *));
+  */
+ int
+-__repmgr_writev(fd, iovec, buf_count, byte_count_p)
+-	socket_t fd;
+-	db_iovec_t *iovec;
+-	int buf_count;
+-	size_t *byte_count_p;
++__repmgr_writev(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
+ {
+ 	int nw;
+ 
+@@ -506,11 +502,7 @@ __repmgr_writev(fd, iovec, buf_count, byte_count_p)
+  * PUBLIC: int __repmgr_readv __P((socket_t, db_iovec_t *, int, size_t *));
+  */
+ int
+-__repmgr_readv(fd, iovec, buf_count, byte_count_p)
+-	socket_t fd;
+-	db_iovec_t *iovec;
+-	int buf_count;
+-	size_t *byte_count_p;
++__repmgr_readv(socket_t fd, db_iovec_t *iovec, int buf_count, size_t *byte_count_p)
+ {
+ 	ssize_t nw;
+ 

From 426353291a7e5b92ae8e118dd8e45d5c15705c4b Mon Sep 17 00:00:00 2001
From: noryb009 <noryb009@hotmail.com>
Date: Sun, 8 Dec 2013 22:17:43 -0500
Subject: [PATCH 09/28] Add BeCheckers recipe

Work by GCI2013 student Luke
---
 .../becheckers/becheckers-1.0.1.recipe        | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 haiku-games/becheckers/becheckers-1.0.1.recipe

diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe
new file mode 100644
index 000000000..6e3fe4060
--- /dev/null
+++ b/haiku-games/becheckers/becheckers-1.0.1.recipe
@@ -0,0 +1,43 @@
+SUMMARY="A simple checkers game for two players"
+DESCRIPTION="
+	BeCheckers is a simple checkers game for two players.
+	It follows almost all American Checker Federation (ACF)
+	rules.
+	"
+HOMEPAGE="https://github.com/HaikuArchives/BeCheckers"
+SRC_URI="git+git://github.com/noryb009/BeCheckers.git#70ef2b9d07141751746316484cf6e2df66e82aac"
+LICENSE="MIT"
+COPYRIGHT="2000 Jeremy J. Gibbons"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+
+PROVIDES="
+	BeCheckers = $portVersion
+	app:BeCheckers = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	"
+
+BUILD()
+{
+	cd trunk
+	g++ -o BeCheckers -lbe \
+		BeCheckers.cpp BeCheckersWindow.cpp \
+		Checker.cpp CheckerBoard.cpp
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir
+	cp trunk/BeCheckers $appsDir
+	addAppDeskbarSymlink $appsDir/BeCheckers
+}

From 813f47dfa55b4f9ef254b38498fe700ecfddf867 Mon Sep 17 00:00:00 2001
From: noryb009 <noryb009@hotmail.com>
Date: Sun, 8 Dec 2013 22:47:08 -0500
Subject: [PATCH 10/28] Update SRC_URI

---
 haiku-games/becheckers/becheckers-1.0.1.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haiku-games/becheckers/becheckers-1.0.1.recipe b/haiku-games/becheckers/becheckers-1.0.1.recipe
index 6e3fe4060..c7f5117c7 100644
--- a/haiku-games/becheckers/becheckers-1.0.1.recipe
+++ b/haiku-games/becheckers/becheckers-1.0.1.recipe
@@ -5,7 +5,7 @@ DESCRIPTION="
 	rules.
 	"
 HOMEPAGE="https://github.com/HaikuArchives/BeCheckers"
-SRC_URI="git+git://github.com/noryb009/BeCheckers.git#70ef2b9d07141751746316484cf6e2df66e82aac"
+SRC_URI="git://github.com/HaikuArchives/BeCheckers.git#930d3e37339c4570d58e59c3300dba7d69dd4439"
 LICENSE="MIT"
 COPYRIGHT="2000 Jeremy J. Gibbons"
 REVISION="1"

From 847e9d66e4dde1aa705d819b40f8b0d8a6beb871 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 8 Dec 2013 22:16:14 -0600
Subject: [PATCH 11/28] db-all: Fix recipe secondaryArchSuffix and compat

---
 dev-db/db/db-4.8.30.recipe | 51 ++++++++++++++++++-----------------
 dev-db/db/db-5.3.28.recipe | 54 +++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/dev-db/db/db-4.8.30.recipe b/dev-db/db/db-4.8.30.recipe
index 7f7651450..c66848af8 100644
--- a/dev-db/db/db-4.8.30.recipe
+++ b/dev-db/db/db-4.8.30.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases
 HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/db-${portVersion}.tar.gz"
 CHECKSUM_MD5="f80022099c5742cd179343556179aa8c"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 LICENSE="SleepyCat"
@@ -13,25 +13,25 @@ COPYRIGHT="1990-2013, Oracle
 	2000-2005, INRIA - France Telecom"
 
 PROVIDES="
-	db${secondaryArchSuffix} = $portVersion
-	cmd:db_archive
-	cmd:db_checkpoint
-	cmd:db_deadlock
-	cmd:db_dump
-	cmd:db_hotbackup
-	cmd:db_load
-	cmd:db_printlog
-	cmd:db_recover
-	cmd:db_stat
-	cmd:db_sql
-	cmd:db_upgrade
-	cmd:db_verify
-	lib:libdb_4.8
-	lib:libdb_4
-	lib:libdb
-	lib:libdb_cxx
-	lib:libdb_cxx_4.8
-	lib:libdb_cxx_4
+	db${secondaryArchSuffix} = $portVersion compat >= 4.8
+	cmd:db_archive${secondaryArchSuffix}
+	cmd:db_checkpoint${secondaryArchSuffix}
+	cmd:db_deadlock${secondaryArchSuffix}
+	cmd:db_dump${secondaryArchSuffix}
+	cmd:db_hotbackup${secondaryArchSuffix}
+	cmd:db_load${secondaryArchSuffix}
+	cmd:db_printlog${secondaryArchSuffix}
+	cmd:db_recover${secondaryArchSuffix}
+	cmd:db_stat${secondaryArchSuffix}
+	cmd:db_sql${secondaryArchSuffix}
+	cmd:db_upgrade${secondaryArchSuffix}
+	cmd:db_verify${secondaryArchSuffix}
+	lib:libdb_4.8${secondaryArchSuffix}
+	lib:libdb_4${secondaryArchSuffix}
+	lib:libdb${secondaryArchSuffix}
+	lib:libdb_cxx${secondaryArchSuffix}
+	lib:libdb_cxx_4.8${secondaryArchSuffix}
+	lib:libdb_cxx_4${secondaryArchSuffix}
 	"
 REQUIRES="
     haiku${secondaryArchSuffix} >= $haikuVersion
@@ -47,7 +47,6 @@ BUILD_PREREQUIRES="
 	"
 
 PATCHES="db-${portVersion}.patch"
-SOURCE_DIR="db-${portVersion}"
 
 BUILD()
 {
@@ -79,11 +78,11 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	db${secondaryArchSuffix}_devel = $portVersion
-	devel:libdb$secondaryArchSuffix = $portVersion
-	devel:libdb_4.8$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx_4.8$secondaryArchSuffix = $portVersion
+	db${secondaryArchSuffix}_devel = $portVersion compat >= 4.8
+	devel:libdb${secondaryArchSuffix} = $portVersion
+	devel:libdb_4.8${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx_4.8${secondaryArchSuffix} = $portVersion
 	"
 
 REQUIRES_devel="
diff --git a/dev-db/db/db-5.3.28.recipe b/dev-db/db/db-5.3.28.recipe
index 976880726..afa37f969 100644
--- a/dev-db/db/db-5.3.28.recipe
+++ b/dev-db/db/db-5.3.28.recipe
@@ -3,7 +3,7 @@ DESCRIPTION="The Oracle Berkeley DB family of open source, embeddable databases
 HOMEPAGE="http://www.oracle.com/technetwork/database/berkeleydb/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz"
 CHECKSUM_MD5="b99454564d5b4479750567031d66fe24"
-REVISION="2"
+REVISION="3"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 LICENSE="SleepyCat"
@@ -13,27 +13,27 @@ COPYRIGHT="1990-2013, Oracle
 	2000-2005, INRIA - France Telecom"
 
 PROVIDES="
-	db${secondaryArchSuffix} = $portVersion
-	cmd:db_archive
-	cmd:db_checkpoint
-	cmd:db_deadlock
-	cmd:db_dump
-	cmd:db_hotbackup
-	cmd:db_load
-	cmd:db_log_verify
-	cmd:db_printlog
-	cmd:db_recover
-	cmd:db_replicate
-	cmd:db_stat
-	cmd:db_tuner
-	cmd:db_upgrade
-	cmd:db_verify
-	lib:libdb_5.3
-	lib:libdb_5
-	lib:libdb
-	lib:libdb_cxx
-	lib:libdb_cxx_5.3
-	lib:libdb_cxx_5
+	db${secondaryArchSuffix} = $portVersion compat >= 5.3
+	cmd:db_archive${secondaryArchSuffix}
+	cmd:db_checkpoint${secondaryArchSuffix}
+	cmd:db_deadlock${secondaryArchSuffix}
+	cmd:db_dump${secondaryArchSuffix}
+	cmd:db_hotbackup${secondaryArchSuffix}
+	cmd:db_load${secondaryArchSuffix}
+	cmd:db_log_verify${secondaryArchSuffix}
+	cmd:db_printlog${secondaryArchSuffix}
+	cmd:db_recover${secondaryArchSuffix}
+	cmd:db_replicate${secondaryArchSuffix}
+	cmd:db_stat${secondaryArchSuffix}
+	cmd:db_tuner${secondaryArchSuffix}
+	cmd:db_upgrade${secondaryArchSuffix}
+	cmd:db_verify${secondaryArchSuffix}
+	lib:libdb_5.3${secondaryArchSuffix}
+	lib:libdb_5${secondaryArchSuffix}
+	lib:libdb${secondaryArchSuffix}
+	lib:libdb_cxx${secondaryArchSuffix}
+	lib:libdb_cxx_5.3${secondaryArchSuffix}
+	lib:libdb_cxx_5${secondaryArchSuffix}
 	"
 REQUIRES="
     haiku${secondaryArchSuffix} >= $haikuVersion
@@ -81,11 +81,11 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	db${secondaryArchSuffix}_devel = $portVersion
-	devel:libdb$secondaryArchSuffix = $portVersion
-	devel:libdb_5.3$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx$secondaryArchSuffix = $portVersion
-	devel:libdb_cxx_5.3$secondaryArchSuffix = $portVersion
+	db${secondaryArchSuffix}_devel = $portVersion compat >= 5.3
+	devel:libdb${secondaryArchSuffix} = $portVersion
+	devel:libdb_5.3${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx${secondaryArchSuffix} = $portVersion
+	devel:libdb_cxx_5.3${secondaryArchSuffix} = $portVersion
 	"
 
 REQUIRES_devel="

From f5035b13449693bf4a260c7b969885e4f664e87c Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Mon, 9 Dec 2013 10:27:30 +0000
Subject: [PATCH 12/28] Fixed fastdep so that it builds again

---
 dev-util/fastdep/fastdep-0.16.recipe | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/dev-util/fastdep/fastdep-0.16.recipe b/dev-util/fastdep/fastdep-0.16.recipe
index 9aebf221e..8b20c2e5b 100644
--- a/dev-util/fastdep/fastdep-0.16.recipe
+++ b/dev-util/fastdep/fastdep-0.16.recipe
@@ -1,6 +1,6 @@
-SUMMARY="fastdep is a fast dependency generator for C/C++ files." 
+SUMMARY="fastdep is a fast dependency generator for C/C++ files."
 DESCRIPTION="fastdep is a preprocessor which generates dependency information suitable for Makefile inclusion from C or C++ source files.  Meant to run on slower hardware, it is several orders of magnitude faster than gcc."
-HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/" 
+HOMEPAGE="http://www.irule.be/bvh/c++/fastdep/"
 SRC_URI="http://ports-space.haiku-files.org/dev-util/source/fastdep-0.16.tar.gz"
 REVISION="1"
 CHECKSUM_MD5="838c08b790a5dfe9a50a4aec7947bc54"
@@ -14,14 +14,15 @@ PATCHES="fastdep-0.16.patch"
 PROVIDES="
 	cmd:fastdep = $portVersion compat >= 0
 	"
-	
+
 REQUIRES="
-	lib:libstdc++.r4
-	lib:libroot >= $haikuVersion"
-	
-BUILD_REQUIRES="
+	haiku >= $haikuVersion
 	"
-	
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make
@@ -40,5 +41,3 @@ INSTALL()
 	mkdir -p $binDir
 	cp -f fastdep $binDir
 }
-
-

From 7afffc1dd96eb9d2412be2557e5298331b0c7947 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Mon, 9 Dec 2013 10:27:56 +0000
Subject: [PATCH 13/28] Fixed ccache so that it builds again

---
 dev-util/ccache/ccache-3.1.9.recipe | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dev-util/ccache/ccache-3.1.9.recipe b/dev-util/ccache/ccache-3.1.9.recipe
index 3ab1af323..0cc56695c 100644
--- a/dev-util/ccache/ccache-3.1.9.recipe
+++ b/dev-util/ccache/ccache-3.1.9.recipe
@@ -1,6 +1,6 @@
 SUMMARY="ccache is a fast compiler cache."
-DESCRIPTION="ccache is a compiler cache.  It speeds up recompilation by caching previous compilations and detecting when same compilation is being done again.  Supported languages are C, C++, Objective-C and Objective-C++." 
-HOMEPAGE="http://ccache.samba.org/" 
+DESCRIPTION="ccache is a compiler cache.  It speeds up recompilation by caching previous compilations and detecting when same compilation is being done again.  Supported languages are C, C++, Objective-C and Objective-C++."
+HOMEPAGE="http://ccache.samba.org/"
 SRC_URI="http://samba.org/ftp/ccache/ccache-3.1.9.tar.bz2"
 REVISION="1"
 
@@ -11,15 +11,21 @@ COPYRIGHT="2002-2007 Andrew Tridgell
 CHECKSUM_MD5="65f48376a91d3651d6527ca568858be8"
 
 ARCHITECTURES="x86 x86_gcc2"
+
 PROVIDES="
+	ccache = $portVersion
 	cmd:ccache
 	"
+
 REQUIRES="
-	lib:libroot >= $haikuVersion
+	haiku >= $haikuVersion
 	lib:libz >= 1
 	"
+
 BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
 	"
+
 BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:make

From 695aa4856c77e942cc07a35c58a98044675316da Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Mon, 9 Dec 2013 10:47:50 +0000
Subject: [PATCH 14/28] Added fastdep and ccache to paladine recipe, this fixes
 makefile export, but paledit is still broken

---
 haiku-apps/paladin/paladin-1.3.recipe | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/haiku-apps/paladin/paladin-1.3.recipe b/haiku-apps/paladin/paladin-1.3.recipe
index 950bf44c9..7095700d1 100644
--- a/haiku-apps/paladin/paladin-1.3.recipe
+++ b/haiku-apps/paladin/paladin-1.3.recipe
@@ -1,6 +1,6 @@
 SUMMARY="Paladin is a open source integrated development environment (IDE)"
-DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE." 
-HOMEPAGE="http://paladin.sourceforge.net" 
+DESCRIPTION="Paladin is an open source integrated development environment (IDE) modeled after BeOS' BeIDE."
+HOMEPAGE="http://paladin.sourceforge.net"
 SRC_URI="http://sourceforge.net/projects/paladin/files/Paladin-1.3.src.zip/download"
 REVISION="2"
 CHECKSUM_MD5="5cf4b445f77626f71956ccc325ed77dc"
@@ -25,6 +25,8 @@ PROVIDES="
 REQUIRES="
 	haiku >= $haikuVersion
 	lib:libpcre
+	cmd:fastdep
+	cmd:ccache
 "
 BUILD_REQUIRES="
 	devel:libpcre
@@ -51,12 +53,12 @@ BUILD()
 	cd Paladin
 	./build.sh
 	cd ..
-	
+
 	#Rez
 	cd PalEdit/rez/Sources
 	g++ -o rez *.cpp -I. -lbe
 	cd ../../..
-	
+
 	#PalEdit
 	cd PalEdit/Sources
 	g++ -shared -fPIC -o libhekkel.so HAppResFile.cpp HButtonBar.cpp HColorControl.cpp \
@@ -76,7 +78,7 @@ BUILD()
 		utf-support.cpp Utils.cpp libhekkel.so -lpcre -lbe -ltracker -lmail -ltextencoding -ltranslation \
 		-lnetwork
 	cd ../..
-	
+
 	#SymbolFinder
 	cd SymbolFinder
 	g++ -o SymbolFinder *.cpp -lbe -lroot
@@ -88,23 +90,23 @@ INSTALL()
 	mkdir -p $appsDir/Paladin
 	mkdir -p $libDir
 	mkdir -p $binDir
-	
+
 	#Paladin
 	cp Paladin/Paladin $appsDir/Paladin
 	cp Paladin/README $appsDir/Paladin
 	cp -r Templates $appsDir/Paladin
 	cp -r Paladin/Licenses $appsDir/Paladin
-	
+
 	#Rez
 	cp PalEdit/rez/Sources/rez $binDir
-	
+
 	#PalEdit
 	cp PalEdit/Sources/PalEdit $appsDir/Paladin/PalEdit
 	cp PalEdit/Sources/libhekkel.so $libDir
-	
+
 	#SymbolFinder
 	cp SymbolFinder/SymbolFinder $appsDir/Paladin
-	
+
 	addAppDeskbarSymlink $appsDir/Paladin/Paladin Paladin
 	addAppDeskbarSymlink $appsDir/Paladin/PalEdit PalEdit
 	addAppDeskbarSymlink $appsDir/Paladin/SymbolFinder "Symbol Finder"

From 09b00f319c95f09b9089bf74c9992d1a3f34c9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 13:15:35 +0100
Subject: [PATCH 15/28] Comment out libtiff dependency in libsdl

Since we don't actually require it at build time, it's not needed
at runtime either.
---
 media-libs/libsdl/libsdl-1.2.15.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libsdl/libsdl-1.2.15.recipe b/media-libs/libsdl/libsdl-1.2.15.recipe
index 4e9a5b657..6e04a168a 100644
--- a/media-libs/libsdl/libsdl-1.2.15.recipe
+++ b/media-libs/libsdl/libsdl-1.2.15.recipe
@@ -21,7 +21,7 @@ REQUIRES="
 	lib:libglu$secondaryArchSuffix
 	lib:libpng$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
-	lib:libtiff$secondaryArchSuffix
+#	lib:libtiff$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="

From 53f9afc3e15c76eda0e6687f157139ae5f255de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 13:41:24 +0100
Subject: [PATCH 16/28] Fix ocp recipe

Although it doesn't seem to detect SDL.h yet...
---
 media-sound/ocp/ocp-0.1.21_git.recipe | 66 +++++++++++++++++++++------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe
index 0abc28e07..fec139bb0 100644
--- a/media-sound/ocp/ocp-0.1.21_git.recipe
+++ b/media-sound/ocp/ocp-0.1.21_git.recipe
@@ -1,28 +1,66 @@
+SUMMARY="ocp - Open Cubic Player" 
 DESCRIPTION="ocp - Open Cubic Player, a music player ported from DOS" 
 HOMEPAGE="http://stian.cubic.org/project-ocp.php" 
 SRC_URI="git://git.code.sf.net/p/opencubicplayer/code"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libvorbis >= 1.3.1
-		media-libs/libogg >= 1.2.2
-		sys-devel/gettext >= 0.18.1.1
-		media-libs/libsdl >= 1.2.14"
-#		media-libs/flac >= 1.2.1"
-# ncurses zlib ... cf. ocp.spec
-MESSAGE="This port requires gcc4"
+LICENSE="GNU GPL v2"
+COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"
+#DEPEND="media-libs/libvorbis >= 1.3.1
+#		media-libs/libogg >= 1.2.2
+#		sys-devel/gettext >= 0.18.1.1
+#		media-libs/libsdl >= 1.2.14"
+##		media-libs/flac >= 1.2.1"
+## ncurses zlib ... cf. ocp.spec
+
+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="
+	ocp$secondaryArchSuffix = $portVersion
+	cmd:ocp = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	libsdl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libogg$secondaryArchSuffix >= 0.8.0
+	lib:libvorbis$secondaryArchSuffix >= 0.4.5
+	"
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libsdl_1.2$secondaryArchSuffix >= 0.10
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix >= 1.2.8
+	devel:libogg$secondaryArchSuffix >= 0.8.0
+	devel:libvorbis$secondaryArchSuffix >= 0.4.5
+	"
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:sdl_config
+	"
+
+
+SOURCE_DIR="code"
+
 BUILD()
 {
-	cd code
 	autoconf
-	CPPFLAGS=-I/boot/common/include LDFLAGS=-L/boot/common/lib ./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	./configure --prefix=$prefix
 	make
 }
 
 INSTALL()
 {
-	cd code
 	make install
 }
-
-LICENSE="GNU GPL v2"
-COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"

From cbcb976abf6119fb5a9944967a628e81635a441c Mon Sep 17 00:00:00 2001
From: Gleb Posobin <posobin@gmail.com>
Date: Mon, 9 Dec 2013 19:43:39 +0400
Subject: [PATCH 17/28] Some more changes to Mr.Peeps recipe

---
 haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe        | 10 ++++------
 haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch | 13 +++++++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
index fe9290f46..d6047a9bf 100644
--- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
+++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
@@ -16,6 +16,8 @@ REQUIRES="
 	"
 BUILD_REQUIRES="
 	haiku_devel >= $haikuVersion
+	"
+BUILD_PREREQUIRES="
 	cmd:gcc
 	"
 PATCHES="MrPeeps-1.2_beta.patch"
@@ -33,10 +35,6 @@ BUILD()
 
 INSTALL()
 {
-	mrPeepsDir=$appsDir/MrPeeps
-	mkdir -p $mrPeepsDir
-	[ -h $binDir ] || mkdir -p $binDir
-	cp -f ./MrPeeps $mrPeepsDir
-	ln -sfn $mrPeepsDir/MrPeeps $binDir/
-	addAppDeskbarSymlink $mrPeepsDir/MrPeeps
+	cp -f ./MrPeeps $appsDir
+	addAppDeskbarSymlink $appsDir/MrPeeps
 }
diff --git a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
index ab4587221..069aa06a4 100644
--- a/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
+++ b/haiku-apps/mrpeeps/patches/MrPeeps-1.2_beta.patch
@@ -1,17 +1,22 @@
 diff -Naur -x .git /boot/home/MrPeeps/src/ListData.h ./src/ListData.h
 --- /boot/home/MrPeeps/src/ListData.h	2013-12-01 19:17:49.441188352 +0400
-+++ ./src/ListData.h	2013-12-02 23:31:26.658767872 +0400
-@@ -3,6 +3,7 @@
++++ ./src/ListData.h	2013-12-09 19:07:33.235667456 +0400
+@@ -3,10 +3,11 @@
  
  #include <Entry.h>
  #include <List.h>
 +#include <Node.h>
  #include <String.h>
- #include "BStringList.h"
+-#include "BStringList.h"
  #include <Bitmap.h>
+ #include "BitmapDump.h"
++#include "BStringList.h"
+ 
+ class PeepsListItem;
+ class GroupItem;
 diff -Naur -x .git /boot/home/MrPeeps/src/PeepsWindow.h ./src/PeepsWindow.h
 --- /boot/home/MrPeeps/src/PeepsWindow.h	2013-12-01 19:17:49.467927040 +0400
-+++ ./src/PeepsWindow.h	2013-12-02 23:32:59.641990656 +0400
++++ ./src/PeepsWindow.h	2013-12-09 19:07:59.108789760 +0400
 @@ -1,16 +1,18 @@
  #ifndef PEEPSWINDOW_H
  #define PEEPSWINDOW_H

From 31c68383776de0690a5ff63f8049c934403c3630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 16:55:14 +0100
Subject: [PATCH 18/28] ocp: Force SDL detection

Seems we must pass CFLAGS instead now...
I'd be nicer if configure used sdl-config directly though.

Now it's not building anymore though...
---
 media-sound/ocp/ocp-0.1.21_git.recipe | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe
index fec139bb0..7c3a79062 100644
--- a/media-sound/ocp/ocp-0.1.21_git.recipe
+++ b/media-sound/ocp/ocp-0.1.21_git.recipe
@@ -47,16 +47,20 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
-	cmd:sdl_config
 	"
+#XXX: this one pulls gcc2 SDL package in... which we don't need
+#	cmd:sdl_config
 
 
 SOURCE_DIR="code"
 
+# TODO: fix configure.ac to use sdl-config
+# XXX: dwmixfa_8087.c:39:2: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'
 BUILD()
 {
 	autoconf
-	./configure --prefix=$prefix
+	export CFLAGS="$(sdl-config --cflags)"
+	./configure --prefix=$prefix 
 	make
 }
 

From 391e2b7b9d9759959c86df05e66b73b39ad80da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 17:37:09 +0100
Subject: [PATCH 19/28] Fix and rename NetSurf's buildsystem

lowercase name works much better...

FIXME: still need to fix paths (share/...).
---
 .../buildsystem/buildsystem-1.0_HEAD.recipe   | 20 ---------
 .../buildsystem/buildsystem-1.0_git.recipe    | 42 +++++++++++++++++++
 2 files changed, 42 insertions(+), 20 deletions(-)
 delete mode 100644 dev-util/buildsystem/buildsystem-1.0_HEAD.recipe
 create mode 100644 dev-util/buildsystem/buildsystem-1.0_git.recipe

diff --git a/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe b/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe
deleted file mode 100644
index 9ea205843..000000000
--- a/dev-util/buildsystem/buildsystem-1.0_HEAD.recipe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION="NetSurf build framework for compiling some of their libraries" 
-HOMEPAGE="http://www.netsurf-browser.org/" 
-SRC_URI="git://git.netsurf-browser.org/buildsystem.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-
-BUILD()
-{
-	cd buildsystem-1.0-HEAD
-	make
-}
-
-INSTALL()
-{
-	cd buildsystem-1.0-HEAD
-	make install PREFIX=/boot/common/
-}
-
-LICENSE="MIT"
-COPYRIGHT="2009 - 2013 The NetSurf Browser project"
diff --git a/dev-util/buildsystem/buildsystem-1.0_git.recipe b/dev-util/buildsystem/buildsystem-1.0_git.recipe
new file mode 100644
index 000000000..72fa5c2ed
--- /dev/null
+++ b/dev-util/buildsystem/buildsystem-1.0_git.recipe
@@ -0,0 +1,42 @@
+SUMMARY="NetSurf build framework" 
+DESCRIPTION="NetSurf build framework for compiling some of their libraries" 
+HOMEPAGE="http://www.netsurf-browser.org/" 
+SRC_URI="git://git.netsurf-browser.org/buildsystem.git"
+REVISION="1"
+STATUS_HAIKU="stable"
+LICENSE="MIT"
+COPYRIGHT="2009 - 2013 The NetSurf Browser project"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	buildsystem$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix
+}
+

From 45fddca9efe8bf25859c5c8c5a3464febfce20be Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Mon, 9 Dec 2013 16:52:30 +0000
Subject: [PATCH 20/28] Fix install of mrpeeps

---
 haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
index d6047a9bf..1b18547e3 100644
--- a/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
+++ b/haiku-apps/mrpeeps/mrpeeps-1.2_beta.recipe
@@ -1,7 +1,7 @@
-SUMMARY="Easy to use powerful contact manager for haiku" 
-DESCRIPTION="MrPeeps is an app for managing People files that has more 
-	features than other contact managers. For more info read README file" 
-HOMEPAGE="https://github.com/HaikuArchives/MrPeeps" 
+SUMMARY="Easy to use powerful contact manager for haiku"
+DESCRIPTION="MrPeeps is an app for managing People files that has more
+	features than other contact managers. For more info read README file"
+HOMEPAGE="https://github.com/HaikuArchives/MrPeeps"
 SRC_URI="git+https://github.com/HaikuArchives/MrPeeps#ce2e65"
 LICENSE="MIT"
 COPYRIGHT="2003 DarkWyrm"
@@ -30,11 +30,12 @@ BUILD()
 		BitmapView.cpp BStringList.cpp DataView.cpp Formatting.cpp \
 		IntroView.cpp ListData.cpp MrPeeps.cpp NewTextControl.cpp \
 		PeepsItem.cpp PeepsWindow.cpp PeopleList.cpp LocaleRoster.cpp \
-		Locale.cpp TextFile.cpp -o ../MrPeeps	
+		Locale.cpp TextFile.cpp -o ../MrPeeps
 }
 
 INSTALL()
 {
+	mkdir -p $appsDir
 	cp -f ./MrPeeps $appsDir
 	addAppDeskbarSymlink $appsDir/MrPeeps
 }

From 13cf07ad296713114a25d1d648d12a52fb9a2281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 18:03:30 +0100
Subject: [PATCH 21/28] libwapcaplet: rename recipe to lowercase

---
 ...bwapcaplet-0.2.0_HEAD.recipe => libwapcaplet-0.2.0_git.recipe} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dev-libs/libwapcaplet/{libwapcaplet-0.2.0_HEAD.recipe => libwapcaplet-0.2.0_git.recipe} (100%)

diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
similarity index 100%
rename from dev-libs/libwapcaplet/libwapcaplet-0.2.0_HEAD.recipe
rename to dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe

From 324d7d07af6858a263cb771f0fdb874645741ce0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 18:04:16 +0100
Subject: [PATCH 22/28] netsurf_buildsystem: Force installing to data/

The install path is hardcoded in the makefile to $prefix/shared/.

Also remove the make invocation, it's a no-op anyway.
---
 dev-util/buildsystem/buildsystem-1.0_git.recipe | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-util/buildsystem/buildsystem-1.0_git.recipe b/dev-util/buildsystem/buildsystem-1.0_git.recipe
index 72fa5c2ed..a616a303e 100644
--- a/dev-util/buildsystem/buildsystem-1.0_git.recipe
+++ b/dev-util/buildsystem/buildsystem-1.0_git.recipe
@@ -3,7 +3,6 @@ DESCRIPTION="NetSurf build framework for compiling some of their libraries"
 HOMEPAGE="http://www.netsurf-browser.org/" 
 SRC_URI="git://git.netsurf-browser.org/buildsystem.git"
 REVISION="1"
-STATUS_HAIKU="stable"
 LICENSE="MIT"
 COPYRIGHT="2009 - 2013 The NetSurf Browser project"
 
@@ -32,11 +31,13 @@ SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
-	make
+	# no-op
+	# make
+	:
 }
 
 INSTALL()
 {
-	make install PREFIX=$prefix
+	make install PREFIX=$prefix BASE=$prefix/data/netsurf-buildsystem
 }
 

From 6257415a4db24e7a53ad8bdd16a2b90599620f4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 18:12:24 +0100
Subject: [PATCH 23/28] netsurf_buildsystem: remove old recipe

---
 dev-util/buildsystem/buildsystem-0.recipe | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 dev-util/buildsystem/buildsystem-0.recipe

diff --git a/dev-util/buildsystem/buildsystem-0.recipe b/dev-util/buildsystem/buildsystem-0.recipe
deleted file mode 100644
index e8074bdb9..000000000
--- a/dev-util/buildsystem/buildsystem-0.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="NetSurf build framework for compiling some of their libraries" 
-HOMEPAGE="http://www.netsurf-browser.org/" 
-SRC_URI="git://git.netsurf-browser.org/buildsystem"
-REVISION="1"
-STATUS_HAIKU="stable"
-
-BUILD()
-{
-	cd buildsystem-0
-	make
-}
-
-INSTALL()
-{
-	cd buildsystem-0
-	make install PREFIX=/boot/common/
-}
-
-LICENSE="MIT
-	GNU GPL v2"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"

From ba717a91585d2a383ab0a49302f16a77e8b9c244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 18:15:28 +0100
Subject: [PATCH 24/28] buildsystem: rename to netsurf_buildsystem

---
 .../netsurf_buildsystem-1.0_git.recipe}                           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dev-util/{buildsystem/buildsystem-1.0_git.recipe => netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe} (100%)

diff --git a/dev-util/buildsystem/buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
similarity index 100%
rename from dev-util/buildsystem/buildsystem-1.0_git.recipe
rename to dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe

From c46dcd59a4ff1ec1710aecc61282982babeee372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 18:17:00 +0100
Subject: [PATCH 25/28] netsurf_buildsystem: Fix provides

---
 dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
index a616a303e..7bdcadc5e 100644
--- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
+++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
@@ -10,7 +10,7 @@ ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	buildsystem$secondaryArchSuffix = $portVersion
+	netsurf_buildsystem$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="

From a11641c76231aea6dc9cf67dcbe9571c9ee77a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 19:05:59 +0100
Subject: [PATCH 26/28] libwapcaplet: Fix recipe

---
 .../libwapcaplet-0.2.0_git.recipe             | 38 +++++++++++++++----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
index 24a190d2d..7fb9cac8a 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
@@ -1,21 +1,43 @@
+SUMMARY="LibWapcaplet is a string internment library" 
 DESCRIPTION="LibWapcaplet is a string internment library" 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" 
 SRC_URI="git://git.netsurf-browser.org/libwapcaplet.git"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0"
+LICENSE="MIT"
+COPYRIGHT="2009 - 2012 The NetSurf Browser project"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libwapcaplet$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	netsurf_buildsystem >= 0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
-	cd libwapcaplet-0.2.0-HEAD
-	make PREFIX=/boot/common
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
 }
 
 INSTALL()
 {
-	cd libwapcaplet-0.2.0-HEAD
-	make install PREFIX=/boot/common
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		I=/develop/headers/libwapcaplet
 }
 
-LICENSE="MIT"
-COPYRIGHT="2009 - 2012 The NetSurf Browser project"

From e57b39fbda93283e0368aebce39e3dfd557b6fbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 19:08:00 +0100
Subject: [PATCH 27/28] libparseutils: rename recipe to lowercase

---
 ...serutils-0.1.2_HEAD.recipe => libparserutils-0.1.2_git.recipe} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename dev-libs/libparserutils/{libparserutils-0.1.2_HEAD.recipe => libparserutils-0.1.2_git.recipe} (100%)

diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
similarity index 100%
rename from dev-libs/libparserutils/libparserutils-0.1.2_HEAD.recipe
rename to dev-libs/libparserutils/libparserutils-0.1.2_git.recipe

From 8c934e3c56db24e17cc428db7813debe4eb0c23f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Mon, 9 Dec 2013 19:14:03 +0100
Subject: [PATCH 28/28] libparserutils: Fix recipe

---
 .../libparserutils-0.1.2_git.recipe           | 41 +++++++++++++++----
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
index f05444ead..c9d13086d 100644
--- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
@@ -1,21 +1,46 @@
+SUMMARY="LibParserUtils is a library for building efficient parsers" 
 DESCRIPTION="LibParserUtils is a library for building efficient parsers" 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libparserutils/" 
 SRC_URI="git://git.netsurf-browser.org/libparserutils.git"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0.0.1"
+LICENSE="MIT"
+COPYRIGHT="2007 - 2013 J-M Bell"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	libparserutils$secondaryArchSuffix = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv${secondaryArchSuffix}
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv${secondaryArchSuffix}
+	netsurf_buildsystem >= 0
+	"
+
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	"
+
+SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
-	cd libparserutils-0.1.2-HEAD
-	make PREFIX=/boot/common
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
 }
 
 INSTALL()
 {
-	cd libparserutils-0.1.2-HEAD
-	make install PREFIX=/boot/common
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		I=/develop/headers/libparserutils
 }
 
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"