diff --git a/net-libs/libnspsl/libnspsl-0.1.2.recipe b/net-libs/libnspsl/libnspsl-0.1.3.recipe similarity index 52% rename from net-libs/libnspsl/libnspsl-0.1.2.recipe rename to net-libs/libnspsl/libnspsl-0.1.3.recipe index 93e544eda..3c3292182 100644 --- a/net-libs/libnspsl/libnspsl-0.1.2.recipe +++ b/net-libs/libnspsl/libnspsl-0.1.3.recipe @@ -13,18 +13,21 @@ The principal use in a web browser is to restrict supercookies being set, although it can also serve secondary purposes in the UI such as domain highlighting" HOMEPAGE="https://source.netsurf-browser.org/libnspsl.git/" -COPYRIGHT="2016-2017 Vincent Sanders" +COPYRIGHT="2016-2018 Vincent Sanders" LICENSE="MIT" -REVISION="2" -SOURCE_URI="http://download.netsurf-browser.org/libs/releases/libnspsl-$portVersion-src.tar.gz" -CHECKSUM_SHA256="c9031e564fa8a5c806801443bc7674b68a9a8e83dc2470d5ded965fe392c3572" +REVISION="1" +SOURCE_URI="https://download.netsurf-browser.org/libs/releases/libnspsl-$portVersion-src.tar.gz" +CHECKSUM_SHA256="8de2595a4479cf45e9144594b3736710c21b2ed0c000b45fefaa24a2c40c53e7" -ARCHITECTURES="?x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" + +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" libnspsl$secondaryArchSuffix = $portVersion - lib:libnspsl$secondaryArchSuffix = $portVersion compat >= 0 + lib:libnspsl$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -32,7 +35,7 @@ REQUIRES=" PROVIDES_devel=" libnspsl${secondaryArchSuffix}_devel = $portVersion - devel:libnspsl$secondaryArchSuffix = $portVersion compat >= 0 + devel:libnspsl$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" libnspsl$secondaryArchSuffix == $portVersion base @@ -48,26 +51,30 @@ 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 + for linkage in lib-static lib-shared; do + make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \ + INCLUDEDIR=$relativeIncludeDir LIBDIR=$relativeLibDir \ + COMPONENT_TYPE=$linkage \ + install + done prepareInstalledDevelLib libnspsl fixPkgconfig - packageEntries devel $developDir + + packageEntries devel \ + "$developDir" } TEST() { - make PREFIX=$prefix NSSHARED=/system/data/netsurf-buildsystem \ + make PREFIX="$prefix" NSSHARED=/system/data/netsurf-buildsystem \ test }