Merged haikuports/haikuports into master

2026-04-23 12:10:06 +02:00 · 2014-06-11 17:36:05 +02:00
parent 06a7822dd7 6e05d6bcd6
commit 798ff3b988
47 changed files with 996 additions and 1042 deletions
--- a/app-arch/unzip/unzip-6.0.recipe
+++ b/app-arch/unzip/unzip-6.0.recipe
@@ -6,31 +6,38 @@ or test its integrity.
 "
 HOMEPAGE="http://www.info-zip.org/UnZip.html"
 SRC_URI="http://downloads.sourceforge.net/project/infozip/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz"
+CHECKSUM_SHA256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37"
 REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND=""
-CHECKSUM_MD5="62b490407489521db863b523a7f86375"
+ARCHITECTURES="!x86_gcc2"
+
+PROVIDES="
+	unzip = $portVersion
+"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+"
+
+SOURCE_DIR="unzip60"
 BUILD()
 {
-	cd unzip60
 	make -f beos/Makefile \
-		PREFIX=`finddir B_COMMON_DIRECTORY` \
-		MANDIR=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
+		PREFIX=$prefix MANDIR=$manDir

 }

 INSTALL()
 {
-	cd unzip60
 	make -f beos/Makefile install
 }

 TEST()
 {
-	cd unzip60
-#	make test
+	make test
 #	make check
 }

 LICENSE="Info-ZIP"
-#COPYRIGHT=""
+COPYRIGHT="1995-2014 Greg Roelofs"
--- a/app-misc/mc/mc-4.8.11.recipe
+++ b/app-misc/mc/mc-4.8.11.recipe
@@ -50,6 +50,7 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:automake
 	cmd:autoheader
+	cmd:find
 	cmd:gcc
 	"

--- a/dev-db/sqlite/sqlite-3.8.4.3.recipe
+++ b/dev-db/sqlite/sqlite-3.8.4.3.recipe
@@ -0,0 +1,82 @@
+SUMMARY="An SQL Database Engine in a C Library" 
+DESCRIPTION="
+SQLite is a software library that implements a self-contained, serverless, \
+zero-configuration, transactional SQL database engine.
+SQLite is the most widely deployed SQL database engine in the world. The \
+source code for SQLite is in the public domain.
+"
+HOMEPAGE="http://www.sqlite.org/" 
+SRC_URI="http://www.sqlite.org/2014/sqlite-autoconf-3080403.tar.gz"
+CHECKSUM_SHA256="e0e995e23a324a5d6ae95d8a836240382a4d7475d09707fc469c8cafcbd48d65"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+LICENSE="SQLite"
+COPYRIGHT="Public Domain"
+
+PROVIDES="
+	sqlite$secondaryArchSuffix = $portVersion compat >= 3
+	lib:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:sqlite3 = $portVersion compat >= 3
+		"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	haiku_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	"
+
+SOURCE_DIR="sqlite-autoconf-3080403"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	prepareInstalledDevelLib libsqlite3
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	sqlite${secondaryArchSuffix}_devel = $portVersion
+	devel:libsqlite3$secondaryArchSuffix = 0.8.6 compat >= 0
+	"
+REQUIRES_devel="
+	sqlite$secondaryArchSuffix == $portVersion base
+	"
--- a/dev-libs/libcdio/libcdio-0.92.recipe
+++ b/dev-libs/libcdio/libcdio-0.92.recipe
@@ -67,6 +67,7 @@ INSTALL()

 	# set up the develop directory correctly
 	prepareInstalledDevelLibs libcdio
+	fixPkgconfig libcdio

 	# devel package
 	packageEntries devel \
--- a/dev-libs/libcss/libcss-0.2.0_git.recipe
+++ b/dev-libs/libcss/libcss-0.2.0_git.recipe
@@ -1,13 +1,13 @@
-#TODO:split out _devel
 SUMMARY="A CSS parser and selection engine" 
 DESCRIPTION="
 LibCSS is a CSS (Cascading Style Sheet) parser and selection engine.
 " 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
-SRC_URI="git://git.netsurf-browser.org/libcss.git"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-0.3.0-src.tar.gz"
+CHECKSUM_SHA256="4065dbfdfc9926e14a2f0f2c600fc72abac97bd20769ac6a908ac50226e95e1a"
 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="
 	libcss$secondaryArchSuffix = $portVersion
 	lib:libcss$secondaryArchSuffix = $portVersion
-	devel:libcss$secondaryArchSuffix = $portVersion
 	"

 REQUIRES="
@@ -29,6 +28,8 @@ BUILD_REQUIRES="
 	devel:libparserutils${secondaryArchSuffix} >= 0.1.1
 	devel:libwapcaplet${secondaryArchSuffix} >= 0.1.1
 	netsurf_buildsystem >= 0
+
+	devel:libiconv
 	"

 BUILD_PREREQUIRES="
@@ -39,7 +40,7 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"

