netsurf: build on x86 and x86_64

* fix dependencies and build system
* check doesn't build correctly with haikuporter on x86_64 beause
of a Python bug (hard link extraction in tar files)

net-libs/libdom/libdom-0.1.0.recipe

@@ -1,15 +1,22 @@
 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/" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
+LICENSE="MIT"
+COPYRIGHT="2007-2014 J-M Bell"
 SRC_URI="http://download.netsurf-browser.org/libs/releases/libdom-0.1.0-src.tar.gz"
 CHECKSUM_SHA256="235fde8bcfcf71e325c1344acfb995d5d59e1d8ebfcb9c87c1aefd1a08c8fae6"
 REVISION="1"
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="libdom-$portVersion.patchset"
 
 PROVIDES="
 	libdom = $portVersion
-"
-
+	lib:libdom = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
 BUILD_REQUIRES="
 	devel:libexpat
 	devel:libhubbub
@@ -17,7 +24,7 @@ BUILD_REQUIRES="
 	devel:libwapcaplet
 	netsurf_buildsystem
 	xml_parser
-"
+	"
 
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
@@ -25,9 +32,8 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:perl
 	cmd:pkg_config
-"
+	"
 
-PATCHES="libdom-0.1.0.patchset"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -48,10 +54,12 @@ TEST()
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
 }
 
-LICENSE="MIT"
-COPYRIGHT="2007-2014 J-M Bell"
+# ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
 	libdom_devel = $portVersion
 	devel:libdom = $portVersion
 "
+REQUIRES_devel="
+	libdom$secondaryArchSuffix == $portVersion base
+	"