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

media-libs/libsvgtiny/libsvgtiny-0.1.2.recipe

@@ -5,30 +5,36 @@ 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"
+COPYRIGHT="2003-2014 The NetSurf Developers"
+LICENSE="MIT"
 SRC_URI="http://download.netsurf-browser.org/libs/releases/libsvgtiny-$portVersion-src.tar.gz"
 CHECKSUM_SHA256="a5ad4ba467e2ba10ac13fb881937655c5d0ef8e9582ede6a2c73447c87d06e90"
 REVISION="1"
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="libsvgtiny-0.1.1.patchset"
+
 PROVIDES="
 	libsvgtiny = $portVersion
 "
+REQUIRES="
+	haiku >= $haikuVersion
+"
 BUILD_REQUIRES="
 	devel:libwapcaplet
 	devel:libdom
 	devel:libhubbub
 	devel:libparserutils
-	netsurf_buildsystem
 "
 BUILD_PREREQUIRES="
 	haiku_devel >= $haikuVersion
+	netsurf_buildsystem
 	cmd:gcc
-	gperf
+	cmd:gperf
 	cmd:make
 	cmd:pkg_config
 "
 
-PATCHES="libsvgtiny-0.1.1.patchset"
-
 BUILD()
 {
 	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
@@ -42,12 +48,17 @@ INSTALL()
 
 	prepareInstalledDevelLib libsvgtiny
 	fixPkgconfig
+	
+	# devel package
 	packageEntries devel $developDir
 }
-LICENSE="MIT"
-COPYRIGHT="2003-2014 The NetSurf Developers"
+
+# ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
 	libsvgtiny_devel = $portVersion
 	devel:libsvgtiny = $portVersion
 "
+REQUIRES_devel="
+	libsvgtiny$secondaryArchSuffix == $portVersion base
+"