-
+PATCHES="libcss-0.3.0.patchset"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -47,9 +48,21 @@ BUILD()

 INSTALL()
 {
-	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		I=/develop/headers/libcss
+	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
 	mkdir -p $prefix/develop/lib
-	mv -f $prefix/lib/*.a $prefix/develop/lib/
-	mv -f $prefix/lib/pkgconfig $prefix/develop/lib/
+
+	prepareInstalledDevelLib libcss
+	fixPkgconfig libcss
+	packageEntries devel $developDir
 }
+
+TEST()
+{
+	make test PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		LDFLAGS="-liconv -lwapcaplet -lparserutils"
+}
+
+PROVIDES_devel="
+	libcss${secondaryArchSuffix}_devel = $portVersion
+	devel:libcss$secondaryArchSuffix = $portVersion
+"
--- a/dev-libs/libcss/patches/libcss-0.3.0.patchset
+++ b/dev-libs/libcss/patches/libcss-0.3.0.patchset
@@ -0,0 +1,78 @@
+From 53ba61ff1f71c50a26a03909a9b35e12b79d939d Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 18:01:21 +0200
+Subject: Fix build with gcc2.
+
+
+diff --git a/test/dump.h b/test/dump.h
+index 941117c..97a6cfd 100644
+--- a/test/dump.h
+++ b/test/dump.h
+@@ -733,13 +733,14 @@ void dump_bytecode(css_style *style, char **ptr, uint32_t depth)
+ 		opcode_t op;
+ 		uint32_t value;
+ 		uint32_t opv = *((uint32_t *) bytecode);
+		uint32_t i;
+ 
+ 		ADVANCE(sizeof(opv));
+ 
+ 		op = getOpcode(opv);
+ 
+ 		*((*ptr)++) = '|';
+-		for (uint32_t i = 0; i < depth; i++)
+		for (i = 0; i < depth; i++)
+ 			*((*ptr)++) = ' ';
+ 		*ptr += sprintf(*ptr, "%s: ", opcode_names[op]);
+ 
+@@ -2657,10 +2658,10 @@ void dump_font_face(css_font_face *font_face, char **ptr)
+ 		uint32_t i;
+ 		css_font_face_src *srcs = font_face->srcs;
+ 		for (i = 0; i < font_face->n_srcs; ++i) {
+			css_font_face_format format;
+ 			*ptr += sprintf(*ptr, "\n|  src: ");
+ 			
+-			css_font_face_format format = 
+-					css_font_face_src_format(&srcs[i]);
+			format = css_font_face_src_format(&srcs[i]);
+ 			
+ 			*ptr += sprintf(*ptr, "\n|   format: ");
+ 			
+-- 
+1.8.3.4
+
+
+From 7bb3452686257d7732b6c6cbcf5c8ace35280a09 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 18:01:32 +0200
+Subject: Fix include paths for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index d80178c..321eb5c 100644
+--- a/Makefile
+++ b/Makefile
+@@ -44,7 +44,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include/libcss
+I := /$(INCLUDEDIR)/libcss
+ 
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/computed.h
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):include/libcss/errors.h
+diff --git a/libcss.pc.in b/libcss.pc.in
+index 695aa76..8df11b4 100644
+--- a/libcss.pc.in
+++ b/libcss.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libcss
+ Description: CSS parsing and selection library
+-- 
+1.8.3.4
+
--- a/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe
@@ -38,7 +38,7 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config
 	"

-PATCHES="libwapcaplet-0.2.1.recipe"
+PATCHES="libwapcaplet-0.2.1.patchset"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
--- a/dev-perl/html_parser/html_parser-3.71.recipe
+++ b/dev-perl/html_parser/html_parser-3.71.recipe
@@ -3,7 +3,7 @@
 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"
+CHECKSUM_SHA256="0ef2ec6ed99f80a344ce3bc93d5eff6dd8613f4a544fa4ffe44a823cfd19b851"
 REVISION="1"
 ARCHITECTURES="x86 x86_gcc2"
 PROVIDES="
--- a/dev-util/cmake/cmake-3.0.0_rc1.recipe
+++ b/dev-util/cmake/cmake-3.0.0_rc1.recipe
@@ -1,72 +0,0 @@
-SUMMARY="Cross platform Make"
-DESCRIPTION="
-CMake is a cross-platform, open-source build system. It is a family of tools \
-designed to build, test and package software. CMake is used to control the \
-software compilation process using simple platform and compiler independent \
-configuration files. CMake generates native makefiles and workspaces that can \
-be used in the compiler environment of your choice.
-"
-HOMEPAGE="http://www.cmake.org" 
-LICENSE="CMake"
-COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
-SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc1.tar.gz"
-CHECKSUM_SHA256="f13ac75c2440cb81aa1c193cf4f3898092f72a0c2d43b7b02f8476a8e5e1d1e6"
-REVISION="7"
-ARCHITECTURES="x86 x86_64 arm"
-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="
-	cmake = $portVersion compat >= 3.0
-	cmd:cmake = $portVersion compat >= 3.0
-	cmd:ccmake = $portVersion compat >= 3.0
-	cmd:cpack = $portVersion compat >= 3.0
-	cmd:ctest = $portVersion compat >= 3.0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libncurses$secondaryArchSuffix
-	"
-BUILD_REQUIRES="
-	devel:libncurses$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
-	cmd:gcc$secondaryArchSuffix
-	cmd:grep
-	cmd:ld$secondaryArchSuffix
-	cmd:libtool
-	cmd:make
-	cmd:sed
-	"
-PATCHES="cmake-$portVersion.patchset"
-SOURCE_DIR="cmake-3.0.0-rc1"
-BUILD()
-{
-	./configure --prefix=$prefix \
-		--datadir=/$relativeDataDir/cmake \
-		--docdir=/$relativeDocDir \
-		--mandir=/$relativeManDir
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# No way to tell this to configure...
-	mv $prefix/share/aclocal $dataDir
-	rmdir $prefix/share
-}
-
-TEST()
-{
-	cp bin/ctest Bootstrap.cmk/
-	make test VERBOSE=1
-}
-
--- a/dev-util/cmake/cmake-3.0.0_rc5.recipe
+++ b/dev-util/cmake/cmake-3.0.0_rc5.recipe
@@ -1,73 +0,0 @@
-SUMMARY="Cross platform Make"
-DESCRIPTION="
-CMake is a cross-platform, open-source build system. It is a family of tools \
-designed to build, test and package software. CMake is used to control the \
-software compilation process using simple platform and compiler independent \
-configuration files. CMake generates native makefiles and workspaces that can \
-be used in the compiler environment of your choice.
-"
-HOMEPAGE="http://www.cmake.org" 
-LICENSE="CMake"
-COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
-SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc5.tar.gz"
-CHECKSUM_SHA256="fa8e76e5ed44199f4ceef24abd65a4d7df2d857edf44094d4ae7a2401af78389"
-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="
-	cmake = $portVersion compat >= 3.0
-	cmd:cmake = $portVersion compat >= 3.0
-	cmd:ccmake = $portVersion compat >= 3.0
-	cmd:cpack = $portVersion compat >= 3.0
-	cmd:ctest = $portVersion compat >= 3.0
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix >= $haikuVersion
-	lib:libstdc++$secondaryArchSuffix
-	lib:libncurses$secondaryArchSuffix
-	"
-BUILD_REQUIRES="
-	devel:libncurses$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	haiku_devel >= $haikuVersion
-	cmd:gcc$secondaryArchSuffix
-	cmd:grep
-	cmd:ld$secondaryArchSuffix
-	cmd:libtool
-	cmd:make
-	cmd:sed
-	"
-PATCHES="cmake-3.0.0_rc1.patchset"
-SOURCE_DIR="cmake-3.0.0-rc5"
-BUILD()
-{
-	./configure --prefix=$prefix \
-		--datadir=/$relativeDataDir/cmake \
-		--docdir=/$relativeDocDir \
-		--mandir=/$relativeManDir
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# No way to tell this to configure...
-	mv $prefix/share/aclocal $dataDir
-	rmdir $prefix/share
-}
-
-TEST()
-{
-	cp bin/ctest Bootstrap.cmk/
-	make test VERBOSE=1
-}
-
--- a/dev-util/cmake/cmake-3.0.0_rc6.recipe
+++ b/dev-util/cmake/cmake-3.0.0_rc6.recipe
@@ -8,9 +8,9 @@ be used in the compiler environment of your choice.
 "
 HOMEPAGE="http://www.cmake.org" 
 LICENSE="CMake"
-COPYRIGHT="2002-2013 Kitware, Inc., Insight Consortium, All rights reserved."
-SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc3.tar.gz"
-CHECKSUM_SHA256="5d4fc1783825caa2a898374b7bf656652531984290f5969bf86e87222f16a2d3"
+COPYRIGHT="2002-2014 Kitware, Inc., Insight Consortium, All rights reserved."
+SRC_URI="http://www.cmake.org/files/v3.0/cmake-3.0.0-rc6.tar.gz"
+CHECKSUM_SHA256="bb34dacec33b3ac26ee05b0a66b95ed8f52a0ce212f13c3e65a923944cdd484a"
 REVISION="1"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
@@ -21,7 +21,7 @@ fi
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
-	cmake = $portVersion compat >= 3.0
+	cmake$secondaryArchSuffix = $portVersion compat >= 3.0
 	cmd:cmake = $portVersion compat >= 3.0
 	cmd:ccmake = $portVersion compat >= 3.0
 	cmd:cpack = $portVersion compat >= 3.0
@@ -45,8 +45,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:sed
 	"
-PATCHES="cmake-3.0.0_rc1.patchset"
-SOURCE_DIR="cmake-3.0.0-rc3"
+PATCHES="cmake-3.0.0_rc6.patchset"
+SOURCE_DIR="cmake-3.0.0-rc6"
 BUILD()
 {
 	./configure --prefix=$prefix \
--- a/dev-util/cmake/patches/cmake-3.0.0_rc6.patchset
+++ b/dev-util/cmake/patches/cmake-3.0.0_rc6.patchset
@@ -1,4 +1,4 @@
-From cec0c89807f9215ea077b7e9c14dc9d053919bd6 Mon Sep 17 00:00:00 2001
+From d0a76bec3bee73af9c9d78155f4349767c36cf3b Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 3 Mar 2014 15:47:08 +0100
 Subject: Allow use of elf relocation on Haiku.
@@ -119,7 +119,7 @@ index 0000000..6b868bb
 1.8.3.4


-From a9a536582f3d035673438734cf6872871fce3605 Mon Sep 17 00:00:00 2001
+From 17c717fe8893ccfd6afa625fce620e4f61d87036 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 3 Mar 2014 15:51:49 +0100
 Subject: Add HPKG generation support to CPack.
@@ -1065,7 +1065,7 @@ index 0000000..ffa803d
 1.8.3.4


-From 8637f997646e2e3af5e1cc2506a217c712dec978 Mon Sep 17 00:00:00 2001
+From 7e671315610ade4309c6c1e9bc151e2ad82beeac Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 3 Mar 2014 15:57:05 +0100
 Subject: Haiku: Fix compiler detection when using distcc.
@@ -1146,7 +1146,7 @@ index 825f851..af6697a 100644
 1.8.3.4


-From a0951c88746d915cc54fb9261ca4c9e56a22898c Mon Sep 17 00:00:00 2001
+From 7193c39809d8c4a17fca2a77fc4f1ec0341dc97a Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 3 Mar 2014 16:01:23 +0100
 Subject: Adjust header search paths for some modules.
@@ -1220,7 +1220,7 @@ index 3f58ac1..c48fcbe 100644
 1.8.3.4


-From 963b8828af64669032a8b03363e9e25844646bfc Mon Sep 17 00:00:00 2001
+From 087148b32a8ce3da98670da32848a93b106f8a60 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 3 Mar 2014 16:10:05 +0100
 Subject: Update CPU frequency detection code.
@@ -1229,10 +1229,10 @@ The scheduler branch in Haiku changed the API for this.
 (patch already submitted upstream)

 diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
-index 5f20853..9c26380 100644
+index ec3a133..0708044 100644
 --- a/Source/kwsys/SystemInformation.cxx
 +++ b/Source/kwsys/SystemInformation.cxx
-@@ -4698,11 +4698,28 @@ bool SystemInformationImplementation::QueryHaikuInfo()
+@@ -4685,11 +4685,28 @@ bool SystemInformationImplementation::QueryHaikuInfo()
 {
 #if defined(__HAIKU__)
 
@@ -1267,7 +1267,7 @@ index 5f20853..9c26380 100644
 1.8.3.4


-From e8af83035ae75596f931c7e8a2b5b47d8160933a Mon Sep 17 00:00:00 2001
+From 01177b87e917b3c66b13838caaa69710ff879bb3 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 10 Mar 2014 14:11:01 +0100
 Subject: Fix the architecture detection regexp again.
@@ -1293,3 +1293,26 @@ index af6697a..920ae8f 100644
 -- 
 1.8.3.4

+
+From 0158e13fa60eee2b2fcb916ed0903e49d0c58f23 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 22:30:55 +0200
+Subject: Fix OpenAL search path.
+
+
+diff --git a/Modules/FindOpenAL.cmake b/Modules/FindOpenAL.cmake
+index 8150ff2..e0276f8 100644
+--- a/Modules/FindOpenAL.cmake
+++ b/Modules/FindOpenAL.cmake
+@@ -68,7 +68,7 @@
+ find_path(OPENAL_INCLUDE_DIR al.h
+   HINTS
+     ENV OPENALDIR
+-  PATH_SUFFIXES include/AL include/OpenAL include
+	PATH_SUFFIXES include/AL include/OpenAL include AL OpenAL
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-- 
+1.8.3.4
+
--- a/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
+++ b/haiku-apps/keymapswitcher/keymapswitcher-1.2.7.11.recipe
@@ -10,20 +10,21 @@ LICENSE="BSD (4-clause)"
 SRC_URI="cvs://:pserver:anonymous@switcher.cvs.sourceforge.net:/cvsroot/switcher/keymapswitcher(haiku)#release_1_2_7_11"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
-	keymapswitcher = $portVersion compat >= 1.2.7
+	keymapswitcher$secondaryArchSuffix = $portVersion compat >= 1.2.7
 	"
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	makefile_engine
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:mkdepend
 	"
--- a/haiku-apps/slayer/slayer-0.9.recipe
+++ b/haiku-apps/slayer/slayer-0.9.recipe
@@ -23,6 +23,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:gcc
+	cmd:mkdepend
 	"

 BUILD()
--- a/media-libs/fitz/fitz-1.1.recipe
+++ b/media-libs/fitz/fitz-1.1.recipe
@@ -49,6 +49,7 @@ BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:make
 	cmd:gcc$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
 	"

 SOURCE_DIR="mupdf-1.1-source"
--- a/media-libs/fontconfig/fontconfig-2.11.1.recipe
+++ b/media-libs/fontconfig/fontconfig-2.11.1.recipe
@@ -0,0 +1,109 @@
+SUMMARY="A library for font customization and configuration"
+DESCRIPTION="
+Fontconfig is a library for font customization and configuration.
+"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/fontconfig" 
+SRC_URI="http://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2"
+CHECKSUM_SHA256="dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99"
+LICENSE="MIT"
+COPYRIGHT="2000-2005, 2006-2007 Keith Packard
+	2005 Patrick Lam
+	2009 Roozbeh Pournader
+	2008-2009 Red Hat, Inc.
+	2008 Danilo Segan
+	2012 Google, Inc."
+
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PROVIDES="
+	fontconfig$secondaryArchSuffix = $portVersion compat >= 2
+	cmd:fc_cache$secondaryArchSuffix
+	cmd:fc_cat$secondaryArchSuffix
+	cmd:fc_list$secondaryArchSuffix
+	cmd:fc_match$secondaryArchSuffix
+	cmd:fc_pattern$secondaryArchSuffix
+	cmd:fc_query$secondaryArchSuffix
+	cmd:fc_scan$secondaryArchSuffix
+	cmd:fc_validate$secondaryArchSuffix
+	lib:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libfreetype$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	devel:libfreetype$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:libtool
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config
+	"
+
+PATCHES="fontconfig-2.11.1.patchset"
+
+GLOBAL_WRITABLE_FILES="
+	settings/fonts/conf.d directory keep-old
+	settings/fonts/fonts.conf auto-merge
+	"
+
+BUILD()
+{
+	export PKG_CONFIG_PATH=`finddir B_SYSTEM_DEVELOP_DIRECTORY`/lib$secondaryArchSubDir/pkgconfig
+
+	mkdir -p `finddir B_USER_CACHE_DIRECTORY`
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake
+	FONTS_DIR=`finddir B_SYSTEM_FONTS_DIRECTORY`
+	FONTS_DIR2=`finddir B_BEOS_FONTS_DIRECTORY`
+	FONTS_DIR3=`finddir B_USER_FONTS_DIRECTORY`
+	CACHE_DIR=`finddir B_USER_CACHE_DIRECTORY`
+	runConfigure ./configure \
+		--enable-libxml2 \
+		--with-default-fonts=${FONTS_DIR} \
+		--with-add-fonts=${FONTS_DIR2},${FONTS_DIR3} \
+		--with-cache-dir=${CACHE_DIR}
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	prepareInstalledDevelLibs libfontconfig
+	
+	#devel package
+	packageEntries devel \
+		$developDir
+}
+
+PROVIDES_devel="
+	fontconfig${secondaryArchSuffix}_devel = $portVersion compat >= 2.1
+	devel:libfontconfig$secondaryArchSuffix = 1.8.0 compat >= 1
+	"
+
+REQUIRES_devel="
+	fontconfig$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/fontconfig/patches/fontconfig-2.11.1.patchset
+++ b/media-libs/fontconfig/patches/fontconfig-2.11.1.patchset
@@ -0,0 +1,22 @@
+From 59eff810d3a298cddd8283f02f64ae77bc74dfb1 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 10 Jun 2014 16:31:39 +0000
+Subject: haiku patch
+
+
+diff --git a/test/Makefile.am b/test/Makefile.am
+index f270b50..ba4f0d7 100644
+--- a/test/Makefile.am
+++ b/test/Makefile.am
+@@ -27,7 +27,7 @@ endif
+ noinst_PROGRAMS = $(check_PROGRAMS)
+ 
+ if !OS_WIN32
+-check_PROGRAMS += test-migration
+check_PROGRAMS += 
+ test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
+ endif
+ 
+-- 
+1.8.3.4
+
--- a/media-libs/giflib/giflib-5.1.0.recipe
+++ b/media-libs/giflib/giflib-5.1.0.recipe
@@ -0,0 +1,86 @@
+DESCRIPTION="
+The GIFLIB project maintains the giflib service library, which has been pulling
+images out of GIFs since 1989. It is deployed everywhere you can think of and
+some places you probably can't - graphics applications and web browsers on
+multiple operating systems, game consoles, smartphones, and likely your ATM too.
+
+This is very mature, stable, small-footprint code with minimal dependencies
+(suitable for use in embedded deployments) that needs only occasional very
+minor bugfixes. Test reports from odd platforms and better regression tests are
+particularly welcome. Don't try to redesign it, applications beyond counting
+would break if you did.
+
+It's \"GIFLIB\" in caps as a nod to the code's origins in the dark and backward
+abysm of MS-DOS, but Unix hackers are encouraged to spell it \"giflib\" in
+deference to local conventions. :-)
+"
+SUMMARY="giflib - A library for processing GIFs"
+HOMEPAGE="http://sourceforge.net/projects/giflib/" 
+SRC_URI="http://sourceforge.net/projects/giflib/files/giflib-$portVersion.tar.bz2"
+CHECKSUM_SHA256="5aec694f1c68132e6af499a621996b5a1fc219f4bbe19ab2ba972b3f95188d1b"
+LICENSE="MIT"
+COPYRIGHT="1997-2007 Eric S. Raymond and Toshio Kuratomi"
+REVISION="1"
+
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	giflib$secondaryArchSuffix = $portVersion
+	lib:libgif$secondaryArchSuffix = 7.0.0 compat >= 7
+	cmd:gif2raw$secondaryArchSuffix
+	cmd:gif2rgb$secondaryArchSuffix
+	cmd:gifbuild$secondaryArchSuffix
+	cmd:gifclrmp$secondaryArchSuffix
+	cmd:gifecho$secondaryArchSuffix
+	cmd:giffix$secondaryArchSuffix
+	cmd:gifinto$secondaryArchSuffix
+	cmd:giftext$secondaryArchSuffix
+	cmd:giftool$secondaryArchSuffix
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+	
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtool
+	cmd:aclocal
+	cmd:autoconf
+	cmd:make
+	"
+
+PATCHES="giflib-5.1.0.patchset"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+	
+	prepareInstalledDevelLibs libgif
+	fixPkgconfig
+	
+	# devel package
+	packageEntries devel \
+			$developDir
+}
+
+PROVIDES_devel="
+	giflib${secondaryArchSuffix}_devel = $portVersion compat >= 5
+	devel:libgif$secondaryArchSuffix = 7.0.0 compat >= 7
+	"
+
+REQUIRES_devel="
+	giflib$secondaryArchSuffix == $portVersion base
+	"
--- a/media-libs/giflib/patches/giflib-5.1.0.patchset
+++ b/media-libs/giflib/patches/giflib-5.1.0.patchset
@@ -0,0 +1,29 @@
+From 1f7529dc2a255afb5d1ece8719761a13901751dd Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Tue, 10 Jun 2014 16:43:15 +0000
+Subject: gcc2 patch
+
+
+diff --git a/util/gifinto.c b/util/gifinto.c
+index 1553dec..31d3548 100644
+--- a/util/gifinto.c
+++ b/util/gifinto.c
+@@ -70,6 +70,7 @@ mkstemp(char *tpl)
+ ******************************************************************************/
+ int main(int argc, char **argv)
+ {
+    int FD;
+     int	NumFiles;
+     bool Error, MinSizeFlag = false, HelpFlag = false;
+     char **FileName = NULL, FoutTmpName[STRLEN], FullPath[STRLEN], *p;
+@@ -126,7 +127,6 @@ int main(int argc, char **argv)
+     /* then add a name for the tempfile */
+     if ( (strlen(FoutTmpName) + strlen(DEFAULT_TMP_NAME))  > STRLEN-1 ) GIF_EXIT("Filename too long.");
+     strcat(FoutTmpName, DEFAULT_TMP_NAME);
+-    int FD;
+ #ifdef _WIN32
+     char *tmpFN = _mktemp(FoutTmpName);
+     if (tmpFN)
+-- 
+1.8.3.4
+
--- a/media-libs/libcddb/libcddb-1.3.2.recipe
+++ b/media-libs/libcddb/libcddb-1.3.2.recipe
@@ -1,27 +1,72 @@
+SUMMARY="CDDB access library"
 DESCRIPTION="A library for accessing a CDDB server" 
 HOMEPAGE="http://libcddb.sourceforge.net" 
 SRC_URI="http://prdownloads.sourceforge.net/libcddb/libcddb-1.3.2.tar.bz2"
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="gettext >= 0.18.1.1-dev"
-CHECKSUM_MD5="8bb4a6f542197e8e9648ae597cd6bc8a"
+ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+
+PROVIDES="
+	cmd:cddb_query
+	bin:cddb_query
+	libcddb${secondaryArchSuffix} = $portVersion
+	lib:libcddb
+"
+
+REQUIRES="
+	haiku${secondaryArchSuffix} >= $haikuVersion
+	lib:libintl
+"
+
+BUILD_REQUIRES="
+	lib:libiconv
+	cmd:pkg_config
+"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:gettext
+	cmd:libtool
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	devel:libiconv
+"
+
+PATCH()
+{
+	sed -i "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS," configure.ac
+}
+
 BUILD()
 {
-	cd libcddb-1.3.2
 	libtoolize --force --copy --install
 	aclocal
-	automake
+	automake --add-missing
 	autoconf
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
+	runConfigure ./configure
 	make
 }

 INSTALL()
 {
-	cd libcddb-1.3.2
 	make install
+	prepareInstalledDevelLibs libcddb
+	fixPkgconfig
+	packageEntries devel $developDir
 }

 LICENSE="GNU LGPL v2"
 COPYRIGHT="2003-2005 Kris Verbeeck"

+PROVIDES_devel="
+	libcddb${secondaryArchSuffix}_devel = $portVersion
+	devel:libcddb$secondaryArchSuffix = $portVersion
+"
+
+REQUIRES_devel="
+	libcddb$secondaryArchSuffix == $portVersion base
+"
+
--- a/media-libs/libid3tag/libid3tag-0.15.1b.recipe
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.recipe
@@ -1,33 +1,34 @@
-SUMMARY="The MAD id3tag library" 
-DESCRIPTION="The MAD id3tag library" 
-HOMEPAGE="http://www.underbit.com/products/mad/" 
-SRC_URI="ftp://ftp.mars.org/pub/mpeg/$portName-$portVersion.tar.gz"
+SUMMARY="The MAD id3tag library"
+DESCRIPTION="The MAD id3tag library"
+HOMEPAGE="http://www.underbit.com/products/mad/"
+SRC_URI="ftp://ftp.mars.org/pub/mpeg/libid3tag-$portVersion.tar.gz"
 CHECKSUM_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
 REVISION="1"
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
-	$portName = $portVersion
-	lib:libid3tag = 0.3.0 compat = 0
+	libid3tag$secondaryArchSuffix = $portVersion
+	lib:libid3tag$secondaryArchSuffix = 0.3.0 compat = 0
 "

 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libz
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	devel:libz
+	haiku${secondaryArchSuffi}_devel >= $haikuVersion
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:libtoolize
 	cmd:autoconf
 	cmd:make
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	"

-PATCHES="$portName-$portVersion.patchset"
+PATCHES="libid3tag-$portVersion.patchset"
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -54,7 +55,7 @@ LICENSE="GNU GPL v2"
 COPYRIGHT="2000-2004 Underbit Technologies, Inc."

 PROVIDES_devel="
-	devel:libid3tag
+	devel:libid3tag$secondaryArchSuffix
 "

 REQUIRES_devel="
--- a/media-libs/libnsbmp/libnsbmp-0.0.3.recipe
+++ b/media-libs/libnsbmp/libnsbmp-0.0.3.recipe
@@ -1,20 +0,0 @@
-DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" 
-SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.0.3-src.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-
-BUILD()
-{
-	cd libnsbmp-0.0.3
-	make
-}
-
-INSTALL()
-{
-	cd libnsbmp-0.0.3
-	make install
-}
-
-LICENSE="MIT"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
--- a/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe
+++ b/media-libs/libnsbmp/libnsbmp-0.1.0_HEAD.recipe
@@ -1,21 +0,0 @@
-DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" 
-SRC_URI="git://git.netsurf-browser.org/libnsbmp.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0.0.1"
-
-BUILD()
-{
-	cd libnsbmp-0.1.0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libnsbmp-0.1.0-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
--- a/media-libs/libnsbmp/libnsbmp-0.1.1.recipe
+++ b/media-libs/libnsbmp/libnsbmp-0.1.1.recipe
@@ -0,0 +1,42 @@
+DESCRIPTION="Libnsbmp is a decoding library for BMP and ICO image file formats"
+SUMMARY="A decoding library for BMP and ICO images" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsbmp/" 
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsbmp-0.1.1-src.tar.gz"
+CHECKSUM_SHA256="584046809d3213e5917cd26eafb03068ca94274229f595f0e0520b15fa454f98"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+PROVIDES="
+	libnsbmp = $portVersion
+"
+BUILD_REQUIRES="
+	netsurf_buildsystem
+"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+"
+
+PATCHES="libnsbmp-0.1.1.patchset"
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir install
+
+	prepareInstalledDevelLib libnsbmp
+	fixPkgconfig libnsbmp
+	packageEntries devel $developDir
+}
+
+LICENSE="MIT"
+COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
+
+PROVIDES_devel="
+	libnsbmp_devel = $portVersion
+	devel:libnsbmp = $portVersion
+"
--- a/media-libs/libnsbmp/patches/libnsbmp-0.1.1.patchset
+++ b/media-libs/libnsbmp/patches/libnsbmp-0.1.1.patchset
@@ -0,0 +1,35 @@
+From 7d7f8e2d601f5d40e5f434fe07c705eb5437605a Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 21:20:45 +0200
+Subject: Fix paths for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index aad7a6e..8b0a5df 100644
+--- a/Makefile
+++ b/Makefile
+@@ -29,7 +29,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include/
+I := /$(INCLUDEDIR)/
+ 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/libnsbmp.pc.in b/libnsbmp.pc.in
+index 5d6b843..5536269 100644
+--- a/libnsbmp.pc.in
+++ b/libnsbmp.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libnsbmp
+ Description: Provides bmp loading and conversion
+-- 
+1.8.3.4
+
--- a/media-libs/libnsgif/libnsgif-0.0.3.recipe
+++ b/media-libs/libnsgif/libnsgif-0.0.3.recipe
@@ -1,20 +0,0 @@
-DESCRIPTION="Libnsgif is a decoding library for the GIF image file format" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" 
-SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.0.3-src.tar.gz"
-REVISION="1"
-STATUS_HAIKU="stable"
-
-BUILD()
-{
-	cd libnsgif-0.0.3
-	make
-}
-
-INSTALL()
-{
-	cd libnsgif-0.0.3
-	make install
-}
-
-LICENSE="MIT"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
--- a/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe
+++ b/media-libs/libnsgif/libnsgif-0.1.0_HEAD.recipe
@@ -1,21 +0,0 @@
-DESCRIPTION="Libnsgif is a decoding library for the GIF image file format" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" 
-SRC_URI="git://git.netsurf-browser.org/libnsgif.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/buildsystem >= 0.0.1"
-
-BUILD()
-{
-	cd libnsgif-0.1.0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libnsgif-0.1.0-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2004 Richard Wilson, 2008 - 2013 Sean Fox"
--- a/media-libs/libnsgif/libnsgif-0.1.1.recipe
+++ b/media-libs/libnsgif/libnsgif-0.1.1.recipe
@@ -0,0 +1,42 @@
+DESCRIPTION="Libnsgif is a decoding library for GIF image file format"
+SUMMARY="A decoding library for GIF images" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libnsgif/" 
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libnsgif-0.1.1-src.tar.gz"
+CHECKSUM_SHA256="d450ea0a9da234486e997248b30a86524f75f1021ca67017b5597423cf6c0a15"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+PROVIDES="
+	libnsgif = $portVersion
+"
+BUILD_REQUIRES="
+	netsurf_buildsystem
+"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+"
+
+PATCHES="libnsgif-0.1.1.patchset"
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir install
+
+	prepareInstalledDevelLib libnsgif
+	fixPkgconfig libnsgif
+	packageEntries devel $developDir
+}
+
+LICENSE="MIT"
+COPYRIGHT="2006 Richard Wilson, 2008 - 2013 Sean Fox"
+
+PROVIDES_devel="
+	libnsgif_devel = $portVersion
+	devel:libnsgif = $portVersion
+"
--- a/media-libs/libnsgif/patches/libnsgif-0.1.1.patchset
+++ b/media-libs/libnsgif/patches/libnsgif-0.1.1.patchset
@@ -0,0 +1,35 @@
+From 70d5d372e5534a2d1f58025ea8a7d92fae60ad56 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 21:28:28 +0200
+Subject: Fix paths for Haiku port.
+
+
+diff --git a/Makefile b/Makefile
+index 099477d..ccff0e9 100644
+--- a/Makefile
+++ b/Makefile
+@@ -29,7 +29,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include
+I := /$(INCLUDEDIR)
+ 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/libnsgif.pc.in b/libnsgif.pc.in
+index 3d85e6a..0255bf9 100644
+--- a/libnsgif.pc.in
+++ b/libnsgif.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libnsgif
+ Description: Provides gif loading and conversion
+-- 
+1.8.3.4
+
--- a/media-libs/libsndfile/libsndfile-1.0.25.recipe
+++ b/media-libs/libsndfile/libsndfile-1.0.25.recipe
@@ -8,27 +8,32 @@ COPYRIGHT="
 	1999-2011 Erik de Castro Lopo
 "
 LICENSE="GNU LGPL v2.1"
-SRC_URI="http://www.mega-nerd.com/libsndfile/files/$portVersionedName.tar.gz"
+SRC_URI="http://www.mega-nerd.com/libsndfile/files/libsndfile-$portVersion.tar.gz"
 CHECKSUM_SHA256="59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882"
 REVISION="2"
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+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_gcc2 x86"

 PATCHES="libsndfile-$portVersion.patchset"

 PROVIDES="
 	libsndfile$secondaryArchSuffix = $portVersion compat >= 1
-	cmd:sndfile_cmp
-	cmd:sndfile_concat
-	cmd:sndfile_convert
-	cmd:sndfile_deinterleave
-	cmd:sndfile_info
-	cmd:sndfile_interleave
-	cmd:sndfile_metadata_get
-	cmd:sndfile_metadata_set
-	cmd:sndfile_play
-	cmd:sndfile_regtest
-	cmd:sndfile_salvage
+	cmd:sndfile_cmp$secondaryArchSuffix
+	cmd:sndfile_concat$secondaryArchSuffix
+	cmd:sndfile_convert$secondaryArchSuffix
+	cmd:sndfile_deinterleave$secondaryArchSuffix
+	cmd:sndfile_info$secondaryArchSuffix
+	cmd:sndfile_interleave$secondaryArchSuffix
+	cmd:sndfile_metadata_get$secondaryArchSuffix
+	cmd:sndfile_metadata_set$secondaryArchSuffix
+	cmd:sndfile_play$secondaryArchSuffix
+	cmd:sndfile_regtest$secondaryArchSuffix
+	cmd:sndfile_salvage$secondaryArchSuffix
 	lib:libsndfile$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES="
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.0_HEAD.recipe
@@ -1,22 +0,0 @@
-DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" 
-SRC_URI="git://git.netsurf-browser.org/libsvgtiny.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-util/gperf >= 3.0.4
-	dev-libs/libwapcaplet >= 0.1.1-HEAD
-	net-libs/libdom >= 0"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd libsvgtiny-0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libsvgtiny-0-HEAD
-	make install PREFIX=/boot/common
-}
-LICENSE="MIT"
-COPYRIGHT="2003-2012 The NetSurf Developers"
--- a/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0.1.1.recipe
@@ -0,0 +1,48 @@
+SUMMARY="Libsvgtiny is an implementation of SVG Tiny written in C"
+DESCRIPTION="
+The overall idea of the library is to take some SVG as input, and return a \
+list of paths and texts which can be rendered easily. The library does not do \
+the actual rendering.
+"
+HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny"
+SRC_URI="http://git.netsurf-browser.org/libsvgtiny.git/snapshot/release/0.1.1.tar.gz"
+CHECKSUM_SHA256="78bb67e1e93b3458c1a6414b569e3295ddbe99274a78928b33a5deea20f11d71"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+PROVIDES="
+	libsvgtiny = $portVersion
+"
+BUILD_REQUIRES="
+	devel:libwapcaplet
+	devel:libdom
+	netsurf_buildsystem
+"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	gperf
+	cmd:make
+"
+
+SOURCE_DIR="release/0.1.1"
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir install
+
+	prepareInstalledDevelLib libsvgtiny
+	fixPkgconfig libsvgtiny
+	packageEntries devel $developDir
+}
+LICENSE="MIT"
+COPYRIGHT="2003-2014 The NetSurf Developers"
+
+PROVIDES_devel="
+	libsvgtiny_devel = $portVersion
+	devel:libsvgtiny = $portVersion
+"
--- a/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-0_HEAD.recipe
@@ -1,24 +0,0 @@
-DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" 
-SRC_URI="git://git.netsurf-browser.org/libsvgtiny.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/libxml2 >= 2.7.7
-	dev-util/gperf >= 3.0.4
-	dev-util/buildsystem >= 0
-	dev-libs/libwapcaplet >= 0.1.1-HEAD
-	net-libs/libdom >= 0"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd libsvgtiny-0-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libsvgtiny-0-HEAD
-	make install PREFIX=/boot/common
-}
-LICENSE="MIT"
-COPYRIGHT="2003-2012 The NetSurf Developers"
--- a/media-libs/libsvgtiny/libsvgtiny-10856.recipe
+++ b/media-libs/libsvgtiny/libsvgtiny-10856.recipe
@@ -1,22 +0,0 @@
-DESCRIPTION="Libsvgtiny is an implementation of SVG Tiny written in C" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libsvgtiny" 
-SRC_URI="svn://svn.netsurf-browser.org/trunk/libsvgtiny#10856"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-libs/libxml2 >= 2.7.7
-	dev-util/gperf >= 3.0.4"
-#CHECKSUM_MD5=""
-BUILD()
-{
-	cd libsvgtiny-10856
-	make
-	make install PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libsvgtiny-10856
-	make install
-}
-LICENSE="MIT"
-COPYRIGHT="2003-2010 The NetSurf Developers"
--- a/media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset
+++ b/media-libs/libsvgtiny/patches/libsvgtiny-0.1.1.patchset
@@ -0,0 +1,35 @@
+From 9dd8bfc5652cfa089bc2381385631818cb09453f Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 20:32:12 +0200
+Subject: Fix paths for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index 392d9da..6925cab 100644
+--- a/Makefile
+++ b/Makefile
+@@ -45,7 +45,7 @@ endif
+ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+-I := /include
+I := /$(INCLUDEDIR)
+ 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/libsvgtiny.pc.in b/libsvgtiny.pc.in
+index a3021f6..c9ca402 100644
+--- a/libsvgtiny.pc.in
+++ b/libsvgtiny.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libsvgtiny
+ Description: SVG Tiny 1.1 rendering library
+-- 
+1.8.3.4
+
--- a/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
+++ b/media-libs/sdl_ttf/sdl_ttf-2.0.11.recipe
@@ -30,6 +30,8 @@ REQUIRES="
 	lib:libfreetype$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
