From 36bf25a282fa61ca0b036bbbc1b06ebf5665a89e Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 28 Sep 2018 19:37:35 +0000
Subject: [PATCH] libnsutils: use libVersion{,Compat}, fix REQUIRES_devel.

Also simplify BUILD & INSTALL.
---
 dev-libs/libnsutils/libnsutils-0.0.3.recipe | 34 ++++++++++++---------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/dev-libs/libnsutils/libnsutils-0.0.3.recipe b/dev-libs/libnsutils/libnsutils-0.0.3.recipe
index 8ab77703d..873d98185 100644
--- a/dev-libs/libnsutils/libnsutils-0.0.3.recipe
+++ b/dev-libs/libnsutils/libnsutils-0.0.3.recipe
@@ -9,11 +9,14 @@ SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnsutils-$portVe
 CHECKSUM_SHA256="15b8bf715da6e020509bcadea61f8b33d861b153121857a775b91fcb32b13d73"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	libnsutils$secondaryArchSuffix = $portVersion
-	lib:libnsutils$secondaryArchSuffix = 0.0.1 compat >= 0
+	lib:libnsutils$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -21,9 +24,10 @@ REQUIRES="
 
 PROVIDES_devel="
 	libnsutils${secondaryArchSuffix}_devel = $portVersion
-	devel:libnsutils$secondaryArchSuffix = $portVersion compat >= 0
+	devel:libnsutils$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
+	libnsutils$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -37,24 +41,24 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	# Build the static lib
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
-	# Build the shared lib
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		COMPONENT_TYPE=lib-shared
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage
+	done
 }
 
 INSTALL()
 {
-	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir
-	make install PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir COMPONENT_TYPE=lib-shared
-
-	mkdir -p $prefix/develop/lib
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage \
+			INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir \
+			install
+	done
 
 	prepareInstalledDevelLib libnsutils
 	fixPkgconfig
 
-	packageEntries devel $developDir
+	packageEntries devel \
+		"$developDir"
 }