diff --git a/dev-libs/libunistring/libunistring-1.2.recipe b/dev-libs/libunistring/libunistring-1.3.recipe similarity index 74% rename from dev-libs/libunistring/libunistring-1.2.recipe rename to dev-libs/libunistring/libunistring-1.3.recipe index dcdf85a56..e4b8f5062 100644 --- a/dev-libs/libunistring/libunistring-1.2.recipe +++ b/dev-libs/libunistring/libunistring-1.3.recipe @@ -8,12 +8,12 @@ LICENSE="GNU GPL v2 REVISION="1" SOURCE_URI="https://ftpmirror.gnu.org/libunistring/libunistring-$portVersion.tar.gz https://ftp.gnu.org/gnu/libunistring/libunistring-$portVersion.tar.gz" -CHECKSUM_SHA256="fd6d5662fa706487c48349a758b57bc149ce94ec6c30624ec9fdc473ceabbc8e" +CHECKSUM_SHA256="8ea8ccf86c09dd801c8cac19878e804e54f707cf69884371130d20bde68386b7" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="5.1.0" +libVersion="5.2.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -33,6 +33,12 @@ REQUIRES_devel=" libunistring$secondaryArchSuffix == $portVersion base " +ARCHITECTURES_doc="any" + +PROVIDES_doc=" + libunistring_doc = $portVersion + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libiconv$secondaryArchSuffix @@ -50,14 +56,9 @@ defineDebugInfoPackage libunistring$secondaryArchSuffix \ BUILD() { - autoreconf -fi - if [ -n "$secondaryArchSuffix" ]; then - runConfigure ./configure --disable-static - else - runConfigure --omit-dirs docDir ./configure \ - --disable-static \ - --docdir="$developDocDir" - fi + runConfigure --omit-dirs docDir ./configure \ + --disable-static \ + --docdir=$developDir/documentation/libunistring make $jobArgs } @@ -66,18 +67,14 @@ INSTALL() make install rm -f "$libDir"/libunistring.la "$libDir"/charset.alias - if [ -n "$secondaryArchSuffix" ]; then - rm -rf "$documentationDir" - maybe_infoDir= - else - install -t "$developDocDir" README - maybe_infoDir="$infoDir" - fi - prepareInstalledDevelLib libunistring + + packageEntries doc \ + $developDir/documentation + packageEntries devel \ - "$developDir" \ - ${maybe_infoDir:+"$maybe_infoDir"} + $developDir \ + $infoDir } TEST()