@@ -37,6 +39,8 @@ BUILD_REQUIRES="
 	devel:libsdl$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
+	devel:libbz2$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
 	"

 BUILD_PREREQUIRES="
--- a/media-sound/mpg123/mpg123-1.12.1.recipe
+++ b/media-sound/mpg123/mpg123-1.12.1.recipe
@@ -27,14 +27,19 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:awk
+	cmd:find
+	cmd:autoconf
+	cmd:libtool
+	cmd:aclocal
+	cmd:pkg_config$secondaryArchSuffix
 	"

 PATCHES="mpg123-1.12.1.patch"
 BUILD()
 {
-#libtoolize --force --copy --install
-#	aclocal
-#	autoconf
+	sed -i "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS," configure.ac
+	libtoolize --force --copy --install
+	autoreconf --force --install
 	LDFLAGS="-lnetwork" runConfigure ./configure --disable-aligncheck
 	make $jobArgs
 }
--- a/net-libs/hubbub/libhubbub-0.3.0.recipe
+++ b/net-libs/hubbub/libhubbub-0.3.0.recipe
@@ -55,6 +55,7 @@ INSTALL()
 		INCLUDEDIR=$relativeIncludeDir COMPONENT_TYPE=lib-shared

 	prepareInstalledDevelLib libhubbub
