mc, move to secondary architecture (#5644)

app-misc/mc/mc-4.8.26.recipe

@@ -8,48 +8,56 @@ archives to be manipulated like real files."
 HOMEPAGE="https://www.midnight-commander.org/"
 COPYRIGHT="1994-2019, Free Software Foundation"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz"
 CHECKSUM_SHA256="c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27"
 
 ARCHITECTURES="x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]
+then
+	commandBinDir=$prefix/bin
+	commandSuffix=
+fi
 
 GLOBAL_WRITABLE_FILES="settings/mc directory keep-old"
 
 PROVIDES="
-	mc = $portVersion
-	cmd:mc = $portVersion
-	cmd:mcdiff = $portVersion
-	cmd:mcedit = $portVersion
-	cmd:mcview = $portVersion
+	mc$secondaryArchSuffix = $portVersion
+	cmd:mc$commandSuffix = $portVersion
+	cmd:mcdiff$commandSuffix = $portVersion
+	cmd:mcedit$commandSuffix = $portVersion
+	cmd:mcview$commandSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libglib_2.0
-	lib:libiconv
-	lib:libintl
-	lib:libncursesw
-	lib:libssh2
-	lib:libz
+	haiku$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libncursesw$secondaryArchSuffix
+	lib:libssh2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	devel:libglib_2.0 >= 0.38
-	devel:libiconv
-	devel:libintl
-	devel:libncursesw
-	devel:libssh2
-	devel:libz
+	haiku${secondaryArchSuffix}_devel
+	devel:libglib_2.0$secondaryArchSuffix >= 0.38
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libncursesw$secondaryArchSuffix
+	devel:libssh2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:find
-	cmd:gcc
-	cmd:gettext
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:perl
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:tar
 	"
 
@@ -61,7 +69,8 @@ PATCH()
 BUILD()
 {
 	CFLAGS="-D_BSD_SOURCE -D_XOPEN_SOURCE_EXTENDED" \
-		LIBS=-lnetwork runConfigure configure \
+		LIBS=-lnetwork runConfigure --omit-dirs binDir configure \
+		--bindir=$commandBinDir \
 		--datarootdir="$dataRootDir" \
 		--enable-vfs-smb \
 		--with-smb-configdir="$settingsDir/samba" \