diff --git a/sys-apps/sed/sed-4.4.recipe b/sys-apps/sed/sed-4.4.recipe index 11093e8c8..0a57762de 100644 --- a/sys-apps/sed/sed-4.4.recipe +++ b/sys-apps/sed/sed-4.4.recipe @@ -15,23 +15,23 @@ CHECKSUM_SHA256="cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683 PATCHES="sed-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm" +if [ "$targetArchitecture" = x86_gcc2 ]; then SECONDARY_ARCHITECTURES="x86" +fi -commandSuffix=$secondaryArchSuffix commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= commandBinDir=$prefix/bin fi PROVIDES=" sed$secondaryArchSuffix = $portVersion compat >= 4 - cmd:sed$commandSuffix = $portVersion compat >= 4 + cmd:sed = $portVersion compat >= 4 " REQUIRES=" haiku$secondaryArchSuffix " -if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then +if [ -n "$secondaryArchSuffix" ]; then CONFLICTS=" sed " @@ -67,8 +67,8 @@ BUILD() INSTALL() { make install - rm $libDir/charset.alias - rmdir $libDir + rm "$libDir"/charset.alias + rmdir "$libDir" } TEST() diff --git a/sys-apps/sed/sed-4.5.recipe b/sys-apps/sed/sed-4.5.recipe index 07f1a0abb..3f2f365cc 100644 --- a/sys-apps/sed/sed-4.5.recipe +++ b/sys-apps/sed/sed-4.5.recipe @@ -15,23 +15,23 @@ CHECKSUM_SHA256="7aad73c8839c2bdadca9476f884d2953cdace9567ecd0d90f9959f229d146b4 PATCHES="sed-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64 ?arm" +if [ "$targetArchitecture" = x86_gcc2 ]; then SECONDARY_ARCHITECTURES="?x86" +fi -commandSuffix=$secondaryArchSuffix commandBinDir=$binDir if [ "$targetArchitecture" = x86_gcc2 ]; then - commandSuffix= commandBinDir=$prefix/bin fi PROVIDES=" sed$secondaryArchSuffix = $portVersion compat >= 4 - cmd:sed$commandSuffix = $portVersion compat >= 4 + cmd:sed = $portVersion compat >= 4 " REQUIRES=" haiku$secondaryArchSuffix " -if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then +if [ -n "$secondaryArchSuffix" ]; then CONFLICTS=" sed "