+	fixPkgconfig libhubbub
 	packageEntries devel $developDir
 }

--- a/net-libs/libdom/libdom-0.0.1_HEAD.recipe
+++ b/net-libs/libdom/libdom-0.0.1_HEAD.recipe
@@ -1,21 +0,0 @@
-DESCRIPTION="LibDOM is an implementation of the W3C DOM" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" 
-SRC_URI="git://git.netsurf-browser.org/libdom.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="net-libs/hubbub >= 0.2.0-HEAD"
-
-BUILD()
-{
-	cd libdom-0.0.1-HEAD
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libdom-0.0.1-HEAD
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT"
-COPYRIGHT="2007 - 2013 J-M Bell"
--- a/net-libs/libdom/libdom-0.1.0.recipe
+++ b/net-libs/libdom/libdom-0.1.0.recipe
@@ -0,0 +1,58 @@
+SUMMARY="LibDOM is an implementation of the W3C DOM" 
+DESCRIPTION="An implementation of the W3C DOM for NetSurf, written in C."
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" 
+SRC_URI="http://git.netsurf-browser.org/libdom.git/snapshot/release/0.1.0.tar.gz"
+CHECKSUM_SHA256="1e08a713ff564533a27699f82491f48b384c1336c392d76226356f474f07dfc0"
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+
+PROVIDES="
+	libdom = $portVersion
+"
+
+BUILD_REQUIRES="
+	devel:libexpat
+	devel:libhubbub
+	devel:libparserutils
+	devel:libwapcaplet
+	netsurf_buildsystem
+	xml_parser
+"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:make
+	cmd:perl
+	cmd:pkg_config
+"
+
+SOURCE_DIR="release/$portVersion"
+PATCHES="libdom-0.1.0.recipe"
+BUILD()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
+}
+
+INSTALL()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
+		INCLUDEDIR=$relativeIncludeDir install
+
+	prepareInstalledDevelLib libdom
+	fixPkgconfig libdom
+	packageEntries devel $developDir
+}
+
+TEST()
+{
+	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
+}
+
+LICENSE="MIT"
+COPYRIGHT="2007-2014 J-M Bell"
+
+PROVIDES_devel="
+	libdom_devel = $portVersion
+	devel:libdom = $portVersion
+"
--- a/net-libs/libdom/libdom-0.recipe
+++ b/net-libs/libdom/libdom-0.recipe
@@ -1,22 +0,0 @@
-DESCRIPTION="LibDOM is an implementation of the W3C DOM" 
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/" 
-SRC_URI="git://git.netsurf-browser.org/libdom.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="dev-lib/hubbub >= 0.1.2-HEAD"
-
-BUILD()
-{
-	cd libdom-0
-	make PREFIX=/boot/common
-}
-
-INSTALL()
-{
-	cd libdom-0
-	make install PREFIX=/boot/common
-}
-
-LICENSE="MIT
-	GNU GPL v2"
-COPYRIGHT="2003 - 2012 The NetSurf Developers"
--- a/net-libs/libdom/patches/libdom-0.1.0.patchset
+++ b/net-libs/libdom/patches/libdom-0.1.0.patchset
@@ -0,0 +1,84 @@
+From ff1657dd341291967f59059f5b8dbcd1c95335e9 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Mon, 9 Jun 2014 20:13:18 +0200
+Subject: Fix include paths for Haiku.
+
+
+diff --git a/Makefile b/Makefile
+index c6bc2bd..64bc3a8 100644
+--- a/Makefile
+++ b/Makefile
+@@ -47,11 +47,11 @@ include $(NSBUILD)/Makefile.top
+ 
+ # Extra installation rules
+ Is := include/dom
+-I := /include/dom
+I := /$(INCLUDEDIR)/dom
+ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/dom.h;$(Is)/functypes.h
+ 
+ Is := include/dom/core
+-I := /include/dom/core
+I := /$(INCLUDEDIR)/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 := /$(INCLUDEDIR)/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 := /$(INCLUDEDIR)/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/bindings/hubbub/Makefile b/bindings/hubbub/Makefile
+index 946219d..984ea3f 100644
+--- a/bindings/hubbub/Makefile
+++ b/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 := /$(INCLUDEDIR)/dom/bindings/hubbub:errors.h;parser.h
+ 
+   # Hubbub
+   ifneq ($(PKGCONFIG),)
+diff --git a/bindings/xml/Makefile b/bindings/xml/Makefile
+index ea7653c..1211c5e 100644
+--- a/bindings/xml/Makefile
+++ b/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 := /$(INCLUDEDIR)/dom/bindings/xml:xmlerror.h;xmlparser.h
+ endif
+ 
+ include $(NSBUILD)/Makefile.subdir
+diff --git a/libdom.pc.in b/libdom.pc.in
+index b6e82cf..406ed9e 100644
+--- a/libdom.pc.in
+++ b/libdom.pc.in
+@@ -1,7 +1,7 @@
+ prefix=PREFIX
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/LIBDIR
+-includedir=${prefix}/include
+includedir=${prefix}/INCLUDEDIR
+ 
+ Name: libdom
+ Description: W3C DOM implementation
+-- 
+1.8.3.4
+
--- a/net-misc/openssh/openssh-6.6p1.recipe
+++ b/net-misc/openssh/openssh-6.6p1.recipe
@@ -20,7 +20,7 @@ CHECKSUM_SHA256="48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203b
 SRC_URI="http://openbsd.locaweb.com.br/pub/OpenBSD/OpenSSH/portable/openssh-6.6p1.tar.gz"
 REVISION="1"

