diff --git a/app-arch/unrar/unrar-5.8.3.recipe b/app-arch/unrar/unrar-5.8.3.recipe index 1279e32de..8de9ae031 100644 --- a/app-arch/unrar/unrar-5.8.3.recipe +++ b/app-arch/unrar/unrar-5.8.3.recipe @@ -20,7 +20,7 @@ decompress the following file formats: HOMEPAGE="https://www.rarlab.com/rar_add.htm" COPYRIGHT="1993-2018 Alexander Roshal" LICENSE="UnRAR" -REVISION="2" +REVISION="3" SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz" CHECKSUM_SHA256="3591685c8f5bbcb0be09de3d0a0544adb88966b9cccb80986f6cd2b534fd91a6" SOURCE_DIR="unrar" @@ -31,30 +31,35 @@ ADDITIONAL_FILES=" " ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - unrar = $portVersion - cmd:unrar = $portVersion - lib:libunrar = $portVersion + unrar$secondaryArchSuffix = $portVersion + lib:libunrar$secondaryArchSuffix = $portVersion " +if [ -z "$secondaryArchSuffix" ]; then +PROVIDES="$PROVIDES + cmd:unrar = $portVersion + " +fi REQUIRES=" - haiku + haiku$secondaryArchSuffix " PROVIDES_devel=" - unrar = $portVersion - devel:libunrar = $portVersion + unrar${secondaryArchSuffix}_devel = $portVersion + devel:libunrar$secondaryArchSuffix = $portVersion " REQUIRES_devel=" - unrar == $portVersion + unrar$secondaryArchSuffix == $portVersion " BUILD_REQUIRES=" - haiku_devel + haiku${secondaryArchSuffix}_devel " BUILD_PREREQUIRES=" cmd:cut - cmd:g++ + cmd:g++$secondaryArchSuffix cmd:make cmd:sed " @@ -94,19 +99,21 @@ INSTALL() { install -d "$libDir"/unrar install -t "$libDir"/unrar sfx/default.sfx - for i in unrar lib; do - make -C $i DESTDIR="$prefix" install-$i - done + make -C unrar DESTDIR="$prefix" install-unrar + install lib/libunrar.so $libDir install -d "$includeDir"/unrar install -t "$includeDir"/unrar dll.hpp - rm "$libDir"/libunrar.a prepareInstalledDevelLib libunrar fixPkgconfig packageEntries devel $developDir - addResourcesToBinaries unrar.rdef "$binDir"/unrar - mimeset -f "$binDir"/unrar + if [ -n "$secondaryArchSuffix" ]; then + rm -rf $prefix/bin + else + addResourcesToBinaries unrar.rdef "$binDir"/unrar + mimeset -f "$binDir"/unrar + fi } TEST()