NetSurf libs: Merge Korli's changes into latest recipes.

dev-libs/libcss/libcss-0.4.0.recipe

@@ -2,16 +2,17 @@ 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/" 
+HOMEPAGE="http://www.netsurf-browser.org/projects/libcss/"
+COPYRIGHT="2007-2014 J-M Bell"
+LICENSE="MIT"
 SRC_URI="http://download.netsurf-browser.org/libs/releases/libcss-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="0be9509d9d352abdeec87764c1f8ba13950d9dc4f63acade0477209b7fd21748"
 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-0.3.0.patchset"
+
 PROVIDES="
 	libcss$secondaryArchSuffix = $portVersion
 	lib:libcss$secondaryArchSuffix = $portVersion
@@ -27,8 +28,6 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libparserutils${secondaryArchSuffix} >= 0.2.0
 	devel:libwapcaplet${secondaryArchSuffix} >= 0.2.1
-	netsurf_buildsystem >= 1.2
-
 	devel:libiconv
 	"
 
@@ -38,9 +37,9 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
+	netsurf_buildsystem >= 1.2
 	"
 
-PATCHES="libcss-0.3.0.patchset"
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
@@ -55,6 +54,8 @@ INSTALL()
 
 	prepareInstalledDevelLib libcss
 	fixPkgconfig
+	
+	# devel package
 	packageEntries devel $developDir
 }
 
@@ -64,6 +65,8 @@ TEST()
 		LDFLAGS="-liconv -lwapcaplet -lparserutils"
 }
 
+# ----- devel package -------------------------------------------------------
+
 PROVIDES_devel="
 	libcss${secondaryArchSuffix}_devel = $portVersion
 	devel:libcss$secondaryArchSuffix = $portVersion