-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"

 PATCHES="sshd_config.patch
 		pathnames.patch"
@@ -92,8 +92,6 @@ PATCH()
 	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
 }

-SOURCE_DIR="openssh"
-
 BUILD()
 {
 	mkdir -p m4
--- a/sys-apps/coreutils/coreutils-8.22.recipe
+++ b/sys-apps/coreutils/coreutils-8.22.recipe
@@ -141,6 +141,7 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:sed
 	cmd:help2man
+	cmd:makeinfo
 	"

 defineDebugInfoPackage coreutils \
--- a/www-client/netsurf/netsurf-3.1.recipe
+++ b/www-client/netsurf/netsurf-3.1.recipe
@@ -8,9 +8,12 @@ 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"
+HOMEPAGE="http://www.netsurf-browser.org/"
+# Do NOT use the netsurf-all package. It contains a bunch of subprojects which
+# we build as separate packages. NetSurf is statically linked to them, so the
+# resulting binary is the same.
+SRC_URI="http://git.netsurf-browser.org/netsurf.git/snapshot/release/3.1.tar.gz"
+CHECKSUM_SHA256="e2d4f7879762008b8e0c415e927a0a07f86f2e614f5e8659aa558471843e7490"
 REVISION="1"
 ARCHITECTURES="x86_gcc2"
 REQUIRES="
@@ -28,6 +31,15 @@ BUILD_REQUIRES="
 	devel:libpng
 	devel:libssl
 	devel:libz
+
+	devel:libcss
+	devel:libdom
+	devel:libhubbub
+	devel:libnsbmp
+	devel:libnsgif
+	devel:libparserutils
+	devel:libsvgtiny
+	devel:libwapcaplet
 	"

 BUILD_PREREQUIRES="
@@ -45,7 +57,7 @@ PROVIDES="
 	app:NetSurf = $portVersion
 "

-SOURCE_DIR="netsurf-all-$portVersion"
+SOURCE_DIR="release/$portVersion"
 PATCHES="netsurf-3.1.patchset"

 BUILD()
@@ -60,4 +72,4 @@ INSTALL()
 }

 LICENSE="GNU GPL v2"
