NetSurf, libraries & tools update.

Fixes #4077

dev-libs/libutf8proc/libutf8proc-1.3.1~3.recipe

@@ -1,66 +0,0 @@
-SUMMARY="A library for processing UTF-8 encoded Unicode strings"
-DESCRIPTION="utf8proc is a small, clean C library that provides Unicode \
-normalization, case-folding, and other operations for data in the UTF-8 \
-encoding, supporting Unicode version 7.0."
-HOMEPAGE="https://julialang.org/utf8proc/"
-COPYRIGHT="2006-2017 Public Software Group"
-LICENSE="MIT"
-REVISION="3"
-SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libutf8proc-1.3.1-3-src.tar.gz"
-CHECKSUM_SHA256="1223c2dd9c5cd077564feb30a6ad8b1c0e55ef5dfe7c275d3b9fe8274f207c70"
-SOURCE_DIR="libutf8proc-1.3.1-3"
-
-ARCHITECTURES="?x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	libutf8proc$secondaryArchSuffix = $portVersion
-	lib:libutf8proc$secondaryArchSuffix = 1.3.1 compat >= 1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libutf8proc${secondaryArchSuffix}_devel = $portVersion
-	devel:libutf8proc$secondaryArchSuffix = 1.3.1 compat >= 1
-	"
-REQUIRES_devel="
-	libutf8proc$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	netsurf_buildsystem >= 1.7
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem
-	make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \
-		COMPONENT_TYPE=lib-shared
-}
-
-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
-
-	# No idea, why the makefile puts it here, but it should be in the root.
-	mv $includeDir/libutf8proc/* $includeDir
-	rm -rf $includeDir/libutf8proc
-
-	mkdir -p $prefix/develop/lib
-
-	prepareInstalledDevelLib libutf8proc
-	fixPkgconfig
-
-	packageEntries devel $developDir
-}

dev-libs/libutf8proc/libutf8proc2-2.4.0.1.recipe

@@ -0,0 +1,81 @@
+SUMMARY="A library for processing UTF-8 encoded Unicode strings"
+DESCRIPTION="utf8proc is a small, clean C library that provides Unicode \
+normalization, case-folding, and other operations for data in the UTF-8 \
+encoding, supporting Unicode version 7.0."
+HOMEPAGE="https://julialang.org/utf8proc/"
+COPYRIGHT="2006-2019 Public Software Group
+	2014-2019 Steven G. Johnson, Jiahao Chen, Tony Kelman, Jonas Fonseca, \
+	and other contributors listed in the git history"
+LICENSE="MIT"
+REVISION="1"
+SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libutf8proc-2.4.0-1-src.tar.gz"
+SOURCE_DIR="libutf8proc-2.4.0-1"
+CHECKSUM_SHA256="01ab1d6989c1c7755090db24c3f64e49f95c560ae49c26bec5142bac6802c472"
+
+ARCHITECTURES="?x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+libVersion="2"
+libVersionCompat="$libVersion compat >= ${libVersion}"
+
+PROVIDES="
+	libutf8proc2$secondaryArchSuffix = $portVersion
+	lib:libutf8proc$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libutf8proc2${secondaryArchSuffix}_devel = $portVersion
+	devel:libutf8proc$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	libutf8proc2$secondaryArchSuffix == $portVersion base
+	"
+CONFLICTS_devel="
+	libutf8proc${secondaryArchSuffix}_devel
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	netsurf_buildsystem >= 1.8
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+defineDebugInfoPackage libutf8proc2$secondaryArchSuffix \
+	$libDir/libutf8proc.so.$libVersion
+
+BUILD()
+{
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage
+	done
+}
+
+INSTALL()
+{
+	for linkage in lib-static lib-shared; do
+		make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \
+			COMPONENT_TYPE=$linkage \
+			INCLUDEDIR=$relativeIncludeDir install \
+			LIBDIR=$relativeLibDir
+	done
+
+	prepareInstalledDevelLib libutf8proc
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		"$developDir"
+}
+
+TEST()
+{
+	cd build_haiku
+#	make check # test cases not supported yet with cmake
+}