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)

dev-libs/check/check-0.9.13.recipe

@@ -10,8 +10,8 @@ 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"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SRC_URI="http://sourceforge.net/projects/check/files/check/$portVersion/check-$portVersion.tar.gz"
 CHECKSUM_SHA256="ca6589c34f9c60ffd4c3e198ce581e944a9f040ca9352ed54068dd61bebb5cb7"
 COPYRIGHT="xxx"
 
@@ -53,7 +53,12 @@ TEST()
 	make check
 }
 
+# ----- devel package -------------------------------------------------------
+
 PROVIDES_devel="
 	check_devel = $portVersion
 	devel:libcheck = $portVersion
-"
+	"
+REQUIRES_devel="
+	check == $portVersion base
+	"

dev-libs/check/check-0.9.14.recipe

@@ -0,0 +1,67 @@
+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 x86 x86_64"
+# NOTE: on x86_64 haikuporter/python 2.7.6 cannot extract correctly the archive
+# because it contains hard links. One has to extract manually, put flag.unpack
+# build, then copy the packages. No source package can be produced.
+SRC_URI="http://sourceforge.net/projects/check/files/check/$portVersion/check-$portVersion.tar.gz"
+CHECKSUM_SHA256="c272624645b1b738cf57fd5d81a3e4d9b722b99d6133ee3f3c4007d4d279840a"
+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
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	check_devel = $portVersion
+	devel:libcheck = $portVersion
+	"
+REQUIRES_devel="
+	check == $portVersion base
+	"

dev-libs/json_c/json_c-0.12.recipe

@@ -4,26 +4,24 @@ 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
 "
+SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12-nodoc.tar.gz"
+CHECKSUM_SHA256="6fd6d2311d610b279e1bcdd5c6d4f699700159d3e0786de8306af7b4bc94fb35"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PROVIDES="
 	json_c = $portVersion
-	lib:libjson_c = $portVersion
+	lib:libjson_c = 2.0.1 compat >= 2
 	"
-
 REQUIRES="
 	haiku >= $haikuVersion
 	"
-
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
 	cmd:aclocal
@@ -31,13 +29,15 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:libtool
 	cmd:make
-"
+	"
 
 SOURCE_DIR="json-c-$portVersion"
+
 PATCHES="json_c-$portVersion.patchset"
+
 BUILD()
 {
-	sh autogen.sh
+	autoreconf -fi
 	runConfigure ./configure
 	make
 }
@@ -56,9 +56,12 @@ TEST()
 	make check
 }
 
+# ----- devel package -------------------------------------------------------
+
 PROVIDES_devel="
 	json_c_devel = $portVersion
-	devel:libjson_c = $portVersion
+	devel:libjson_c = 2.0.1 compat >= 2
+	"
+REQUIRES_devel="
+	json_c$secondaryArchSuffix == $portVersion base
 	"
-
-REQUIRES_devel="json_c == $portVersion base"

dev-libs/libcss/libcss-0.3.0.recipe

@@ -3,44 +3,41 @@ DESCRIPTION="
 LibCSS is a CSS (Cascading Style Sheet) parser and selection engine.
 " 
 HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/" 
-SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-0.3.0-src.tar.gz"
+COPYRIGHT="2007-2014 J-M Bell"
+LICENSE="MIT"
+SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="4065dbfdfc9926e14a2f0f2c600fc72abac97bd20769ac6a908ac50226e95e1a"
 REVISION="2"
-LICENSE="MIT"
-COPYRIGHT="2007-2014 J-M Bell"
-
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+PATCHES="libcss-$portVersion.patchset"
+
 PROVIDES="
 	libcss$secondaryArchSuffix = $portVersion
 	lib:libcss$secondaryArchSuffix = $portVersion
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libparserutils${secondaryArchSuffix}
 	lib:libwapcaplet${secondaryArchSuffix}
 	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libparserutils${secondaryArchSuffix} >= 0.1.1
 	devel:libwapcaplet${secondaryArchSuffix} >= 0.1.1
-	netsurf_buildsystem >= 0
-
+	
 	devel:libiconv
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
+	netsurf_buildsystem >= 0
 	"
 
-PATCHES="libcss-0.3.0.patchset"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
@@ -50,10 +47,15 @@ INSTALL()
 {
 	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
 	mkdir -p $prefix/develop/lib
+	mkdir -p $(dirname $includeDir)
+	mv $prefix/include $includeDir
 
 	prepareInstalledDevelLib libcss
-	fixPkgconfig libcss
-	packageEntries devel $developDir
+	fixPkgconfig
+	
+	# devel package
+	packageEntries devel \
+		$developDir
 }
 
 TEST()
@@ -62,7 +64,12 @@ TEST()
 		LDFLAGS="-liconv -lwapcaplet -lparserutils"
 }
 
+# ----- devel package -------------------------------------------------------
+
 PROVIDES_devel="
 	libcss${secondaryArchSuffix}_devel = $portVersion
 	devel:libcss$secondaryArchSuffix = $portVersion
 "
+REQUIRES_devel="
+	libcss$secondaryArchSuffix == $portVersion base
+	"

dev-libs/libparserutils/libparserutils-0.2.0.recipe

@@ -9,7 +9,7 @@ REVISION="1"
 LICENSE="MIT"
 COPYRIGHT="2007-2014 J-M Bell"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
@@ -25,12 +25,12 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libiconv${secondaryArchSuffix}
-	netsurf_buildsystem >= 1.1
 
 	lib:libiconv${secondaryArchSuffix}
 	"
 
 BUILD_PREREQUIRES="
+	netsurf_buildsystem >= 1.1
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
 	cmd:make

dev-libs/libwapcaplet/libwapcaplet-0.2.1.recipe

@@ -11,7 +11,7 @@ REVISION="2"
 LICENSE="MIT"
 COPYRIGHT="2009-2014 The NetSurf Browser project"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="