-COPYRIGHT="2003 - 2014 The NetSurf Browser project"
+COPYRIGHT="2003-2014 The NetSurf Browser project"
--- a/www-client/netsurf/netsurf-3.1git.recipe
+++ b/www-client/netsurf/netsurf-3.1git.recipe
@@ -1,34 +0,0 @@
-DESCRIPTION="NetSurf is a multi-platform web browser" 
-HOMEPAGE="http://www.netsurf-browser.org/" 
-SRC_URI="git://git.netsurf-browser.org/netsurf.git"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND="media-libs/libmng > 1.0.10
-	dev-libs/pkgconfig >= 0.25
-	net-misc/curl >= 7.21.6
-	media-libs/libpng >= 1.5.7
-	media-libs/jpeg >= 8d
-	media-libs/libwebp >= 0.1.3
-	media-libs/lcms >= 2.1
-	media-libs/libsvgtiny >= 0.HEAD
-	media-libs/libnsbmp >= 0.0.3
-	media-libs/libnsgif >= 0.0.3
-	dev-libs/libcss >= 0.1.2
-	dev-perl/HTML-Entities >= 3.70
-	"
-
-BUILD()
-{
-	cd netsurf-3.1-HEAD
-	make
-}
-
-INSTALL()
-{
-	cd netsurf-3.1-HEAD
-	make install
-}
-
-LICENSE="MIT
-	GNU GPL v2"
-COPYRIGHT="2003 - 2013 The NetSurf Browser project"
--- a/www-client/netsurf/patches/netsurf-3.1.patchset
+++ b/www-client/netsurf/patches/netsurf-3.1.patchset
@@ -1,362 +1,13 @@
-From 7ff4f37e1263fd99dda14fda5d358d5c1974a684 Mon Sep 17 00:00:00 2001
+From 74431b243c18aa2e161037a7384dfcef907bb689 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.
+Date: Mon, 9 Jun 2014 21:44:48 +0200
+Subject: Fix include path for 3.1 release.


-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
+diff --git a/beos/about.cpp b/beos/about.cpp
 index cd8070e..2483a22 100644
--- a/netsurf/beos/about.cpp
-+++ b/netsurf/beos/about.cpp
+--- a/beos/about.cpp
+++ b/beos/about.cpp
@@ -23,7 +23,7 @@
 extern "C" {
 #include "desktop/netsurf.h"
@@ -366,236 +17,6 @@ index cd8070e..2483a22 100644
 #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