diff --git a/dev-libs/check/check-0.9.13.recipe b/dev-libs/check/check-0.9.13.recipe
new file mode 100644
index 000000000..0341698a9
--- /dev/null
+++ b/dev-libs/check/check-0.9.13.recipe
@@ -0,0 +1,59 @@
+SUMMARY="Unit Testing Framework for C"
+DESCRIPTION="
+Check is a unit testing framework for C. It features a simple interface for \
+defining unit tests, putting little in the way of the developer. Tests are \
+run in a separate address space, so both assertion failures and code errors \
+that cause segmentation faults or other signals can be caught. Test results \
+are reportable in the following: Subunit, TAP, XML, and a generic logging \
+format.
+"
+HOMEPAGE="http://check.sourceforge.net/"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+SRC_URI="http://sourceforge.net/projects/check/files/check/0.9.13/check-0.9.13.tar.gz"
+CHECKSUM_SHA256="ca6589c34f9c60ffd4c3e198ce581e944a9f040ca9352ed54068dd61bebb5cb7"
+COPYRIGHT="xxx"
+
+PROVIDES="
+	check = $portVersion
+
+	cmd:checkmk
+	lib:libcheck = $portVersion
+"
+
+REQUIRES="
+	haiku >= $haikuVersion
+"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:awk
+	cmd:gcc
+	cmd:make
+"
+
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib libcheck
+	fixPkgconfig libcheck
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make check
+}
+
+PROVIDES_devel="
+	check_devel = $portVersion
+	devel:libcheck = $portVersion
+"
diff --git a/dev-libs/json_c/json_c-0.12.recipe b/dev-libs/json_c/json_c-0.12.recipe
new file mode 100644
index 000000000..2f722d98b
--- /dev/null
+++ b/dev-libs/json_c/json_c-0.12.recipe
@@ -0,0 +1,64 @@
+SUMMARY="A JSON implementation in C"
+DESCRIPTION="
+JSON-C implements a reference counting object model that allows you to easily \
+construct JSON objects in C, output them as JSON formatted strings and parse \
+JSON formatted strings back into the C representation of JSON objects.
+"
+SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12-nodoc.tar.gz"
+CHECKSUM_SHA256="6fd6d2311d610b279e1bcdd5c6d4f699700159d3e0786de8306af7b4bc94fb35"
+HOMEPAGE="https://github.com/json-c/json-c/wiki"
+ARCHITECTURES="x86_gcc2"
+REVISION="1"
+LICENSE="MIT"
+COPYRIGHT="
+	2009-2012 Eric Haszlakiewicz
+	2004, 2005 Metaparadigm Pte Ltd
+"
+
+PROVIDES="
+	json_c = $portVersion
+	lib:libjson_c = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:gcc
+	cmd:libtool
+	cmd:make
+"
+
+SOURCE_DIR="json-c-$portVersion"
+PATCHES="json_c-$portVersion.patchset"
+BUILD()
+{
+	sh autogen.sh
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib libjson-c
+	fixPkgconfig libjson-c
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make check
+}
+
+PROVIDES_devel="
+	json_c_devel = $portVersion
+	devel:libjson_c = $portVersion
+	"
+
+REQUIRES_devel="json_c == $portVersion base"
diff --git a/dev-libs/json_c/json_c-0.9.recipe b/dev-libs/json_c/json_c-0.9.recipe
deleted file mode 100644
index bc916a517..000000000
--- a/dev-libs/json_c/json_c-0.9.recipe
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION="A JSON implementation in C" 
-HOMEPAGE="http://oss.metaparadigm.com/json-c/" 
-SRC_URI="http://oss.metaparadigm.com/json-c/json-c-0.9.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="3a13d264528dcbaf3931b0cede24abae"
-BUILD()
-{
-	cd json-c-0.9
-	libtoolize --force --install --copy
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make 
-}
-
-INSTALL()
-{
-	cd json-c-0.9
-	make install DESTDIR=${DESTDIR}
-}
-
-LICENSE="MIT"
-COPYRIGHT="2004-2005 Metaparadigm Pte Ltd"
\ No newline at end of file
diff --git a/dev-libs/json_c/patches/json_c-0.12.patchset b/dev-libs/json_c/patches/json_c-0.12.patchset
new file mode 100644
index 000000000..a1ebb4eda
--- /dev/null
+++ b/dev-libs/json_c/patches/json_c-0.12.patchset
@@ -0,0 +1,45 @@
+From 42928f5769cc98b8cd791dfa2c58f7dc0634dba5 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 19:35:53 +0200
+Subject: Remove compiler options unknown to gcc2.
+
+
+diff --git a/Makefile.am.inc b/Makefile.am.inc
+index fec591b..21aec1f 100644
+--- a/Makefile.am.inc
++++ b/Makefile.am.inc
+@@ -1,2 +1,2 @@
+-AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
++AM_CFLAGS = -Wall -Wwrite-strings -std=gnu9x -D_GNU_SOURCE -D_REENTRANT
+ 
+-- 
+1.8.3.4
+
+
+From d75281fd4c7e7b91913d25f3a2052221af50116e Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 21:08:43 +0200
+Subject: Avoid c99ism to make gcc2 happy.
+
+
+diff --git a/json_tokener.c b/json_tokener.c
+index 19de8ef..80841f1 100644
+--- a/json_tokener.c
++++ b/json_tokener.c
+@@ -355,11 +355,12 @@ struct json_object* json_tokener_parse_ex(struct json_tokener *tok,
+ 	int size;
+ 	int size_inf;
+ 	int is_negative = 0;
++	char* infbuf;
+ 
+ 	printbuf_memappend_fast(tok->pb, &c, 1);
+ 	size = json_min(tok->st_pos+1, json_null_str_len);
+ 	size_inf = json_min(tok->st_pos+1, json_inf_str_len);
+-	char *infbuf = tok->pb->buf;
++	infbuf = tok->pb->buf;
+ 	if (*infbuf == '-')
+ 	{
+ 		infbuf++;
+-- 
+1.8.3.4
+
diff --git a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe b/dev-libs/libparserutils/libparserutils-0.2.0.recipe
similarity index 51%
rename from dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
rename to dev-libs/libparserutils/libparserutils-0.2.0.recipe
index 0ee101344..9ecaa06cf 100644
--- a/dev-libs/libparserutils/libparserutils-0.1.2_git.recipe
+++ b/dev-libs/libparserutils/libparserutils-0.2.0.recipe
@@ -1,13 +1,13 @@
-#TODO:split out _devel
 SUMMARY="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"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.0-src.tar.gz"
+CHECKSUM_SHA256="55c50abbffaaebe17acba43008ee2c4085401ce618e505fafa7c75baaa813da7"
 REVISION="1"
 LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
+COPYRIGHT="2007-2014 J-M Bell"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -15,7 +15,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 PROVIDES="
 	libparserutils$secondaryArchSuffix = $portVersion
 	lib:libparserutils$secondaryArchSuffix = $portVersion
-	devel:libparserutils$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
@@ -26,7 +25,9 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv${secondaryArchSuffix}
-	netsurf_buildsystem >= 0
+	netsurf_buildsystem >= 1.1
+
+	lib:libiconv${secondaryArchSuffix}
 	"
 
 BUILD_PREREQUIRES="
@@ -36,17 +37,39 @@ BUILD_PREREQUIRES="
 	cmd:perl
 	"
 
+PATCHES="libparserutils-0.2.0.patchset"
 
 BUILD()
 {
+	# Build the static lib
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+	# Build the shared lib
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		COMPONENT_TYPE=lib-shared
 }
 
 INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		I=/develop/headers/libparserutils
+		INCLUDEDIR=$relativeIncludeDir
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir COMPONENT_TYPE=lib-shared
+
 	mkdir -p $prefix/develop/lib
-	mv -f $prefix/lib/*.a $prefix/develop/lib/
-	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+
+	prepareInstalledDevelLib libparserutils
+	fixPkgconfig libparserutils
+
+	packageEntries devel $developDir
 }
+
+TEST()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		LDFLAGS=-liconv test
+}
+
+PROVIDES_devel="
+	libparserutils${secondaryArchSuffix}_devel = $portVersion
+	devel:libparserutils$secondaryArchSuffix = $portVersion
+"
diff --git a/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset b/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset
new file mode 100644
index 000000000..2761f5236
--- /dev/null
+++ b/dev-libs/libparserutils/patches/libparserutils-0.2.0.patchset
@@ -0,0 +1,50 @@
+From 40b2c1f916c450195884c7db57bbea9155e297fc Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 18:39:53 +0200
+Subject: Fix include directories for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index 5acdc36..14b8325 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,19 +33,19 @@ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+ Is := include/parserutils
+-I := /include/parserutils
++I := /$(INCLUDEDIR)/parserutils
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/errors.h;$(Is)/functypes.h;$(Is)/parserutils.h;$(Is)/types.h
+ 
+ Is := include/parserutils/charset
+-I := /include/parserutils/charset
++I := /$(INCLUDEDIR)/parserutils/charset
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/codec.h;$(Is)/mibenum.h;$(Is)/utf16.h;$(Is)/utf8.h
+ 
+ Is := include/parserutils/input
+-I := /include/parserutils/input
++I := /$(INCLUDEDIR)/parserutils/input
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/inputstream.h
+ 
+ Is := include/parserutils/utils
+-I := /include/parserutils/utils
++I := /$(INCLUDEDIR)/parserutils/utils
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/buffer.h;$(Is)/stack.h;$(Is)/vector.h
+ 
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+diff --git a/libparserutils.pc.in b/libparserutils.pc.in
+index 307e909..1a46cf8 100644
+--- a/libparserutils.pc.in
++++ b/libparserutils.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
++includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libparserutils
+ Description: Utility library for facilitating parser development
+-- 
+1.8.3.4
+
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe
deleted file mode 100644
index 42356bef8..000000000
--- a/dev-libs/libwapcaplet/libwapcaplet-0.1.1_HEAD.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-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"
-
-BUILD()
-{
-	cd libwapcaplet-0.1.1-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libwapcaplet-0.1.1-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT
-	GNU GPL v2"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe
similarity index 55%
rename from dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
rename to dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe
index dfc4b2a7d..6fa4167f6 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.0_git.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe
@@ -1,13 +1,15 @@
-#TODO:split out _devel
 SUMMARY="LibWapcaplet is a string internment library" 
 DESCRIPTION="
 LibWapcaplet is a string internment library.
+It provides reference counted string interment and rapid string comparison \
+functionality.
 " 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libwapcaplet/" 
-SRC_URI="git://git.netsurf-browser.org/libwapcaplet.git"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.2.1-src.tar.gz"
+CHECKSUM_SHA256="9e4a8df3dfe6d7e1bcc4a3ccce18c3d02230545f4726b05b09b9e504946c8ec8"
 REVISION="1"
 LICENSE="MIT"
-COPYRIGHT="2009 - 2012 The NetSurf Browser project"
+COPYRIGHT="2009-2014 The NetSurf Browser project"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -15,7 +17,6 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 PROVIDES="
 	libwapcaplet$secondaryArchSuffix = $portVersion
 	lib:libwapcaplet$secondaryArchSuffix = $portVersion
-	devel:libwapcaplet$secondaryArchSuffix = $portVersion
 	"
 
 REQUIRES="
@@ -25,15 +26,19 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	netsurf_buildsystem >= 0
+
+	lib:libcheck
+	devel:libcheck
 	"
 
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
+	cmd:pkg_config
 	"
 
-
+PATCHES="libwapcaplet-0.2.1.recipe"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -42,8 +47,20 @@ BUILD()
 INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		I=/develop/headers/libwapcaplet
+		INCLUDEDIR=$relativeIncludeDir
 	mkdir -p $prefix/develop/lib
-	mv -f $prefix/lib/*.a $prefix/develop/lib/
-	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+
+	prepareInstalledDevelLib libwapcaplet
+	fixPkgconfig libwapcaplet
+	packageEntries devel $developDir
 }
+
+TEST()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
+}
+
+PROVIDES_devel="
+	libwapcaplet${secondaryArchSuffix}_devel = $portVersion
+	devel:libwapcaplet$secondaryArchSuffix = $portVersion
+"
diff --git a/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset b/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset
new file mode 100644
index 000000000..8dab7c82f
--- /dev/null
+++ b/dev-libs/libwapcaplet/patches/libwapcaplet-0.2.1.patchset
@@ -0,0 +1,35 @@
+From 32b0d42e141a2bab66d7420e1f7159282f5beb69 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 22:42:45 +0200
+Subject: Fix include dirs for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index f40842d..db191ee 100644
+--- a/Makefile
++++ b/Makefile
+@@ -41,7 +41,7 @@ ifeq ($(WANT_TEST),yes)
+ endif
+ 
+ # Extra installation rules
+-I := /include/libwapcaplet
++I := /$(INCLUDEDIR)/libwapcaplet
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libwapcaplet/libwapcaplet.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
+diff --git a/libwapcaplet.pc.in b/libwapcaplet.pc.in
+index 9bdfdf5..9c05e37 100644
+--- a/libwapcaplet.pc.in
++++ b/libwapcaplet.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
++includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libwapcaplet
+ Description: String internalisation dictionary
+-- 
+1.8.3.4
+
diff --git a/dev-perl/html_parser/html_parser-3.71.recipe b/dev-perl/html_parser/html_parser-3.71.recipe
new file mode 100644
index 000000000..17ad05e2b
--- /dev/null
+++ b/dev-perl/html_parser/html_parser-3.71.recipe
@@ -0,0 +1,44 @@
+#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="https://github.com/gisle/html-parser/archive/3.71.tar.gz"
+#CHECKSUM_SHA256="a9a18c79b1d2b315daedafe7598dc1068d562eaeaa5bd46265a6ebd2805446c1"
+REVISION="1"
+ARCHITECTURES="x86 x86_gcc2"
+PROVIDES="
+	html_parser = $portVersion
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	perl
+	"
+COPYRIGHT="
+1995-2009 Gisle Aas. All rights reserved.
+1999-2000 Michael A. Chase.  All rights reserved.
+"
+LICENSE="
+	GNU GPL v1
+	Artistic (Perl)
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:perl"
+
+SOURCE_DIR="html-parser-3.71"
+BUILD() {
+	perl Makefile.PL PREFIX=$prefix
+	make
+}
+
+INSTALL() {
+	make install
+}
+
+DESCRIPTION="
+The HTML-Parser distribution is is a collection of perl modules that parse and \
+extract information from HTML documents.
+"
diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe
similarity index 67%
rename from dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
rename to dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe
index 00f6e381a..cf3ccaa98 100644
--- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe
+++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe
@@ -2,8 +2,9 @@ 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"
+HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/"
+SRC_URI="http://git.netsurf-browser.org/buildsystem.git/snapshot/release/1.1.tar.gz"
+CHECKSUM_SHA256="e95e40d4e4e4bea2ffb391c0df1d84f81c83b1d21af992fbda0406d4d57e7dc1"
 REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2009 - 2013 The NetSurf Browser project"
@@ -29,12 +30,12 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-
+SOURCE_DIR="release/1.1"
+PATCHES="netsurf_buildsystem-1.1.patchset"
 BUILD()
 {
 	# no-op
-	# make
-	:
+	true
 }
 
 INSTALL()
diff --git a/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset b/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset
new file mode 100644
index 000000000..71289b99f
--- /dev/null
+++ b/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset
@@ -0,0 +1,44 @@
+From 4a0ea106ab2a23af3798b7a3114c969f7339c05a Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 18:12:27 +0200
+Subject: Add support for INCLUDEDIR in pkg-config files.
+
+
+diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
+index 5b76f23..2f21be0 100644
+--- a/makefiles/Makefile.tools
++++ b/makefiles/Makefile.tools
+@@ -21,6 +21,8 @@
+ # 				(defaults to /usr/local)
+ # LIBDIR		Library installation directory in ${PREFIX}
+ # 				(defaults to lib)
++# INCLUDEDIR	Header installation directory in ${PREFIX}
++# 				(defaults to include)
+ #
+ 
+ ###############################################################################
+@@ -373,6 +375,9 @@ PREFIX ?= /usr/local
+ # Default libdir
+ LIBDIR ?= lib
+ 
++# Default includedir
++INCLUDEDIR ?= include
++
+ ###############################################################################
+ # Tool defaults
+ ###############################################################################
+diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
+index 6329c47..bd51ecd 100644
+--- a/makefiles/Makefile.top
++++ b/makefiles/Makefile.top
+@@ -291,6 +291,7 @@ define install_pkgconfig
+ 		-e 's#MAJOR#$(major-version)#' \
+ 		-e 's#MINOR#$(minor-version)#' \
+ 		-e 's#PATCH#$(patch-version)#' \
++		-e 's#INCLUDEDIR#$(INCLUDEDIR)#' \
+ 		-e 's#VERSION#$(COMPONENT_VERSION)#' \
+ 		-e 's#REQUIRED#$(__required)#' \
+ 		$1 >$(BUILDDIR)/$(1:.in=)
+-- 
+1.8.3.4
+
diff --git a/net-libs/hubbub/hubbub-0.1.2.recipe b/net-libs/hubbub/hubbub-0.1.2.recipe
deleted file mode 100644
index 46bb76916..000000000
--- a/net-libs/hubbub/hubbub-0.1.2.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Hubbub is an HTML5 compliant parsing library" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" 
-SRC_URI="http://download.netsurf-browser.org/libs/releases/hubbub-0.1.2-src.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-
-BUILD()
-{
-	cd hubbub-0.1.2
-	make
-}
-
-INSTALL()
-{
-	cd hubbub-0.1.2
-	make install
-}
-
-LICENSE="MIT
-	GNU GPL v2"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
diff --git a/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe b/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe
deleted file mode 100644
index 32617af60..000000000
--- a/net-libs/hubbub/hubbub-0.1.2_HEAD.recipe
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION="Hubbub is an HTML5 compliant parsing library" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" 
-SRC_URI="git://git.netsurf-browser.org/libhubbub.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0
-	dev-libs/libparserutils >= 0.1.1"
-
-BUILD()
-{
-	cd hubbub-0.1.2-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd hubbub-0.1.2-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
diff --git a/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe b/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe
deleted file mode 100644
index 933be4ec9..000000000
--- a/net-libs/hubbub/hubbub-0.2.0_HEAD.recipe
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION="Hubbub is an HTML5 compliant parsing library" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" 
-SRC_URI="git://git.netsurf-browser.org/libhubbub.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPENDS="dev-util/buildsystem >= 0.0.1"
-
-BUILD()
-{
-	cd hubbub-0.2.0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd hubbub-0.2.0-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
diff --git a/net-libs/hubbub/libhubbub-0.3.0.recipe b/net-libs/hubbub/libhubbub-0.3.0.recipe
new file mode 100644
index 000000000..52ec185f6
--- /dev/null
+++ b/net-libs/hubbub/libhubbub-0.3.0.recipe
@@ -0,0 +1,73 @@
+SUMMARY="Hubbub is an HTML5 compliant parsing library" 
+DESCRIPTION="
+Hubbub is an HTML5 compliant parsing library, written in C. It was developed \
+as part of the NetSurf project and is available for use by other software \
+under the MIT licence.
+The HTML5 specification defines a parsing algorithm, based on the behaviour \
+of mainstream browsers, which provides instructions for how to parse all \
+markup, both valid and invalid. As a result, Hubbub parses web content well.
+If you are looking for an HTML5 parser in Python or Ruby, you may wish to \
+look at html5lib.
+"
+HOMEPAGE="http://www.netsurf-browser.org/projects/hubbub/" 
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.0-src.tar.gz"
+CHECKSUM_SHA256="dbf3b55bf2531d2a8e70f370a9b396cc78bfd5a092f87beb10b05c04fd7cdaa7"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	libhubbub = $portVersion
+	lib:libhubbub = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	netsurf_buildsystem >= 0.3.0
+	devel:libparserutils
+
+	devel:libjson_c
+	devel:libiconv
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+	"
+
+PATCHES="libhubbub-0.3.0.patchset"
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		COMPONENT_TYPE=lib-shared
+}
+
+INSTALL()
+{
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir COMPONENT_TYPE=lib-shared
+
+	prepareInstalledDevelLib libhubbub
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		LDFLAGS="-liconv -lparserutils" test
+}
+
+LICENSE="MIT"
+COPYRIGHT="2007-2014 J-M Bell"
+
+PROVIDES_devel="
+	libhubbub_devel = $portVersion
+	devel:libhubbub = $portVersion
+"
diff --git a/net-libs/hubbub/patches/libhubbub-0.3.0.patchset b/net-libs/hubbub/patches/libhubbub-0.3.0.patchset
new file mode 100644
index 000000000..367ef2575
--- /dev/null
+++ b/net-libs/hubbub/patches/libhubbub-0.3.0.patchset
@@ -0,0 +1,47 @@
+From 977b947e2c464a1df18bdccaef261b0c7776406a Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 21:43:33 +0200
+Subject: Fix include dirs for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index 4ec03f3..f6bfff2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -47,9 +47,9 @@ ifeq ($(WANT_TEST),yes)
+   # We require the presence of libjson -- http://oss.metaparadigm.com/json-c/
+   ifneq ($(PKGCONFIG),)
+     TESTCFLAGS := $(TESTCFLAGS) \
+-		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json)
++		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --cflags json-c)
+     TESTLDFLAGS := $(TESTLDFLAGS) \
+-		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json)
++		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json-c)
+   else
+     TESTCFLAGS := $(TESTCFLAGS) -I$(PREFIX)/include/json
+     TESTLDFLAGS := $(TESTLDFLAGS) -ljson
+@@ -61,7 +61,7 @@ ifeq ($(WANT_TEST),yes)
+ endif
+ 
+ # Extra installation rules
+-I := /include/hubbub
++I := /$(INCLUDEDIR)/hubbub
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/errors.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/functypes.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/hubbub.h
+diff --git a/libhubbub.pc.in b/libhubbub.pc.in
+index 2f9565e..b20a4a0 100644
+--- a/libhubbub.pc.in
++++ b/libhubbub.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
++includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libhubbub
+ Description: HTML5 parsing library
+-- 
+1.8.3.4
+
diff --git a/www-client/netsurf/netsurf-3.1.recipe b/www-client/netsurf/netsurf-3.1.recipe
new file mode 100644
index 000000000..62e2e8f00
--- /dev/null
+++ b/www-client/netsurf/netsurf-3.1.recipe
@@ -0,0 +1,63 @@
+SUMMARY="NetSurf is a multi-platform web browser" 
+DESCRIPTION="
+Small as a mouse, fast as a cheetah and available for free. NetSurf is a \
+multi-platform web browser for RISC OS, UNIX-like platforms (including Linux), \
+Mac OS X, and more.
+
+Whether you want to check your webmail, read the news or post to discussion \
+forums, NetSurf is your lightweight gateway to the world wide web. Actively \
+developed, NetSurf is continually evolving and improving.
+"
+HOMEPAGE="http://www.netsurf-browser.org/" 
+SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-3.1.tar.gz"
+CHECKSUM_SHA256="c5b84810f8c7567da8397612121f82ed9532281a73d5c507f45c26ce64f61c17"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+REQUIRES="
+	lib:libcurl
+	lib:libpng
+	lib:libjpeg
+"
+
+BUILD_REQUIRES="
+	haiku_devel >= $haikuVersion
+	devel:libcurl
+	devel:libexpat
+	devel:libiconv
+	devel:libjpeg
+	devel:libpng
+	devel:libssl
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	html_parser >= 3.70
+	cmd:bison
+	cmd:flex
+	cmd:gcc
+	cmd:gperf
+	cmd:make
+	cmd:pkg_config
+	"
+
+PROVIDES="
+	netsurf = $portVersion
+	app:NetSurf = $portVersion
+"
+
+SOURCE_DIR="netsurf-all-$portVersion"
+PATCHES="netsurf-3.1.patchset"
+
+BUILD()
+{
+	make TARGET=beos PREFIX=$prefix
+}
+
+INSTALL()
+{
+	make TARGET=beos PREFIX=$prefix install
+	addAppDeskbarSymlink $appsDir/netsurf/NetSurf NetSurf
+}
+
+LICENSE="GNU GPL v2"
+COPYRIGHT="2003 - 2014 The NetSurf Browser project"
diff --git a/www-client/netsurf/patches/netsurf-3.1.patchset b/www-client/netsurf/patches/netsurf-3.1.patchset
new file mode 100644
index 000000000..871b0cbdd
--- /dev/null
+++ b/www-client/netsurf/patches/netsurf-3.1.patchset
@@ -0,0 +1,601 @@
+From 7ff4f37e1263fd99dda14fda5d358d5c1974a684 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 16:32:07 +0200
+Subject: Fix various paths for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index ecb46b9..c5a8a5c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,10 +31,10 @@ endef
+ build: $(TMP_PREFIX)/build-stamp
+ 
+ $(TMP_PREFIX)/build-stamp:
+-	mkdir -p $(TMP_PREFIX)/include
++	mkdir -p $(TMP_PREFIX)/develop/headers
+ 	mkdir -p $(TMP_PREFIX)/lib
+ 	$(foreach L,$(NSLIBTARG),$(call do_prefix_install,$(L)))
+-	$(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET)
++	$(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) TMP_PREFIX=$(TMP_PREFIX)
+ 	touch $@
+ 
+ install: $(TMP_PREFIX)/build-stamp
+diff --git a/libcss/Makefile b/libcss/Makefile
+index d80178c..f2819cd 100644
+--- a/libcss/Makefile
++++ b/libcss/Makefile
+@@ -44,7 +44,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include/libcss
++I := /develop/headers/libcss
+ 
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/computed.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/errors.h
+diff --git a/libdom/Makefile b/libdom/Makefile
+index c6bc2bd..d047cef 100644
+--- a/libdom/Makefile
++++ b/libdom/Makefile
+@@ -38,7 +38,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
+     LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils --libs)
+     LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libwapcaplet --libs)
+   else
+-    CFLAGS := $(CFLAGS) -I$(PREFIX)/include
++    CFLAGS := $(CFLAGS) -I$(PREFIX)/system/develop/headers
+     LDFLAGS := $(LDFLAGS) -lparserutils -lwapcaplet
+   endif
+ endif
+@@ -47,11 +47,11 @@ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+ Is := include/dom
+-I := /include/dom
++I := /develop/headers/dom
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h
+ 
+ Is := include/dom/core
+-I := /include/dom/core
++I := /develop/headers/dom/core
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/attr.h;$(Is)/characterdata.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/cdatasection.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/comment.h
+@@ -66,7 +66,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/pi.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/text.h;$(Is)/typeinfo.h
+ 
+ Is := include/dom/events
+-I := /include/dom/events
++I := /develop/headers/dom/events
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event.h;$(Is)/ui_event.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/custom_event.h;$(Is)/mouse_event.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/keyboard_event.h;$(Is)/text_event.h
+@@ -78,7 +78,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/event_listener.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/document_event.h
+ 
+ Is := include/dom/html
+-I := /include/dom/html
++I := /develop/headers/dom/html
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_document.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_collection.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_element.h
+diff --git a/libdom/bindings/hubbub/Makefile b/libdom/bindings/hubbub/Makefile
+index 946219d..04511a6 100644
+--- a/libdom/bindings/hubbub/Makefile
++++ b/libdom/bindings/hubbub/Makefile
+@@ -1,7 +1,7 @@
+ ifeq ($(WITH_HUBBUB_BINDING),yes)
+   DIR_SOURCES := parser.c
+ 
+-  DIR_INSTALL_ITEMS := /include/dom/bindings/hubbub:errors.h;parser.h
++  DIR_INSTALL_ITEMS := /develop/headers/dom/bindings/hubbub:errors.h;parser.h
+ 
+   # Hubbub
+   ifneq ($(PKGCONFIG),)
+diff --git a/libdom/bindings/xml/Makefile b/libdom/bindings/xml/Makefile
+index ea7653c..0e4c1a2 100644
+--- a/libdom/bindings/xml/Makefile
++++ b/libdom/bindings/xml/Makefile
+@@ -26,7 +26,7 @@ ifeq ($(WITH_EXPAT_BINDING),yes)
+ endif
+ 
+ ifeq ($(DO_XML_INSTALL),yes)
+-  DIR_INSTALL_ITEMS := /include/dom/bindings/xml:xmlerror.h;xmlparser.h
++  DIR_INSTALL_ITEMS := /develop/headers/dom/bindings/xml:xmlerror.h;xmlparser.h
+ endif
+ 
+ include $(NSBUILD)/Makefile.subdir
+diff --git a/libhubbub/Makefile b/libhubbub/Makefile
+index 4ec03f3..6b2e8c1 100644
+--- a/libhubbub/Makefile
++++ b/libhubbub/Makefile
+@@ -36,7 +36,7 @@ ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
+     CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) libparserutils --cflags)
+     LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) libparserutils --libs)
+   else
+-    CFLAGS := $(CFLAGS) -I$(PREFIX)/include
++    CFLAGS := $(CFLAGS) -I$(PREFIX)/develop/headers
+     LDFLAGS := $(LDFLAGS) -lparserutils
+   endif
+ endif
+@@ -51,7 +51,7 @@ ifeq ($(WANT_TEST),yes)
+     TESTLDFLAGS := $(TESTLDFLAGS) \
+ 		$(shell $(PKGCONFIG) $(PKGCONFIGFLAGS) --libs json)
+   else
+-    TESTCFLAGS := $(TESTCFLAGS) -I$(PREFIX)/include/json
++    TESTCFLAGS := $(TESTCFLAGS) -I$(PREFIX)/system/develop/headers/json
+     TESTLDFLAGS := $(TESTLDFLAGS) -ljson
+   endif
+ 
+@@ -61,7 +61,7 @@ ifeq ($(WANT_TEST),yes)
+ endif
+ 
+ # Extra installation rules
+-I := /include/hubbub
++I := /develop/headers/hubbub
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/errors.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/functypes.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/hubbub/hubbub.h
+diff --git a/libnsbmp/Makefile b/libnsbmp/Makefile
+index aad7a6e..87ab341 100644
+--- a/libnsbmp/Makefile
++++ b/libnsbmp/Makefile
+@@ -29,7 +29,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include/
++I := /develop/headers/
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsbmp.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
+diff --git a/libnsfb/Makefile b/libnsfb/Makefile
+index 14f359e..ceea738 100644
+--- a/libnsfb/Makefile
++++ b/libnsfb/Makefile
+@@ -13,14 +13,14 @@ include $(NSSHARED)/makefiles/Makefile.tools
+ TESTRUNNER = test/runtest.sh $(BUILDDIR) $(EXEEXT)
+ 
+ # Toolchain flags
+-WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
++WARNFLAGS := -Wall -Wundef -Wpointer-arith -Wcast-align \
+ 	-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ 	-Wmissing-declarations -Wnested-externs -Werror
+ 
+ # would like these flags but gcc earlier than 4.4 fail
+ #-pedantic -Wno-overlength-strings # For nsglobe.c
+ 
+-CFLAGS := -g -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112L \
++CFLAGS := -g -std=gnu9x -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112L \
+ 	-I$(CURDIR)/include/ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) -Wno-error
+ 
+ NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom
+@@ -104,7 +104,7 @@ TESTLDFLAGS := -lm -Wl,--whole-archive -l$(COMPONENT) -Wl,--no-whole-archive $(T
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include
++I := /develop/headers/
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_plot.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsfb_plot_util.h
+diff --git a/libnsgif/Makefile b/libnsgif/Makefile
+index 099477d..7f43e5c 100644
+--- a/libnsgif/Makefile
++++ b/libnsgif/Makefile
+@@ -29,7 +29,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include
++I := /develop/headers
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libnsgif.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
+diff --git a/libparserutils/Makefile b/libparserutils/Makefile
+index 5acdc36..fa45c42 100644
+--- a/libparserutils/Makefile
++++ b/libparserutils/Makefile
+@@ -33,19 +33,19 @@ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+ Is := include/parserutils
+-I := /include/parserutils
++I := /develop/headers/parserutils
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/errors.h;$(Is)/functypes.h;$(Is)/parserutils.h;$(Is)/types.h
+ 
+ Is := include/parserutils/charset
+-I := /include/parserutils/charset
++I := /develop/headers/parserutils/charset
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/codec.h;$(Is)/mibenum.h;$(Is)/utf16.h;$(Is)/utf8.h
+ 
+ Is := include/parserutils/input
+-I := /include/parserutils/input
++I := /develop/headers/parserutils/input
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/inputstream.h
+ 
+ Is := include/parserutils/utils
+-I := /include/parserutils/utils
++I := /develop/headers/parserutils/utils
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/buffer.h;$(Is)/stack.h;$(Is)/vector.h
+ 
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+diff --git a/libparserutils/libparserutils.pc.in b/libparserutils/libparserutils.pc.in
+index 307e909..ea1af0c 100644
+--- a/libparserutils/libparserutils.pc.in
++++ b/libparserutils/libparserutils.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
++includedir=${prefix}/develop/headers
+ 
+ Name: libparserutils
+ Description: Utility library for facilitating parser development
+diff --git a/librosprite/Makefile b/librosprite/Makefile
+index 4682a87..1f40c06 100644
+--- a/librosprite/Makefile
++++ b/librosprite/Makefile
+@@ -14,11 +14,11 @@ NSSHARED ?= $(PREFIX)/share/netsurf-buildsystem
+ include $(NSSHARED)/makefiles/Makefile.tools
+ 
+ # Toolchain flags
+-WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \
++WARNFLAGS := -Wall -Wundef -Wpointer-arith -Wcast-align \
+ 	-Wwrite-strings -Wstrict-prototypes \
+-	-Wnested-externs -pedantic -std=c99 \
+-	-Wno-format-zero-length -Wformat-security -Wstrict-aliasing=2 \
+-	-Wmissing-format-attribute -Wunused \
++	-Wnested-externs -std=gnu9x \
++	-Wno-format-zero-length -Wformat-security \
++	-Wunused \
+ 	-Wformat=2 -Werror-implicit-function-declaration \
+ 	-Wmissing-declarations -Wmissing-prototypes
+ 
+@@ -39,7 +39,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include
++I := /develop/headers
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/librosprite.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
+diff --git a/libsvgtiny/Makefile b/libsvgtiny/Makefile
+index 392d9da..43458f7 100644
+--- a/libsvgtiny/Makefile
++++ b/libsvgtiny/Makefile
+@@ -45,7 +45,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include
++I := /develop/headers
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/svgtiny.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
+diff --git a/libwapcaplet/Makefile b/libwapcaplet/Makefile
+index f40842d..fd117a4 100644
+--- a/libwapcaplet/Makefile
++++ b/libwapcaplet/Makefile
+@@ -41,7 +41,7 @@ ifeq ($(WANT_TEST),yes)
+ endif
+ 
+ # Extra installation rules
+-I := /include/libwapcaplet
++I := /develop/headers/libwapcaplet
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libwapcaplet/libwapcaplet.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in
+ INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT)
+diff --git a/libwapcaplet/libwapcaplet.pc.in b/libwapcaplet/libwapcaplet.pc.in
+index 9bdfdf5..91cb6b4 100644
+--- a/libwapcaplet/libwapcaplet.pc.in
++++ b/libwapcaplet/libwapcaplet.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
++includedir=${prefix}/develop/headers
+ 
+ Name: libwapcaplet
+ Description: String internalisation dictionary
+diff --git a/netsurf/beos/Makefile.defaults b/netsurf/beos/Makefile.defaults
+index 303414d..a0cff73 100644
+--- a/netsurf/beos/Makefile.defaults
++++ b/netsurf/beos/Makefile.defaults
+@@ -3,12 +3,12 @@
+ # ----------------------------------------------------------------------------
+ 
+ # Where to install the netsurf binary
+-NETSURF_BEOS_BIN := /boot/apps/netsurf/
++NETSURF_BEOS_BIN := $(PREFIX)/apps/netsurf/
+ 
+ # TODO:HAIKU -- not sure if ~/.netsurf applies in beos
+ # Where to search for NetSurf's resources after looking in ~/.netsurf and
+ # $NETSURFRES.  It must have a trailing /
+-NETSURF_BEOS_RESOURCES := /boot/apps/netsurf/res/
++NETSURF_BEOS_RESOURCES := $(PREFIX)/apps/netsurf/res/
+ 
+ # Enable NetSurf's use of libsvgtiny for displaying SVGs
+ # Valid options: YES, NO, AUTO
+diff --git a/netsurf/beos/Makefile.target b/netsurf/beos/Makefile.target
+index ed7532d..cc8cb1c 100644
+--- a/netsurf/beos/Makefile.target
++++ b/netsurf/beos/Makefile.target
+@@ -7,7 +7,7 @@ $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng)  ))
+ 
+ LDFLAGS += -L/boot/home/config/lib
+ # for Haiku
+-LDFLAGS += -L/boot/common/lib
++LDFLAGS += -L/boot/system/lib
+ # some people do *not* have libm...
+ LDFLAGS += -lssl -lcrypto -lcss
+ $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny)))
+@@ -38,13 +38,14 @@ ifeq ($(HOST),beos)
+     ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),)
+       LDFLAGS += -lzeta
+     endif
+-    ifneq ($(wildcard /boot/develop/lib/*/libnetwork.so),)
++    ifneq ($(wildcard /system/develop/lib/libnetwork.so),)
+       # Haiku
+-      CFLAGS += -I/boot/common/include		\
+-		-I/boot/common/include/hubbub	\
+-		-I/boot/common/include/libcss	\
+-		-I/boot/common/include/parserutils
++      CFLAGS += -I$(TMP_PREFIX)/develop/headers		\
++		-I$(TMP_PREFIX)/develop/headers/hubbub	\
++		-I$(TMP_PREFIX)/develop/headers/libcss	\
++		-I$(TMP_PREFIX)/develop/headers/parserutils
+       NETLDFLAGS := -lnetwork
++	  LDFLAGS += -L$(TMP_PREFIX)/lib
+     else
+       ifneq ($(wildcard /boot/develop/lib/*/libbind.so),)
+         # BONE
+diff --git a/netsurf/beos/about.cpp b/netsurf/beos/about.cpp
+index cd8070e..2483a22 100644
+--- a/netsurf/beos/about.cpp
++++ b/netsurf/beos/about.cpp
+@@ -23,7 +23,7 @@
+ extern "C" {
+ #include "desktop/netsurf.h"
+ #include "utils/log.h"
+-#include "utils/testament.h"
++#include "testament.h"
+ #include "utils/useragent.h"
+ #include "curl/curlver.h"
+ }
+diff --git a/netsurf/beos/gui.cpp b/netsurf/beos/gui.cpp
+index 365a356..44d1977 100644
+--- a/netsurf/beos/gui.cpp
++++ b/netsurf/beos/gui.cpp
+@@ -80,7 +80,7 @@ extern "C" {
+ static void *myrealloc(void *ptr, size_t len, void *pw);
+ 
+ /* Where to search for shared resources.  Must have trailing / */
+-#define RESPATH "/boot/apps/netsurf/res/"
++#define RESPATH "/boot/system/apps/netsurf/res/"
+ 
+ //TODO: use resources
+ // enable using resources instead of files
+@@ -488,7 +488,7 @@ static bool nslog_stream_configure(FILE *fptr)
+ 
+ static BPath get_messages_path()
+ {
+-	BPath p("/boot/apps/netsurf/res");
++	BPath p(RESPATH);
+ 	// TODO: use Haiku's BLocale stuff
+ 	BString lang(getenv("LC_MESSAGES"));
+ 	lang.Truncate(2);
+-- 
+1.8.3.4
+
+
+From b699cee3d63a0d494c0107e612075d1a0936ecdf Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 8 Jun 2014 16:33:09 +0200
+Subject: Gcc2 doesn't allow varag macros to not have extra args
+
+Make sure there is always at least one.
+
+diff --git a/nsgenbind/src/jsapi-libdom-const.c b/nsgenbind/src/jsapi-libdom-const.c
+index ac728c7..bd4f19a 100644
+--- a/nsgenbind/src/jsapi-libdom-const.c
++++ b/nsgenbind/src/jsapi-libdom-const.c
+@@ -85,7 +85,7 @@ static int output_cast_literal(struct binding *binding,
+ 	case WEBIDL_TYPE_VOID:
+ 	case WEBIDL_TYPE_USER:
+ 	default:
+-		WARN(WARNING_UNIMPLEMENTED, "types not allowed as literal");
++		WARN(WARNING_UNIMPLEMENTED, "%s", "types not allowed as literal");
+ 		break; /* @todo these types are not allowed here */
+ 	}
+ 
+diff --git a/nsgenbind/src/jsapi-libdom-operator.c b/nsgenbind/src/jsapi-libdom-operator.c
+index 1d16afe..7486178 100644
+--- a/nsgenbind/src/jsapi-libdom-operator.c
++++ b/nsgenbind/src/jsapi-libdom-operator.c
+@@ -171,11 +171,11 @@ static int output_return(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_BYTE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_BYTE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_BYTE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_OCTET:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_OCTET");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_OCTET");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_FLOAT:
+@@ -187,12 +187,12 @@ static int output_return(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_SHORT:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_SHORT");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_SHORT");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_LONGLONG:
+ 		WARN(WARNING_UNIMPLEMENTED,
+-		     "Unhandled type WEBIDL_TYPE_LONGLONG");
++		     "Unhandled type %s", "WEBIDL_TYPE_LONGLONG");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_LONG:
+@@ -211,7 +211,7 @@ static int output_return(struct binding *binding,
+ 
+ 	case WEBIDL_TYPE_SEQUENCE:
+ 		WARN(WARNING_UNIMPLEMENTED,
+-		     "Unhandled type WEBIDL_TYPE_SEQUENCE");
++		     "Unhandled type %s", "WEBIDL_TYPE_SEQUENCE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_OBJECT:
+@@ -223,7 +223,7 @@ static int output_return(struct binding *binding,
+ 
+ 	case WEBIDL_TYPE_DATE:
+ 		WARN(WARNING_UNIMPLEMENTED,
+-		     "Unhandled type WEBIDL_TYPE_DATE");
++		     "Unhandled type %s", "WEBIDL_TYPE_DATE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_VOID:
+@@ -289,11 +289,11 @@ static int output_return_declaration(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_BYTE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_BYTE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_BYTE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_OCTET:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_OCTET");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_OCTET");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_FLOAT:
+@@ -303,12 +303,12 @@ static int output_return_declaration(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_SHORT:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_SHORT");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_SHORT");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_LONGLONG:
+ 		WARN(WARNING_UNIMPLEMENTED, 
+-		     "Unhandled type WEBIDL_TYPE_LONGLONG");
++		     "Unhandled type %s", "WEBIDL_TYPE_LONGLONG");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_LONG:
+@@ -333,7 +333,7 @@ static int output_return_declaration(struct binding *binding,
+ 
+ 	case WEBIDL_TYPE_SEQUENCE:
+ 		WARN(WARNING_UNIMPLEMENTED, 
+-		     "Unhandled type WEBIDL_TYPE_SEQUENCE");
++		     "Unhandled type %s", "WEBIDL_TYPE_SEQUENCE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_OBJECT:
+@@ -342,7 +342,7 @@ static int output_return_declaration(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_DATE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_DATE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_DATE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_VOID:
+diff --git a/nsgenbind/src/jsapi-libdom-property.c b/nsgenbind/src/jsapi-libdom-property.c
+index 2bd3068..2a74df8 100644
+--- a/nsgenbind/src/jsapi-libdom-property.c
++++ b/nsgenbind/src/jsapi-libdom-property.c
+@@ -558,11 +558,11 @@ static int output_return(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_BYTE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_BYTE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_BYTE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_OCTET:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_OCTET");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_OCTET");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_FLOAT:
+@@ -581,7 +581,7 @@ static int output_return(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_LONGLONG:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_LONGLONG");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_LONGLONG");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_LONG:
+@@ -607,7 +607,7 @@ static int output_return(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_SEQUENCE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_SEQUENCE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_SEQUENCE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_OBJECT:
+@@ -618,7 +618,7 @@ static int output_return(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_DATE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_DATE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_DATE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_VOID:
+@@ -675,11 +675,11 @@ static int output_return_declaration(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_BYTE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_BYTE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_BYTE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_OCTET:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_OCTET");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_OCTET");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_FLOAT:
+@@ -707,7 +707,7 @@ static int output_return_declaration(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_LONGLONG:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_LONGLONG");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_LONGLONG");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_LONG:
+@@ -736,7 +736,7 @@ static int output_return_declaration(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_SEQUENCE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_SEQUENCE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_SEQUENCE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_OBJECT:
+@@ -745,7 +745,7 @@ static int output_return_declaration(struct binding *binding,
+ 		break;
+ 
+ 	case WEBIDL_TYPE_DATE:
+-		WARN(WARNING_UNIMPLEMENTED, "Unhandled type WEBIDL_TYPE_DATE");
++		WARN(WARNING_UNIMPLEMENTED, "Unhandled type %s", "WEBIDL_TYPE_DATE");
+ 		break;
+ 
+ 	case WEBIDL_TYPE_VOID:
+-- 
+1.8.3.4
+