From f0e4bae3cbdaaf03cea3e3cbdbfd89f0494a6841 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Sat, 29 Sep 2018 06:58:38 +0000
Subject: [PATCH] LibWapcaplet: use libVersion{,Compat}, simplify BUILD &
 INSTALL.

---
 .../libwapcaplet/libwapcaplet-0.4.0.recipe    | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe b/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe
index ddc0f4b44..efcb1a989 100644
--- a/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe
+++ b/dev-libs/libwapcaplet/libwapcaplet-0.4.0.recipe
@@ -12,9 +12,12 @@ CHECKSUM_SHA256="7b87a997b2531298af1efd32a622be5faee61349ad4e6c868fcb286ce805d99
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libwapcaplet$secondaryArchSuffix = $portVersion
-	lib:libwapcaplet$secondaryArchSuffix = $portVersion
+	lib:libwapcaplet$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -22,7 +25,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libwapcaplet${secondaryArchSuffix}_devel = $portVersion
-	devel:libwapcaplet$secondaryArchSuffix = $portVersion
+	devel:libwapcaplet$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libwapcaplet$secondaryArchSuffix == $portVersion base
@@ -43,26 +46,29 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
-	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 libwapcaplet
 	fixPkgconfig
-	packageEntries devel $developDir
+
+	packageEntries devel \
+		"$developDir"
 }
 
 TEST()
 {
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem test
+	make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem test
 }