diff --git a/net-libs/serf/serf-1.3.9.recipe b/net-libs/serf/serf-1.3.9.recipe index a0ae635af..76f6c750d 100644 --- a/net-libs/serf/serf-1.3.9.recipe +++ b/net-libs/serf/serf-1.3.9.recipe @@ -6,7 +6,7 @@ transformations are kept to a minimum to provide high performance operation." HOMEPAGE="https://serf.apache.org/" COPYRIGHT="2002-2019 Justin Erenkrantz and Greg Stein" LICENSE="Apache v2" -REVISION="9" +REVISION="10" SOURCE_URI="https://archive.apache.org/dist/serf/serf-$portVersion.tar.bz2" CHECKSUM_SHA256="549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc" PATCHES=" @@ -20,9 +20,12 @@ PATCHES=" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86_gcc2 x86" +libVersion="1.3.0" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" serf$secondaryArchSuffix = $portVersion - lib:libserf_1$secondaryArchSuffix = 1.3.0 compat >= 1 + lib:libserf_1$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -37,7 +40,7 @@ REQUIRES=" PROVIDES_devel=" serf${secondaryArchSuffix}_devel = $portVersion - devel:libserf_1$secondaryArchSuffix = 1.3.0 compat >= 1 + devel:libserf_1$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" serf$secondaryArchSuffix == $portVersion base @@ -73,7 +76,8 @@ BUILD() apu=$portPackageLinksDir/cmd~apu_1_config$secondaryArchSuffix/bin$archDir/apu-1-config gcc=$portPackageLinksDir/cmd~gcc$secondaryArchSuffix/bin$archDir/gcc scons OPENSSL=$portPackageLinksDir/devel~libssl$secondaryArchSuffix \ - ZLIB=/system APR=$apr APU=$apu PREFIX=$prefix CC=$gcc + ZLIB=/system APR=$apr APU=$apu PREFIX=$prefix \ + LIBDIR=$libDir CC=$gcc } INSTALL() @@ -85,16 +89,15 @@ INSTALL() apr=$portPackageLinksDir/cmd~apr_1_config$secondaryArchSuffix/bin$configDir/apr-1-config apu=$portPackageLinksDir/cmd~apu_1_config$secondaryArchSuffix/bin$configDir/apu-1-config scons install OPENSSL=$portPackageLinksDir/devel~libssl$secondaryArchSuffix \ - ZLIB=/system APR=$apr APU=$apu PREFIX=$prefix + ZLIB=/system APR=$apr APU=$apu PREFIX=$prefix \ + LIBDIR=$libDir mkdir -p $includeDir $developLibDir mv $prefix/include/serf-1/* $includeDir/ rm -rf $prefix/include - if [ -n "$secondaryArchSuffix" ]; then - mkdir -p $libDir - mv $prefix/lib/libserf* $prefix/lib/pkgconfig $libDir/ - fi + # remove static library + rm -f $libDir/libserf-1.a # prepare development lib links prepareInstalledDevelLib libserf-1