glfw: move deskbar symlinks to demos package

lagrange: bump to 1.8.2 (#6407 )
websocketpp, bump version (#6406 )
2021-11-15 11:09:43 +10:00 · 2021-11-14 20:08:17 +03:00 · 2021-11-14 08:39:54 +01:00 · 2021-11-14 06:35:40 +01:00 · 2021-11-13 20:31:02 +03:00 · 2021-11-13 20:17:11 +03:00
2909 changed files with 42660 additions and 26152 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1,20 @@
+# Haiku
+Learn more about Haiku: https://www.haiku-os.org/  
+Getting involved with Haiku: https://www.haiku-os.org/community/getting-involved
+
+# HaikuPorts
+HaikuPorts is a collection of recipes to build software programs for the Haiku operating system.  Many of these programs are ported open source programs. There's also recipes to build many open source programs written for BeOS and Haiku.  
+Read our Wiki: https://github.com/haikuports/haikuports/wiki  
+Making Pull Requests: https://github.com/haikuports/haikuports/wiki/DevelopmentModel  
+
+# HaikuArchives
+HaikuArchives is a collection of Programs, Games, Applications, Etc for Haiku. Many were originally written for BeOS. Many of these have one or more open issues. Feel free to try fixing any of them.  
+
+HaikuArchives follows the same model as HaikuPorts for accepting Pull Request, so the Wiki page applies to HaikuArchives as well, just change the repository names where needed.  
+Making Pull Requests: https://github.com/haikuports/haikuports/wiki/DevelopmentModel
+
+# Community and Code of Conduct
+Learn more about the Haiku: https://www.haiku-os.org/  
+Chat with other Haiku developers and user on IRC: https://www.haiku-os.org/community/irc  
+Our code of Conduct applies across Haiku, HaikuPorts and HaikuArchives: https://www.haiku-os.org/community/organization/policies/  
+
--- a/app-accessibility/espeak/espeak-1.48.04.recipe
+++ b/app-accessibility/espeak/espeak-1.48.04.recipe
@ -16,7 +16,7 @@ CHECKSUM_SHA256="bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f065
 SOURCE_DIR="espeak-${portVersion}-source"
 PATCHES="espeak-1.48.04.patch"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	espeak = $portVersion
--- a/app-accessibility/festival/festival-2.4.recipe
+++ b/app-accessibility/festival/festival-2.4.recipe
@ -24,7 +24,7 @@ CHECKSUM_SHA256="1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d8
 SOURCE_DIR="festival"
 PATCHES="festival-${portVersion}.patchset"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86 !x86_gcc2"

 PROVIDES="
--- a/app-accessibility/flite/flite-2.1.recipe
+++ b/app-accessibility/flite/flite-2.1.recipe
@ -24,7 +24,7 @@ CHECKSUM_SHA256="c73c3f6a2ea764977d6eaf0a287722d1e2066b4697088c552e342c790f3d2b8
 SOURCE_DIR="flite-${portVersion}-release"
 PATCHES="flite-$portVersion.patchset"

-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="all ?x86_gcc2"
 SECONDARY_ARCHITECTURES="?x86_gcc2 x86"

 commandBinDir=$binDir
--- a/app-accessibility/speech_tools/speech_tools-2.4.recipe
+++ b/app-accessibility/speech_tools/speech_tools-2.4.recipe
@ -28,7 +28,7 @@ COPYRIGHT="
 	1999-2003 Language Technologies Institute, Carnegie Mellon University
 	"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86 !x86_gcc2"

 PROVIDES="
--- a/app-admin/conky/conky-1.11.6_pre.recipe
+++ b/app-admin/conky/conky-1.11.6_pre.recipe
@ -31,7 +31,7 @@ CHECKSUM_SHA256="2efa3f40626ee910de8f638d8c4648eda33c6565aea4905bfd4f2de742bf69e
 SOURCE_FILENAME="conky-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="conky-$srcGitRev"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 GLOBAL_WRITABLE_FILES="
--- a/app-admin/keepassxc/keepassxc-2.6.2.recipe
+++ b/app-admin/keepassxc/keepassxc-2.6.2.recipe
@ -37,7 +37,7 @@ ADDITIONAL_FILES="
 	icons.zip
 	"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-admin/pwgen/pwgen-2.08.recipe
+++ b/app-admin/pwgen/pwgen-2.08.recipe
@ -22,7 +22,7 @@ REVISION="2"
 SOURCE_URI="https://sourceforge.net/projects/pwgen/files/pwgen/$portVersion/pwgen-$portVersion.tar.gz"
 CHECKSUM_SHA256="dab03dd30ad5a58e578c5581241a6e87e184a18eb2c3b2e0fffa8a9cf105c97b"

-ARCHITECTURES="x86 x86_gcc2 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	pwgen = $portVersion
--- a/app-admin/testdisk/testdisk-7.1.recipe
+++ b/app-admin/testdisk/testdisk-7.1.recipe
@ -32,7 +32,7 @@ REVISION="3"
 SOURCE_URI="https://www.cgsecurity.org/testdisk-$portVersion.tar.bz2"
 CHECKSUM_SHA256="1413c47569e48c5b22653b943d48136cb228abcbd6f03da109c4df63382190fe"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-arch/ancient/ancient-1.0.recipe
+++ b/app-arch/ancient/ancient-1.0.recipe
@ -11,7 +11,7 @@ SOURCE_URI="https://github.com/temisu/ancient/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="5bb3aa98f9a0936fe7e6bb2eb16b0a84c4b5c6a64434eb51c3d8e6d21589421c"
 SOURCE_DIR="ancient-$portVersion"

-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-arch/arc/arc-5.21q.recipe
+++ b/app-arch/arc/arc-5.21q.recipe
@ -9,7 +9,7 @@ SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="bde44648d0c451852612da2256f5a7e48b97d0d625ba88b903d7f223959528cc"
 PATCHES="arc-$portVersion.patchset"

-ARCHITECTURES="x86 ?x86_gcc2 x86_64"
+ARCHITECTURES="all ?x86_gcc2"

 PROVIDES="
 	arc = $portVersion
--- a/app-arch/arj/arj-3.10.22.recipe
+++ b/app-arch/arj/arj-3.10.22.recipe
@ -10,7 +10,7 @@ SOURCE_URI="https://sourceforge.net/projects/arj/files/arj/2.78_3.10%20build%202
 CHECKSUM_SHA256="589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db"
 PATCHES="arj-$portVersion.patchset"

-ARCHITECTURES="x86 x86_gcc2 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	$portName = $portVersion
--- a/app-arch/atool/atool-0.39.0.recipe
+++ b/app-arch/atool/atool-0.39.0.recipe
@ -23,7 +23,7 @@ REVISION="2"
 SOURCE_URI="http://savannah.nongnu.org/download/atool/atool-$portVersion.tar.gz"
 CHECKSUM_SHA256="aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	atool = $portVersion
--- a/app-arch/brotli/brotli-1.0.9.recipe
+++ b/app-arch/brotli/brotli-1.0.9.recipe
@ -17,7 +17,7 @@ CHECKSUM_SHA256="f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe4
 SOURCE_FILENAME="brotli-$portVersion.tar.gz"
 PATCHES="brotli-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86"

 # For now the library will follow $portVersion,
--- a/app-arch/bzip2/bzip2-1.0.8.recipe
+++ b/app-arch/bzip2/bzip2-1.0.8.recipe
@ -13,7 +13,7 @@ SOURCE_URI="https://sourceware.org/pub/bzip2/bzip2-$portVersion.tar.gz"
 CHECKSUM_SHA256="ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269"
 PATCHES="bzip2-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64 arm sparc m68k"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86 x86_gcc2"

 PROVIDES="
--- a/app-arch/cabextract/cabextract-1.9.1.recipe
+++ b/app-arch/cabextract/cabextract-1.9.1.recipe
@ -11,7 +11,7 @@ REVISION="1"
 SOURCE_URI="https://www.cabextract.org.uk/cabextract-$portVersion.tar.gz"
 CHECKSUM_SHA256="afc253673c8ef316b4d5c29cc4aa8445844bee14afffbe092ee9469405851ca7"

-ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
+ARCHITECTURES="all ?arm ?ppc"

 PROVIDES="
 	cabextract = $portVersion
--- a/app-arch/cpio/cpio-2.13.recipe
+++ b/app-arch/cpio/cpio-2.13.recipe
@ -17,7 +17,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/cpio/cpio-$portVersion.tar.gz"
 CHECKSUM_SHA256="e87470d9c984317f658567c03bfefb6b0c829ff17dbf6b0de48d71a4c8f3db88"
 PATCHES="cpio-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	cpio = $portVersion
--- a/app-arch/fastjar/fastjar-0.98.recipe
+++ b/app-arch/fastjar/fastjar-0.98.recipe
@ -12,7 +12,7 @@ REVISION="2"
 SOURCE_URI="http://download.savannah.gnu.org/releases/fastjar/fastjar-0.98.tar.gz"
 CHECKSUM_SHA256="f156abc5de8658f22ee8f08d7a72c88f9409ebd8c7933e9466b0842afeb2f145"

-ARCHITECTURES="x86 ?x86_gcc2 x86_64"
+ARCHITECTURES="all ?x86_gcc2"

 PROVIDES="
 	fastjar = $portVersion
--- a/app-arch/gcab/gcab-1.4.recipe
+++ b/app-arch/gcab/gcab-1.4.recipe
@ -17,7 +17,7 @@ REVISION="1"
 SOURCE_URI="https://download.gnome.org/sources/gcab/$portVersion/gcab-$portVersion.tar.xz"
 CHECKSUM_SHA256="67a5fa9be6c923fbc9197de6332f36f69a33dadc9016a2b207859246711c048f"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
--- a/app-arch/gzip/gzip-1.10.recipe
+++ b/app-arch/gzip/gzip-1.10.recipe
@ -12,7 +12,7 @@ SOURCE_URI="http://ftpmirror.gnu.org/gzip/gzip-$portVersion.tar.xz"
 CHECKSUM_SHA256="8425ccac99872d544d4310305f915f5ea81e04d0f437ef1a230dc9d1c819d7c0"
 PATCHES="gzip-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64 arm ppc sparc m68k"
+ARCHITECTURES="all"

 PROVIDES="
 	gzip = $portVersion
--- a/app-arch/gzip/gzip-1.9.recipe
+++ b/app-arch/gzip/gzip-1.9.recipe
@ -12,7 +12,7 @@ SOURCE_URI="http://ftpmirror.gnu.org/gzip/gzip-$portVersion.tar.xz"
 CHECKSUM_SHA256="ae506144fc198bd8f81f1f4ad19ce63d5a2d65e42333255977cf1dcf1479089a"
 PATCHES="gzip-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64 arm ppc"
+ARCHITECTURES="all"

 PROVIDES="
 	gzip = $portVersion
--- a/app-arch/ha/ha-0999.recipe
+++ b/app-arch/ha/ha-0999.recipe
@ -10,7 +10,7 @@ CHECKSUM_SHA256="641417d256f645c92fe1ee042b9c133b5173d33d540af99ed4932f7d79a3022
 # way the source tarball is packaged
 SOURCE_DIR=""

-ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+ARCHITECTURES="?all x86"

 PROVIDES="
 	ha = $portVersion
--- a/app-arch/innoextract/innoextract-1.8.recipe
+++ b/app-arch/innoextract/innoextract-1.8.recipe
@ -13,7 +13,7 @@ REVISION="1"
 SOURCE_URI="http://constexpr.org/innoextract/files/innoextract-$portVersion.tar.gz"
 CHECKSUM_SHA256="5e78f6295119eeda08a54dcac75306a1a4a40d0cb812ff3cd405e9862c285269"

-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="all !x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-arch/lcab/lcab-1.0b12.recipe
+++ b/app-arch/lcab/lcab-1.0b12.recipe
@ -12,7 +12,7 @@ SOURCE_URI="http://mirror.ohnopub.net/mirror/lcab-$portVersion.tar.gz"
 CHECKSUM_SHA256="065f2c1793b65f28471c0f71b7cf120a7064f28d1c44b07cabf49ec0e97f1fc8"
 PATCHES="lcab-$portVersion.patch"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	lcab = $portVersion
--- a/app-arch/lha/lha-1.14i.ac20191005.recipe
+++ b/app-arch/lha/lha-1.14i.ac20191005.recipe
@ -13,7 +13,7 @@ CHECKSUM_SHA256="0f00ac5167dfa5754ad6e02d9cddce4dae997093515f5a906934b52426115ef
 SOURCE_DIR="lha-7c3cd95fdf0d2f9198bb779561724cd314bc39a6"
 PATCHES="lha-$portVersion.patchset"

-ARCHITECTURES="x86 x86_gcc2 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	lha = $portVersion
--- a/app-arch/libarchive/libarchive-3.5.1.recipe
+++ b/app-arch/libarchive/libarchive-3.5.1.recipe
@ -26,7 +26,7 @@ REVISION="1"
 SOURCE_URI="http://www.libarchive.org/downloads/libarchive-$portVersion.tar.gz"
 CHECKSUM_SHA256="9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
--- a/app-arch/lizard/lizard-1.0.recipe
+++ b/app-arch/lizard/lizard-1.0.recipe
@ -17,7 +17,7 @@ SOURCE_URI="$HOMEPAGE/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="lizard-$portVersion.tar.gz"
 CHECKSUM_SHA256="6f666ed699fc15dc7fdaabfaa55787b40ac251681b50c0d8df017c671a9457e6"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-arch/lrzip/lrzip-0.631.recipe
+++ b/app-arch/lrzip/lrzip-0.631.recipe
@ -13,7 +13,7 @@ SOURCE_URI="http://ck.kolivas.org/apps/lrzip/lrzip-$portVersion.tar.bz2"
 CHECKSUM_SHA256="0d11e268d0d72310d6d73a8ce6bb3d85e26de3f34d8a713055f3f25a77226455"
 PATCHES="lrzip-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 USER_SETTINGS_FILES="
--- a/app-arch/lz4/lz4-1.9.3.recipe
+++ b/app-arch/lz4/lz4-1.9.3.recipe
@ -11,7 +11,7 @@ SOURCE_URI="https://github.com/lz4/lz4/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="lz4-$portVersion.tar.gz"
 CHECKSUM_SHA256="030644df4611007ff7dc962d981f390361e6c97a34e5cbc393ddfbe019ffe2c1"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 libVersion="$portVersion"
--- a/app-arch/lzip/lzip-1.22.recipe
+++ b/app-arch/lzip/lzip-1.22.recipe
@ -29,7 +29,7 @@ REVISION="1"
 SOURCE_URI="https://download.savannah.gnu.org/releases/lzip/lzip-$portVersion.tar.gz"
 CHECKSUM_SHA256="c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
 fi
--- a/app-arch/lzop/lzop-1.04.recipe
+++ b/app-arch/lzop/lzop-1.04.recipe
@ -10,7 +10,7 @@ REVISION="2"
 SOURCE_URI="https://www.lzop.org/download/lzop-$portVersion.tar.gz"
 CHECKSUM_SHA256="7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41"

-ARCHITECTURES="x86_gcc2 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	lzop = $portVersion
--- a/app-arch/minizip/minizip-1.2.11.recipe
+++ b/app-arch/minizip/minizip-1.2.11.recipe
@ -12,7 +12,7 @@ CHECKSUM_SHA256="c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a
 SOURCE_DIR="zlib-$portVersion"
 PATCHES="minizip-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-arch/ncompress/ncompress-4.2.4.4.recipe
+++ b/app-arch/ncompress/ncompress-4.2.4.4.recipe
@ -19,7 +19,7 @@ SOURCE_URI="http://sourceforge.net/projects/ncompress/files/ncompress-4.2.4.4.ta
 CHECKSUM_SHA256="b00ba28d3f332b38aa75478a15c1b789957aa6c02d6453471f452c0ec3e6517a"
 PATCHES="ncompress-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	ncompress = $portVersion
--- a/app-arch/p7zip/p7zip-17.04.recipe
+++ b/app-arch/p7zip/p7zip-17.04.recipe
@ -11,7 +11,7 @@ CHECKSUM_SHA256="ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127e
 PATCHES="p7zip-$portVersion.patchset"
 ADDITIONAL_FILES="p7zip-expander-rules"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-arch/pigz/pigz-2.6.recipe
+++ b/app-arch/pigz/pigz-2.6.recipe
@ -15,7 +15,7 @@ REVISION="1"
 SOURCE_URI="http://www.zlib.net/pigz/pigz-$portVersion.tar.gz"
 CHECKSUM_SHA256="2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
 fi
--- a/app-arch/sharutils/sharutils-4.15.2.recipe
+++ b/app-arch/sharutils/sharutils-4.15.2.recipe
@ -21,7 +21,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-$portVersion.tar.gz"
 CHECKSUM_SHA256="ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637"
 PATCHES="sharutils-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
--- a/app-arch/snappy/snappy-1.1.8.recipe
+++ b/app-arch/snappy/snappy-1.1.8.recipe
@ -12,7 +12,7 @@ REVISION="1"
 SOURCE_URI="https://github.com/google/snappy/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-arch/tar/tar-1.34.recipe
+++ b/app-arch/tar/tar-1.34.recipe
@ -18,7 +18,7 @@ SOURCE_URI="https://ftpmirror.gnu.org/tar/tar-$portVersion.tar.bz2
 CHECKSUM_SHA256="b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff"
 PATCHES="tar-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-arch/unarr/unarr-1.0.1.recipe
+++ b/app-arch/unarr/unarr-1.0.1.recipe
@ -14,7 +14,7 @@ REVISION="2"
 SOURCE_URI="https://github.com/selmf/unarr/archive/v${portVersion}.tar.gz"
 CHECKSUM_SHA256="0098e3f33182d16c13eb21278696651b170360a9a4d1c0214db4bd7882253223"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-arch/unrar/unrar-6.0.7.recipe
+++ b/app-arch/unrar/unrar-6.0.7.recipe
@ -20,16 +20,16 @@ decompress the following file formats:
 HOMEPAGE="https://www.rarlab.com/rar_add.htm"
 COPYRIGHT="1993-2021 Alexander Roshal"
 LICENSE="UnRAR"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
-CHECKSUM_SHA256="130197e495d6e2c2ee790a5beee123edeed642508be13f0159672e5397aca6c1"
+CHECKSUM_SHA256="a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518"
 SOURCE_DIR="unrar"
 ADDITIONAL_FILES="
 	test.rar
 	unrar.rdef
 	"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
--- a/app-arch/unshield/unshield-1.4.3.recipe
+++ b/app-arch/unshield/unshield-1.4.3.recipe
@ -9,7 +9,7 @@ SOURCE_URI="https://github.com/twogood/unshield/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="aa8c978dc0eb1158d266eaddcd1852d6d71620ddfc82807fe4bf2e19022b7bab"
 SOURCE_FILENAME="unshield-$portVersion.tar.gz"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 libVersion="0.0.0"
--- a/app-arch/unzip/unzip-6.0.recipe
+++ b/app-arch/unzip/unzip-6.0.recipe
@ -11,7 +11,7 @@ CHECKSUM_SHA256="036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd3
 SOURCE_DIR="unzip60"
 PATCHES="unzip-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	unzip = $portVersion
--- a/app-arch/unzip/unzip-6.10c23.recipe
+++ b/app-arch/unzip/unzip-6.10c23.recipe
@ -11,7 +11,7 @@ CHECKSUM_SHA256="a9c3f0b4377aa593a77574e2fb69aeab97e66e93d8b110797f7b329e09848b6
 SOURCE_DIR="unzip610c23"
 PATCHES="unzip-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86_64 sparc m68k"
+ARCHITECTURES="all"

 PROVIDES="
 	unzip = $portVersion
--- a/app-arch/xar/xar-1.6.1.recipe
+++ b/app-arch/xar/xar-1.6.1.recipe
@ -16,7 +16,7 @@ SOURCE_URI="https://github.com/downloads/mackyle/xar/xar-$portVersion.tar.gz"
 CHECKSUM_SHA256="ee46089968457cf710b8cf1bdeb98b7ef232eb8a4cdeb34502e1f16ef4d2153e"
 PATCHES="xar-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-arch/xz_utils/xz_utils-5.2.5.recipe
+++ b/app-arch/xz_utils/xz_utils-5.2.5.recipe
@ -12,7 +12,7 @@ CHECKSUM_SHA256="5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42d
 SOURCE_DIR="xz-$portVersion"
 ADDITIONAL_FILES="xz_utils-expander-rules"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
--- a/app-arch/zip/zip-3.0.recipe
+++ b/app-arch/zip/zip-3.0.recipe
@ -11,7 +11,7 @@ CHECKSUM_SHA256="f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c080636
 SOURCE_DIR="zip30"
 PATCHES="$portName-$portVersion.patchset"

-ARCHITECTURES="x86 x86_gcc2 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	$portName = $portVersion
--- a/app-arch/zopfli/zopfli-1.0.3.recipe
+++ b/app-arch/zopfli/zopfli-1.0.3.recipe
@ -9,7 +9,7 @@ SOURCE_URI="$HOMEPAGE/archive/zopfli-$portVersion.tar.gz"
 CHECKSUM_SHA256="e955a7739f71af37ef3349c4fa141c648e8775bceb2195be07e86f8e638814bd"
 SOURCE_DIR="zopfli-zopfli-$portVersion"

-ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
+ARCHITECTURES="all !x86_gcc2 ?arm ?ppc"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
 fi
--- a/app-arch/zpaq/zpaq-7.15.recipe
+++ b/app-arch/zpaq/zpaq-7.15.recipe
@ -17,7 +17,7 @@ SOURCE_URI="http://mattmahoney.net/dc/zpaq715.zip"
 CHECKSUM_SHA256="e85ec2529eb0ba22ceaeabd461e55357ef099b80f61c14f377b429ea3d49d418"
 SOURCE_DIR=""

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-arch/zstd/patches/zstd-1.5.0-gcc2.patchset
+++ b/app-arch/zstd/patches/zstd-1.5.0-gcc2.patchset
@ -0,0 +1,48 @@
+From f7a4d711282e01c88e2da068d7d64974359490e5 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 29 Sep 2021 17:14:40 -0400
+Subject: [PATCH] Various GCC2 fixes.
+
+---
+ lib/common/compiler.h    | 4 ++--
+ lib/compress/zstd_lazy.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/common/compiler.h b/lib/common/compiler.h
+index a951d0a..a02ce59 100644
+--- a/lib/common/compiler.h
+++ b/lib/common/compiler.h
+@@ -151,7 +151,7 @@
+ 
+ /* vectorization
+  * older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax */
+-#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__)
+#if !defined(__INTEL_COMPILER) && !defined(__clang__) && defined(__GNUC__) && (__GNUC__ >= 3)
+ #  if (__GNUC__ == 4 && __GNUC_MINOR__ > 3) || (__GNUC__ >= 5)
+ #    define DONT_VECTORIZE __attribute__((optimize("no-tree-vectorize")))
+ #  else
+@@ -166,7 +166,7 @@
+  * If you can remove a LIKELY/UNLIKELY annotation without speed changes in gcc
+  * and clang, please do.
+  */
+-#if defined(__GNUC__)
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+ #define LIKELY(x) (__builtin_expect((x), 1))
+ #define UNLIKELY(x) (__builtin_expect((x), 0))
+ #else
+diff --git a/lib/compress/zstd_lazy.c b/lib/compress/zstd_lazy.c
+index 3d523e8..9e13f37 100644
+--- a/lib/compress/zstd_lazy.c
+++ b/lib/compress/zstd_lazy.c
+@@ -1081,7 +1081,7 @@ static U32 ZSTD_VecMask_next(ZSTD_VecMask val) {
+         0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8,
+ 		31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9
+     };
+-	return multiplyDeBruijnBitPosition[((U32)((v & -(int)v) * 0x077CB531U)) >> 27];
+	return multiplyDeBruijnBitPosition[((U32)((val & -(int)val) * 0x077CB531U)) >> 27];
+ #   endif
+ }
+ 
+-- 
+2.28.0
+
--- a/app-arch/zstd/patches/zstd-1.5.0.patchset
+++ b/app-arch/zstd/patches/zstd-1.5.0.patchset
@ -0,0 +1,22 @@
+From d10c479911497738d482862559b94c7617d57a61 Mon Sep 17 00:00:00 2001
+From: Augustin Cavalier <waddlesplash@gmail.com>
+Date: Wed, 29 Sep 2021 17:58:52 -0400
+Subject: Disable weak symbols; they do not seem to behave correctly.
+
+
+diff --git a/lib/common/zstd_trace.h b/lib/common/zstd_trace.h
+index 2da5640..aeb126a 100644
+--- a/lib/common/zstd_trace.h
+++ b/lib/common/zstd_trace.h
+@@ -20,7 +20,7 @@ extern "C" {
+ /* weak symbol support */
+ #if !defined(ZSTD_HAVE_WEAK_SYMBOLS) && defined(__GNUC__) && \
+     !defined(__APPLE__) && !defined(_WIN32) && !defined(__MINGW32__) && \
+-    !defined(__CYGWIN__)
+    !defined(__CYGWIN__) && !defined(__HAIKU__)
+ #  define ZSTD_HAVE_WEAK_SYMBOLS 1
+ #else
+ #  define ZSTD_HAVE_WEAK_SYMBOLS 0
+-- 
+2.28.0
+
--- a/app-arch/zstd/zstd-1.1.2.recipe
+++ b/app-arch/zstd/zstd-1.1.2.recipe
@ -14,7 +14,7 @@ SOURCE_URI="https://github.com/facebook/zstd/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="980b8febb0118e22f6ed70d23b5b3e600995dbf7489c1f6d6122c1411cdda8d8"
 SOURCE_FILENAME="zstd-$portVersion.tar.gz"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-arch/zstd/zstd-1.4.5.recipe
+++ b/app-arch/zstd/zstd-1.4.5.recipe
@ -22,7 +22,7 @@ PATCHES="$PATCHES
 	"
 fi

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-arch/zstd/zstd-1.5.0.recipe
+++ b/app-arch/zstd/zstd-1.5.0.recipe
@ -0,0 +1,143 @@
+SUMMARY="Zstandard, a fast real-time compression algorithm"
+SUMMARY_bin="Command line tools to compress/decompress .zst files"
+DESCRIPTION="Zstd, short for Zstandard, is a fast lossless compression \
+algorithm, targeting real-time compression scenarios at zlib-level and better \
+compression ratios. The zstd compression library provides in-memory \
+compression and decompression functions. It offers a very wide range of \
+compression / speed trade-off, while being backed by a very fast decoder. It \
+also offers a special mode for small data, called dictionary compression, and \
+can create dictionaries from any sample set."
+HOMEPAGE="https://facebook.github.io/zstd/"
+COPYRIGHT="2016-2018 Facebook, Inc."
+LICENSE="BSD (2-clause)
+	GNU GPL v2"
+REVISION="2"
+SOURCE_URI="https://github.com/facebook/zstd/archive/v$portVersion.tar.gz"
+SOURCE_FILENAME="zstd-$portVersion.tar.gz"
+CHECKSUM_SHA256="0d9ade222c64e912d6957b11c923e214e2e010a18f39bec102f572e693ba2867"
+PATCHES="zstd-$portVersion.patchset"
+if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
+PATCHES="$PATCHES
+	zstd-$portVersion-gcc2.patchset
+	"
+fi
+
+ARCHITECTURES="all"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ -n "$secondaryArchSuffix" ]; then
+# Comment out this block if you wish to co-install zstd_bin & e.g. zstd_x86_bin.
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	zstd$secondaryArchSuffix = $portVersion
+	lib:libzstd$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_bin="
+	zstd${secondaryArchSuffix}_bin = $portVersion
+	cmd:unzstd$commandSuffix = $portVersion
+	cmd:zstd$commandSuffix = $portVersion
+	cmd:zstdcat$commandSuffix = $portVersion
+	cmd:zstdgrep$commandSuffix = $portVersion
+	cmd:zstdless$commandSuffix = $portVersion
+	cmd:zstdmt$commandSuffix = $portVersion
+	"
+if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
+PROVIDES_bin="$PROVIDES_bin
+	cmd:pzstd$commandSuffix = $portVersion
+	"
+fi
+REQUIRES_bin="
+	haiku$secondaryArchSuffix
+	zstd$secondaryArchSuffix == $portVersion base
+	cmd:grep
+	cmd:less
+	lib:liblz4$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
+REQUIRES_bin="$REQUIRES_bin
+	lib:liblzma$secondaryArchSuffix
+	"
+fi
+if [ -n "$secondaryArchSuffix" -a "$commandBinDir" = "$prefix"/bin ]; then
+CONFLICTS_bin="
+	zstd_bin
+	"
+fi
+
+PROVIDES_devel="
+	zstd${secondaryArchSuffix}_devel = $portVersion
+	devel:libzstd$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	zstd$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:liblz4$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
+BUILD_REQUIRES="$BUILD_REQUIRES
+	devel:liblzma$secondaryArchSuffix
+	"
+fi
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:cmake
+	cmd:make
+	cmd:sed
+	cmd:find
+	"
+
+TEST_REQUIRES="
+	cmd:python3
+	"
+
+BUILD()
+{
+	cd build/cmake
+	cmake . -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON $cmakeDirArgs
+	make
+}
+
+INSTALL()
+{
+	cd build/cmake
+	make install
+
+	prepareInstalledDevelLib libzstd
+	fixPkgconfig
+	fixCMake
+
+	packageEntries bin \
+		$commandBinDir \
+		$manDir/man1
+
+	packageEntries devel \
+		$developDir
+
+	rmdir $manDir
+
+	install -d $docDir
+	install -t $docDir -m 444 ../../LICENSE
+}
+
+TEST()
+{
+	cd build/cmake
+	make test
+}
--- a/app-arch/zx7/zx7-2013.02.25.recipe
+++ b/app-arch/zx7/zx7-2013.02.25.recipe
@ -13,7 +13,7 @@ SOURCE_URI="http://www.worldofspectrum.org/pub/sinclair/games-extras/ZX7_SourceC
 CHECKSUM_SHA256="e02ee4774f51cbe1e77fa1ce52c1f7c9afc5f4f8c2fa0a761e36a53c10527808"
 SOURCE_DIR="src"

-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all x86_gcc2"

 PROVIDES="
 	zx7 = $portVersion
--- a/app-backup/luckybackup/luckybackup-0.5.0.recipe
+++ b/app-backup/luckybackup/luckybackup-0.5.0.recipe
@ -13,7 +13,7 @@ CHECKSUM_SHA256="e801af2483cbdd62bc9af8e2ded252c51adbad81482e291042f58e21c3d4925
 PATCHES="luckybackup-$portVersion.patchset"
 ADDITIONAL_FILES="luckybackup.rdef.in"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
 fi
--- a/app-benchmarks/bonnie++/bonnie++-1.98.recipe
+++ b/app-benchmarks/bonnie++/bonnie++-1.98.recipe
@ -23,7 +23,7 @@ SOURCE_URI="https://www.coker.com.au/bonnie++/bonnie++-$portVersion.tgz"
 CHECKSUM_SHA256="6e0bcbc08b78856fd998dd7bcb352d4615a99c26c2dc83d5b8345b102bad0b04"
 PATCHES="bonnie++-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	bonnie++ = $portVersion
--- a/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
+++ b/app-benchmarks/ffsb/ffsb-6.0_rc2.recipe
@ -12,7 +12,7 @@ CHECKSUM_SHA256="e5867692aae8c9bfbcdc774599022289c4d89c1d90f4dd7101fb9865ac773c7
 SOURCE_DIR="ffsb-6.0-rc2"
 PATCHES="ffsb-6.0_rc2.patchset"

-ARCHITECTURES="x86 ?x86_gcc2 x86_64"
+ARCHITECTURES="all ?x86_gcc2"

 PROVIDES="
 	ffsb = $portVersion
--- a/app-benchmarks/hyperfine/hyperfine-1.8.0.recipe
+++ b/app-benchmarks/hyperfine/hyperfine-1.8.0.recipe
@ -232,7 +232,7 @@ CHECKSUM_SHA256_71="712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931
 SOURCE_URI_72="https://static.crates.io/crates/winconsole/winconsole-0.10.0.crate"
 CHECKSUM_SHA256_72="3ef84b96d10db72dd980056666d7f1e7663ce93d82fa33b63e71c966f4cf5032"

-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="all !x86_gcc2 ?x86"
 commandBinDir=$binDir
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
--- a/app-benchmarks/iozone/iozone-3.492.recipe
+++ b/app-benchmarks/iozone/iozone-3.492.recipe
@ -17,12 +17,12 @@ COPYRIGHT="
 	"
 LICENSE="iozone"
 REVISION="1"
-SOURCE_URI="http://www.iozone.org/src/current/iozone3_326.tar"
-CHECKSUM_SHA256="bc0a40b2cc7f2e8c6dcfbbff82f1df82ad735f02c9a7db59f8364b76f43f7063"
-SOURCE_DIR="iozone3_326"
-PATCHES="iozone-3.326.patchset"
+SOURCE_URI="http://www.iozone.org/src/current/iozone3_492.tar"
+CHECKSUM_SHA256="322981e168f32bd39f54772b82b2906d598d958c37e954e75742e71baf58bb9b"
+SOURCE_DIR="iozone3_492"
+PATCHES="iozone-3.492.patchset"

-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="all ?x86"

 PROVIDES="
 	iozone = $portVersion
--- a/app-benchmarks/iozone/patches/iozone-3.326.patchset
+++ b/app-benchmarks/iozone/patches/iozone-3.326.patchset
@ -1,249 +0,0 @@
-From 0f41a2987ab4de6d04b395b88bd506e699a42d73 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Sat, 26 Aug 2017 13:21:47 +0200
-Subject: Haiku patch
-
-
-diff --git a/src/current/fileop.c b/src/current/fileop.c
-index 57ddf68..d6fb79c 100644
--- a/src/current/fileop.c
-+++ b/src/current/fileop.c
-@@ -116,7 +116,7 @@ void file_unlink(int);
- void file_read(int);
- void splash(void);
- void usage(void);
-void bzero();
-+//void bzero();
- void clear_stats();
- int validate(char *, int , char );
- 
-@@ -138,14 +138,15 @@ int dirlen;
- /************************************************************************/
- void purge_buffer_cache()
- {
-	if (!mountname)
-		return;
-+
- 
- 	char cwd[PATH_MAX];
- 	char command[1024];
- 	int ret,i;
- 
- 	getcwd(cwd, sizeof(cwd));
-+	if (!mountname)
-+		return;
- 	chdir("/");
- 	strcpy(command,"umount ");
- 	strcat(command, mountname);
-@@ -242,7 +243,7 @@ int main(int argc, char **argv)
- 	  printf("\nFileop:  Working in %s, File size is %d,  Output is in Ops/sec. (A=Avg, B=Best, W=Worst)\n", thedir, sz);
- 	if(!verbose)
- 	{
-#ifdef Windows
-+#if defined(Windows) || defined(Haiku) 
- 	   	printf(" .     %7s %7s %7s %7s %7s %7s %7s %7s %7s %7s %7s %7s %7s %10s\n",
-        	   	"mkdir","chdir","rmdir","create","open","read","write","close","stat",
- 		"access","chmod","readdir","delete"," Total_files");
-@@ -450,7 +451,7 @@ int main(int argc, char **argv)
- 	      printf("         Worst readdir(s)/sec = %12.2f (%12.9f seconds/op)\n\n",
- 			1/stats[_STAT_READDIR].worst,stats[_STAT_READDIR].worst);
- 	   }
-#if !defined(Windows)
-+#if 0
- 	   /*
- 	    * link test 
- 	    */
-@@ -517,7 +518,7 @@ int main(int argc, char **argv)
- 	         printf("%7.0f ",stats[_STAT_ACCESS].counter/stats[_STAT_ACCESS].total_time);
- 	         printf("%7.0f ",stats[_STAT_CHMOD].counter/stats[_STAT_CHMOD].total_time);
- 	         printf("%7.0f ",stats[_STAT_READDIR].counter/stats[_STAT_READDIR].total_time);
-#ifndef Windows
-+#if !defined(Windows) || !defined(Haiku)
- 	         printf("%7.0f ",stats[_STAT_LINK].counter/stats[_STAT_LINK].total_time);
- 	         printf("%7.0f ",stats[_STAT_UNLINK].counter/stats[_STAT_UNLINK].total_time);
- #endif
-@@ -540,7 +541,7 @@ int main(int argc, char **argv)
- 	         printf("%7.0f ",1/stats[_STAT_ACCESS].best);
- 	         printf("%7.0f ",1/stats[_STAT_CHMOD].best);
- 	         printf("%7.0f ",1/stats[_STAT_READDIR].best);
-#ifndef Windows
-+#if !defined(Windows) || !defined(Haiku)
- 	         printf("%7.0f ",1/stats[_STAT_LINK].best);
- 	         printf("%7.0f ",1/stats[_STAT_UNLINK].best);
- #endif
-@@ -563,7 +564,7 @@ int main(int argc, char **argv)
- 	         printf("%7.0f ",1/stats[_STAT_ACCESS].worst);
- 	         printf("%7.0f ",1/stats[_STAT_CHMOD].worst);
- 	         printf("%7.0f ",1/stats[_STAT_READDIR].worst);
-#ifndef Windows
-+#if !defined(Windows) || !defined(Haiku)
- 	         printf("%7.0f ",1/stats[_STAT_LINK].worst);
- 	         printf("%7.0f ",1/stats[_STAT_UNLINK].worst);
- #endif
-@@ -589,9 +590,10 @@ dir_create(int x)
- 	{
- 	  sprintf(buf,"fileop_L1_%d",i);
- 	  stats[_STAT_DIR_CREATE].starttime=time_so_far();
-	  ret=mkdir(buf,0777);
-+	  ret=mkdir(buf, 0777);
- 	  if(ret < 0)
- 	  {
-+	  	  printf("ret = %d", ret);
- 	      printf("Mkdir failed\n");
- 	      exit(1);
- 	  }
-diff --git a/src/current/iozone.c b/src/current/iozone.c
-index 90cee47..bcef6f5 100644
--- a/src/current/iozone.c
-+++ b/src/current/iozone.c
-@@ -57,7 +57,7 @@
- #include <Windows.h>
- int errno;
- #else
-#if defined(linux)
-+#if defined(linux) || defined(Haiku)
- #include <errno.h>
- #else
- extern  int errno;   /* imported for errors */
-@@ -79,7 +79,7 @@ extern  int h_errno; /* imported for errors */
- #include <pthread.h>
- #endif
- 
-#if defined(HAVE_ANSIC_C) && defined(linux)
-+#if defined(HAVE_ANSIC_C) && (defined(linux) || defined(Haiku))
- #include <stdlib.h>
- #include <sys/wait.h>
- #endif
-@@ -92,7 +92,7 @@ int close();
- int unlink();
- int main();
- void record_command_line();
-#if !defined(linux)
-+#if !defined(linux) && !defined(Haiku)
- int wait();
- #endif
- int fsync();
-@@ -271,6 +271,13 @@ THISVERSION,
- #include <string.h>
- #endif
- 
-+#if defined(__HAIKU__)
-+#include <malloc.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#endif
-+
-+
- #if defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
- #ifndef O_SYNC
- #define O_SYNC O_FSYNC
-@@ -390,7 +397,7 @@ typedef long long off64_t;
- #define MAP_ANONYMOUS MAP_ANON
- #endif
- 
-#if defined(SCO_Unixware_gcc) || defined(solaris) || defined(UWIN) || defined(SCO)
-+#if defined(SCO_Unixware_gcc) || defined(solaris) || defined(UWIN) || defined(SCO) || defined(Haiku)
- #define MAP_FILE (0)
- #endif
- 
-diff --git a/src/current/iozone_visualizer.pl b/src/current/iozone_visualizer.pl
-index a5a7d2d..4e7ba23 100755
--- a/src/current/iozone_visualizer.pl
-+++ b/src/current/iozone_visualizer.pl
-@@ -1,4 +1,4 @@
-#!/usr/bin/perl
-+#!/boot/common/bin/perl
- 
- use warnings;
- use strict;
-diff --git a/src/current/libbif.c b/src/current/libbif.c
-index 406d3c2..9c5ed32 100644
--- a/src/current/libbif.c
-+++ b/src/current/libbif.c
-@@ -14,7 +14,7 @@
- #include <sys/types.h>
- #include <stdio.h>
- #include <sys/file.h>
-#if defined(__AIX__) || defined(__FreeBSD__) || defined(__DragonFly__)
-+#if defined(__AIX__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(Haiku)
- #include <fcntl.h>
- #else
- #include <sys/fcntl.h>
-@@ -24,7 +24,7 @@
- #include <string.h>
- #endif
- 
-#if defined(linux) || defined(__DragonFly__) || defined(macosx)
-+#if defined(linux) || defined(__DragonFly__) || defined(macosx) || defined(Haiku)
- #include <unistd.h>
- #include <stdlib.h>
- #endif
-diff --git a/src/current/makefile b/src/current/makefile
-index 994a2b4..9c61709 100644
--- a/src/current/makefile
-+++ b/src/current/makefile
-@@ -30,6 +30,7 @@ all:
- 	@echo "        ->   freebsd              (32bit)   <-"
- 	@echo "        ->   generic              (32bit)   <-"
- 	@echo "        ->   ghpux                (32bit)   <-"
-+	@echo "        ->   haiku                (32bit)   <-"
- 	@echo "        ->   hpuxs-11.0 (simple)  (32bit)   <-"
- 	@echo "        ->   hpux-11.0w           (64bit)   <-"
- 	@echo "        ->   hpuxs-11.0w          (64bit)   <-"
-@@ -83,6 +84,12 @@ rpm:
- 	cp ../../iozone*.tar /usr/src/red*/SO*
- 	rpmbuild -ba spec.in
- 
-+#
-+# GNU 'C' compiler Linux build with threads, largefiles, async I/O 
-+#
-+haiku:	iozone_haiku.o libbif.o fileop_haiku.o
-+	$(CC)  -O3 $(LDFLAGS) -lnetwork iozone_haiku.o libbif.o -o iozone
-+	$(CC)  -O3  -lnetwork fileop_haiku.o -o fileop
- 
- #
- # Turn on the optimizer, largefiles, Posix async I/O and threads.
-@@ -529,6 +536,16 @@ netbsd:	iozone_netbsd.o  libbif.o fileop_netbsd.o
- # Now for the machine specific stuff
- #
- 
-+iozone_haiku.o:	iozone.c libbif.c 
-+	@echo ""
-+	@echo "Building iozone for Haiku"
-+	@echo ""
-+	$(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DHAVE_PREAD \
-+		 -DNO_MADVISE -DHaiku $(CFLAGS) iozone.c \
-+		-DNAME='"haiku"' -o iozone_haiku.o
-+	$(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C \
-+		 -DNO_MADVISE -DHaiku $(CFLAGS) libbif.c -o libbif.o
-+
- iozone_hpux.o:	iozone.c libbif.c
- 	@echo ""
- 	@echo "Building iozone for HP-UX (9.05)"
-@@ -695,6 +712,13 @@ iozone_linux.o:	iozone.c libbif.c libasync.c
- 	$(CC) -Wall -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
- 		-D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c  -o libasync.o 
- 
-+fileop_haiku.o:	fileop.c
-+	@echo ""
-+	@echo "Building fileop for Haiku"
-+	@echo ""
-+	$(CC) -c -O $(CFLAGS) -DHaiku fileop.c -o fileop_haiku.o
-+
-+
- fileop_AIX.o:	fileop.c
- 	@echo ""
- 	@echo "Building fileop for AIX"
-diff --git a/src/current/report.pl b/src/current/report.pl
-index 76943f3..d6976e2 100755
--- a/src/current/report.pl
-+++ b/src/current/report.pl
-@@ -1,4 +1,4 @@
-#!/usr/bin/perl
-+#!/boot/common/bin/perl
- #
- # arguments: one of more report files
- #
-- 
-2.7.0
-
--- a/app-benchmarks/iozone/patches/iozone-3.492.patchset
+++ b/app-benchmarks/iozone/patches/iozone-3.492.patchset
@ -0,0 +1,356 @@
+From d2bb34270a3c68941f3b117a2e83a3e20e3b6a9b Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sat, 26 Aug 2017 13:21:47 +0200
+Subject: Haiku patch
+
+
+diff --git a/src/current/fileop.c b/src/current/fileop.c
+index 70010f4..f37db06 100644
+--- a/src/current/fileop.c
+++ b/src/current/fileop.c
+@@ -145,14 +145,15 @@ int dirlen;
+ /************************************************************************/
+ void purge_buffer_cache()
+ {
+-	if (!mountname)
+-		return;
+
+ 
+ 	char cwd[PATH_MAX];
+ 	char command[1024];
+ 	int ret,i;
+ 
+ 	junkp=(int *)getcwd(cwd, sizeof(cwd));
+	if (!mountname)
+		return;
+ 	junk=chdir("/");
+ 	strcpy(command,"umount ");
+ 	strcat(command, mountname);
+@@ -254,7 +255,7 @@ int main(int argc, char **argv)
+ 	  printf("\nFileop:  Working in %s, File size is %d,  Output is in Ops/sec. (A=Avg, B=Best, W=Worst)\n", thedir, sz);
+ 	if(!verbose)
+ 	{
+-#ifdef Windows
+#if defined(Windows) || defined(Haiku) 
+ 	   	printf(" .     %7s %7s %7s %7s %7s %7s %7s %7s %7s %7s %7s %7s %7s %10s\n",
+        	   	"mkdir","chdir","rmdir","create","open","read","write","close","stat",
+ 		"access","chmod","readdir","delete"," Total_files");
+@@ -462,7 +463,7 @@ int main(int argc, char **argv)
+ 	      printf("         Worst readdir(s)/sec = %12.2f (%12.9f seconds/op)\n\n",
+ 			1/stats[_STAT_READDIR].worst,stats[_STAT_READDIR].worst);
+ 	   }
+-#if !defined(Windows)
+#if 0
+ 	   /*
+ 	    * link test 
+ 	    */
+@@ -529,7 +530,7 @@ int main(int argc, char **argv)
+ 	         printf("%7.0f ",stats[_STAT_ACCESS].counter/stats[_STAT_ACCESS].total_time);
+ 	         printf("%7.0f ",stats[_STAT_CHMOD].counter/stats[_STAT_CHMOD].total_time);
+ 	         printf("%7.0f ",stats[_STAT_READDIR].counter/stats[_STAT_READDIR].total_time);
+-#ifndef Windows
+#if !defined(Windows) || !defined(Haiku)
+ 	         printf("%7.0f ",stats[_STAT_LINK].counter/stats[_STAT_LINK].total_time);
+ 	         printf("%7.0f ",stats[_STAT_UNLINK].counter/stats[_STAT_UNLINK].total_time);
+ #endif
+@@ -552,7 +553,7 @@ int main(int argc, char **argv)
+ 	         printf("%7.0f ",1/stats[_STAT_ACCESS].best);
+ 	         printf("%7.0f ",1/stats[_STAT_CHMOD].best);
+ 	         printf("%7.0f ",1/stats[_STAT_READDIR].best);
+-#ifndef Windows
+#if !defined(Windows) || !defined(Haiku)
+ 	         printf("%7.0f ",1/stats[_STAT_LINK].best);
+ 	         printf("%7.0f ",1/stats[_STAT_UNLINK].best);
+ #endif
+@@ -575,7 +576,7 @@ int main(int argc, char **argv)
+ 	         printf("%7.0f ",1/stats[_STAT_ACCESS].worst);
+ 	         printf("%7.0f ",1/stats[_STAT_CHMOD].worst);
+ 	         printf("%7.0f ",1/stats[_STAT_READDIR].worst);
+-#ifndef Windows
+#if !defined(Windows) || !defined(Haiku)
+ 	         printf("%7.0f ",1/stats[_STAT_LINK].worst);
+ 	         printf("%7.0f ",1/stats[_STAT_UNLINK].worst);
+ #endif
+@@ -601,9 +602,10 @@ dir_create(int x)
+ 	{
+ 	  sprintf(buf,"fileop_L1_%d",i);
+ 	  stats[_STAT_DIR_CREATE].starttime=time_so_far();
+-	  ret=mkdir(buf,0777);
+	  ret=mkdir(buf, 0777);
+ 	  if(ret < 0)
+ 	  {
+	  	  printf("ret = %d", ret);
+ 	      printf("Mkdir failed\n");
+ 	      exit(1);
+ 	  }
+diff --git a/src/current/iozone.c b/src/current/iozone.c
+index 5407795..727a053 100644
+--- a/src/current/iozone.c
+++ b/src/current/iozone.c
+@@ -74,7 +74,7 @@
+ #include <windows.h>
+ #include <errno.h>
+ #else
+-#if defined(linux) || defined(solaris) || defined(IOZ_macosx) || defined(__AIX__) || defined(__FreeBSD__) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
+#if defined(linux) || defined(solaris) || defined(IOZ_macosx) || defined(__AIX__) || defined(__FreeBSD__) || defined(_HPUX_SOURCE) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(Haiku)
+ #include <errno.h>
+ #else
+ extern  int errno;   /* imported for errors */
+@@ -106,7 +106,7 @@ extern  int h_errno; /* imported for errors */
+    syscall(__NR_sched_setaffinity, (pid_t)pid, (size_t)size, (void *)cpuset)
+ #endif
+ 
+-#if defined(HAVE_ANSIC_C) && defined(linux)
+#if defined(HAVE_ANSIC_C) && (defined(linux) || defined(Haiku))
+ #include <stdlib.h>
+ #include <sys/wait.h>
+ #endif
+@@ -118,7 +118,7 @@ int atoi();
+ int close();
+ int unlink();
+ int main();
+-#if !defined(linux)
+#if !defined(linux) && !defined(Haiku)
+ int wait();
+ #endif
+ int fsync();
+@@ -296,7 +296,7 @@ THISVERSION,
+ #include <stdio.h>
+ #include <signal.h>
+ 
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows) || defined(Haiku)
+   #ifndef my_sig_t
+   typedef void (*my_sig_t)(int);
+   #endif
+@@ -313,6 +313,13 @@ THISVERSION,
+ #include <string.h>
+ #endif
+ 
+#if defined(__HAIKU__)
+#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
+#endif
+
+
+ #if defined (__FreeBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
+ #ifndef O_SYNC
+ #define O_SYNC O_FSYNC
+@@ -444,7 +451,7 @@ typedef long long off64_t;
+ #define MAP_ANONYMOUS MAP_ANON
+ #endif
+ 
+-#if defined(SCO_Unixware_gcc) || defined(solaris) || defined(UWIN) || defined(SCO)
+#if defined(SCO_Unixware_gcc) || defined(solaris) || defined(UWIN) || defined(SCO) || defined(Haiku)
+ #define MAP_FILE (0)
+ #endif
+ 
+@@ -1032,7 +1039,7 @@ float do_compute(float);	/* compute cycle simulation       */
+ void begin(off64_t,long long);
+ void record_command_line(int, char **);
+ void show_help(void);		/* show development help          */
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows) || defined(Haiku)
+ my_sig_t signal_handler(void);	/* clean up if user interrupts us */
+ #else
+ sighandler_t signal_handler(void);	/* clean up if user interrupts us */
+@@ -1925,7 +1932,7 @@ char **argv;
+ 	argvsave=argv;
+ 
+ #ifndef NO_SIGNAL
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows) || defined(Haiku)
+     	signal((int) SIGINT, (my_sig_t) signal_handler);   /* handle user interrupt */
+     	signal((int) SIGTERM, (my_sig_t) signal_handler);  /* handle kill from shell */
+ #else
+@@ -2704,6 +2711,9 @@ char **argv;
+                                         sprintf(splash[splash_line++],"\tDedup+compress enabled\n ");
+ 					break;
+  				case 'R':  /* Speical Windows option to read filelist from a input file. Experimental */
+                            		{
+                            		struct stat outbuf;
+                            		int result;
+ 	 				mfflag++;
+ 					subarg = argv[optind++];
+                                         if(subarg==(char *)0)
+@@ -2713,8 +2723,6 @@ char **argv;
+                                         }
+                                         sprintf(splash[splash_line++],"\tFilenames from a file option enabled. File: %s\n ",subarg);
+ 			 		/* filename should be used instead of filelist */
+-                            		struct stat outbuf;
+-                            		int result;
+                             		result = stat(subarg, &outbuf);
+                             		if(result == -1) {
+                                     		printf("Failed to stat the iozone input file: %s\n",argv[optind]);
+@@ -2755,7 +2763,7 @@ char **argv;
+                                 		}
+                             		}
+ 					break;
+-
+                            		}
+ 				case 'c':  /* Argument is the controlling host name */
+ 					/* I am a client for distributed Iozone */
+ 					subarg=argv[optind++];
+@@ -3730,13 +3738,13 @@ void show_help()
+ 
+ ******************************************************************/
+ #ifdef HAVE_ANSIC_C
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows) || defined(Haiku)
+ my_sig_t signal_handler(void)
+ #else
+ sighandler_t signal_handler(void)
+ #endif
+ #else
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(solaris) || defined(Windows) || defined(Haiku)
+ my_sig_t signal_handler()
+ #else
+ sighandler_t signal_handler()
+@@ -24871,7 +24879,7 @@ int main(void)
+ int false = 0;
+ int true = 1;
+ #else
+-typedef enum { false = 0, true } boolean;
+//typedef enum { false = 0, true } boolean;
+ #endif
+ typedef struct sockaddr_in       sockaddr_in_t;
+ typedef struct sockaddr_in6      sockaddr_in6_t;
+@@ -25285,11 +25293,12 @@ void * thread_fwrite_test( x)
+         FILE *stream = NULL;
+         int First_Run[MAXSTREAMS];
+ 	int kk;
+	double burst_acc_time_sec;
+ 
+ 	for(kk=0;kk<MAXSTREAMS;kk++)
+ 		First_Run[kk]=1;
+ 
+-        double burst_acc_time_sec = 0;
+        burst_acc_time_sec = 0;
+ 
+         if(compute_flag)
+                 delay=compute_time;
+@@ -25749,6 +25758,10 @@ void * thread_fread_test( x)
+         char tmpname[256];
+         FILE *thread_wqfd;
+         FILE *thread_Lwqfd;
+        char *stdio_buf;
+        char *filename;
+        long long Index = 0;
+        FILE *stream = NULL;
+ 
+         if(compute_flag)
+                 delay=compute_time;
+@@ -25757,10 +25770,6 @@ void * thread_fread_test( x)
+         thread_wqfd=w_traj_fd=thread_Lwqfd=(FILE *)0;
+         traj_offset=walltime=cputime=0;
+         anwser=bind_cpu=0;
+-        char *stdio_buf;
+-        long long Index = 0;
+-        FILE *stream = NULL;
+-        char *filename;
+ 
+         if(w_traj_flag)
+         {
+diff --git a/src/current/iozone_visualizer.pl b/src/current/iozone_visualizer.pl
+index 5d5a52c..9ebd809 100755
+--- a/src/current/iozone_visualizer.pl
+++ b/src/current/iozone_visualizer.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
+#!/boot/common/bin/perl
+ 
+ use warnings;
+ use strict;
+diff --git a/src/current/libbif.c b/src/current/libbif.c
+index 5e14e5f..b54b71c 100644
+--- a/src/current/libbif.c
+++ b/src/current/libbif.c
+@@ -17,7 +17,7 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <sys/file.h>
+-#if defined(__AIX__) || defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__AIX__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(Haiku)
+ #include <fcntl.h>
+ #else
+ #include <sys/fcntl.h>
+@@ -27,7 +27,7 @@
+ #include <string.h>
+ #endif
+ 
+-#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) || defined(__NetBSD__) || defined(Windows)
+#if defined(linux) || defined(__DragonFly__) || defined(IOZ_macosx) || defined(__NetBSD__) || defined(Windows) || defined(Haiku)
+ #include <unistd.h>
+ #include <stdlib.h>
+ #endif
+diff --git a/src/current/makefile b/src/current/makefile
+index 3a54701..7da4813 100644
+--- a/src/current/makefile
+++ b/src/current/makefile
+@@ -42,6 +42,7 @@ all:
+ 	@echo "        ->   freebsd64            (64bit)   <-"
+ 	@echo "        ->   generic              (32bit)   <-"
+ 	@echo "        ->   ghpux                (32bit)   <-"
+	@echo "        ->   haiku                (32bit)   <-"
+ 	@echo "        ->   hpuxs-11.0 (simple)  (32bit)   <-"
+ 	@echo "        ->   hpux-11.0w           (64bit)   <-"
+ 	@echo "        ->   hpuxs-11.0w          (64bit)   <-"
+@@ -97,6 +98,12 @@ rpm:
+ 	cp ../../iozone*.tar /home/capps/rpmbuild/SOURCES/
+ 	rpmbuild  -ba --buildroot /home/capps/rpmbuild/BUILDROOT spec.in
+ 
+#
+# GNU 'C' compiler Linux build with threads, largefiles, async I/O 
+#
+haiku:	iozone_haiku.o libbif.o fileop_haiku.o
+	$(CC)  -O3 $(LDFLAGS) -lnetwork iozone_haiku.o libbif.o -o iozone
+	$(CC)  -O3  -lnetwork fileop_haiku.o -o fileop
+ 
+ #
+ # Turn on the optimizer, largefiles, Posix async I/O and threads.
+@@ -647,6 +654,16 @@ netbsd-AMD64:  iozone_netbsd-AMD64.o libbif.o libasync.o fileop_netbsd-AMD64.o p
+ # Now for the machine specific stuff
+ #
+ 
+iozone_haiku.o:	iozone.c libbif.c 
+	@echo ""
+	@echo "Building iozone for Haiku"
+	@echo ""
+	$(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DHAVE_PREAD \
+		 -DNO_MADVISE -DHaiku $(CFLAGS) iozone.c \
+		-DNAME='"haiku"' -o iozone_haiku.o
+	$(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C \
+		 -DNO_MADVISE -DHaiku $(CFLAGS) libbif.c -o libbif.o
+
+ iozone_hpux.o:	iozone.c libbif.c
+ 	@echo ""
+ 	@echo "Building iozone for HP-UX (9.05)"
+@@ -849,6 +866,13 @@ iozone_linux.o:	iozone.c libbif.c libasync.c
+ 	$(CC) -Wmissing-prototypes -Wall -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \
+ 		-D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c  -o libasync.o 
+ 
+fileop_haiku.o:	fileop.c
+	@echo ""
+	@echo "Building fileop for Haiku"
+	@echo ""
+	$(CC) -c -O $(CFLAGS) -DHaiku fileop.c -o fileop_haiku.o
+
+
+ fileop_AIX.o:	fileop.c
+ 	@echo ""
+ 	@echo "Building fileop for AIX"
+diff --git a/src/current/report.pl b/src/current/report.pl
+index 3b21055..a83580c 100755
+--- a/src/current/report.pl
+++ b/src/current/report.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
+#!/boot/common/bin/perl
+ #
+ # arguments: one of more report files
+ #
+-- 
+2.30.2
+
--- a/app-benchmarks/piozone/piozone-1.0.recipe
+++ b/app-benchmarks/piozone/piozone-1.0.recipe
@ -8,7 +8,7 @@ SOURCE_URI="ftp://ftp.lysator.liu.se/pub/unix/piozone/piozone-1.0.tar.gz"
 CHECKSUM_SHA256="0b7f880b72b10664a24b712c22c90b4caab4f0cb1a8c99cba0d1a106fd63d15d"
 PATCHES="piozone-1.0.patch"

-ARCHITECTURES="?x86 ?x86_gcc2 x86_64"
+ARCHITECTURES="all ?x86 ?x86_gcc2"

 PROVIDES="
 	piozone = $portVersion
--- a/app-benchmarks/stress-ng/patches/stress_ng-0.12.01.patchset
+++ b/app-benchmarks/stress-ng/patches/stress_ng-0.12.01.patchset
@ -1,22 +0,0 @@
-From 4f6b80ad397cacf8196e9ee2ddabad53dfeae5c0 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 20 Jan 2021 11:27:46 +1000
-Subject: Disable mlock for Haiku
-
-
-diff --git a/stress-ng.h b/stress-ng.h
-index a3e07e9..31c319f 100644
--- a/stress-ng.h
-+++ b/stress-ng.h
-@@ -1200,7 +1200,7 @@ typedef struct {
- #endif
- 
- /* GCC mlocked data and data section attribute */
-#if defined(__GNUC__) && NEED_GNUC(4,6,0) && !defined(__sun__)
-+#if defined(__GNUC__) && NEED_GNUC(4,6,0) && !defined(__sun__) && !defined(__HAIKU__)
- #define MLOCKED_DATA	__attribute__((__section__("mlocked_data")))
- #define MLOCKED_TEXT	__attribute__((__section__("mlocked_text")))
- #define MLOCKED_SECTION 1
-- 
-2.30.0
-
--- a/app-benchmarks/stress-ng/stress_ng-0.13.05.recipe
+++ b/app-benchmarks/stress-ng/stress_ng-0.13.05.recipe
@ -1,13 +1,13 @@
 SUMMARY="Stress test a computer system in various selectable ways"
 DESCRIPTION="stress-ng will stress test a computer system in various \
 selectable ways. It was designed to exercise various physical subsystems of a \
-computer as well as the various operating system kernel interfaces. \
+computer as well as the various operating system kernel interfaces.
 Stress-ng features:

 * Over 240 stress tests
-*78 CPU specific stress tests that exercise floating point, integer, bit\
- manipulation and control flow
-*Over 20 virtual memory stress tests
+* 78 CPU specific stress tests that exercise floating point, integer, bit \
+manipulation and control flow
+* Over 20 virtual memory stress tests

 stress-ng was originally intended to make a machine work hard and trip \
 hardware issues such as thermal overruns as well as operating system bugs \
@ -31,15 +31,14 @@ One can specify the number of processes to invoke per type of stress test; \
 specifying a negative or zero value will select the number of online \
 processors as defined by sysconf(_SC_NPROCESSORS_ONLN)."
 HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
-COPYRIGHT="2013-2020 Colin Ian King"
+COPYRIGHT="2013-2021 Colin Ian King"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://github.com/ColinIanKing/stress-ng/archive/V$portVersion.zip"
 SOURCE_DIR="stress-ng-$portVersion"
-CHECKSUM_SHA256="17fff86fa6bc061802822bf4b076e511c577b51c114855ff679a38a11e6ca79e"
-PATCHES="stress_ng-$portVersion.patchset"
+CHECKSUM_SHA256="442c07327c5534566670a85dc67d50b1c643250aa09cc7129c793705d294cbeb"

-ARCHITECTURES="?x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"

 PROVIDES="
 	stress_ng = $portVersion
@ -57,7 +56,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:awk
-	cmd:g++
+	cmd:gcc
 	cmd:make
 	"

@ -65,11 +64,11 @@ BUILD()
 {
 	touch config
 	make -f Makefile.config
-	make
+	make $jobArgs
 }

 INSTALL()
 {
-	mkdir -p  $binDir
+	mkdir -p $binDir
 	cp stress-ng $binDir
 }
--- a/app-benchmarks/vttest/vttest-20210210.recipe
+++ b/app-benchmarks/vttest/vttest-20210210.recipe
@ -9,13 +9,13 @@ Additional tests (past version 1.7) are provided for analysis of vt220, vt420 \
 terminals, as well as variants of xterm."
 HOMEPAGE="https://invisible-island.net/vttest/vttest.html"
 COPYRIGHT="1983-1985 Per Lindberg
-	1996-2014 Thomas E. Dickey"
+	1996-2020,2021 by Thomas E. Dickey"
 LICENSE="BSD (3-clause)"
-REVISION="2"
-SOURCE_URI="ftp://ftp.invisible-island.net/vttest/vttest.tar.gz"
-CHECKSUM_SHA256="0168aa34061d4470a68b0dd0781a2a9e2bbfb1493e540c99f615b867a11cbf83"
+REVISION="1"
+SOURCE_URI="https://invisible-mirror.net/archives/vttest/vttest-$portVersion.tgz"
+CHECKSUM_SHA256="0f98a2e305982915f1520984c3e8698e3acd508ee210711528c89f5a7ea7f046"

-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="all"

 PROVIDES="
 	vttest = $portVersion
--- a/app-cdr/bchunk/bchunk-1.2.2.recipe
+++ b/app-cdr/bchunk/bchunk-1.2.2.recipe
@ -12,7 +12,7 @@ REVISION="1"
 SOURCE_URI="http://he.fi/bchunk/bchunk-$portVersion.tar.gz"
 CHECKSUM_SHA256="e7d99b5b60ff0b94c540379f6396a670210400124544fb1af985dd3551eabd89"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	bchunk = $portVersion
--- a/app-cdr/ccd2iso/ccd2iso-0.3.recipe
+++ b/app-cdr/ccd2iso/ccd2iso-0.3.recipe
@ -10,7 +10,7 @@ SOURCE_URI_2="https://github.com/paulproteus/ccd2iso-debian/raw/278c8c2f7d87a777
 CHECKSUM_SHA256_2="d780c6ad7698967ec52f1e4bdc149774acc8174e88b0f4ed6212d445d2e850b6"
 SOURCE_FILENAME_2="ccd2iso.1-$portVersion"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	ccd2iso = $portVersion
@ -37,6 +37,6 @@ BUILD()
 INSTALL()
 {
 	install -d $binDir $manDir/man1
-	install -t $binDir -s src/ccd2iso 
+	install -t $binDir -s src/ccd2iso
 	install -T $sourceDir2/$SOURCE_FILENAME_2 -m 444 $manDir/man1/ccd2iso.1
 }
--- a/app-cdr/cdrtools/cdrtools-3.01.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.01.recipe
@ -25,7 +25,7 @@ SOURCE_URI="http://downloads.sourceforge.net/project/cdrtools/cdrtools-3.01.tar.
 CHECKSUM_SHA256="ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f"
 PATCHES="cdrtools-3.01.patch"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 GLOBAL_WRITABLE_FILES="
 	settings/cdrecord keep-old
--- a/app-cdr/cdrtools/cdrtools-3.02~a09.recipe
+++ b/app-cdr/cdrtools/cdrtools-3.02~a09.recipe
@ -29,7 +29,7 @@ PATCHES="
 	cdrtools-${portVersion%\~*}-scsi-beos.c.patch
 	"

-ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
+ARCHITECTURES="all ?arm ?ppc"
 SECONDARY_ARCHITECTURES="x86"

 GLOBAL_WRITABLE_FILES="
--- a/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e.recipe
@ -13,7 +13,7 @@ SOURCE_DIR=""
 SOURCE_URI_2="http://httpredir.debian.org/debian/pool/main/d/daa2iso/daa2iso_0.1.7e-1.diff.gz#noarchive"
 CHECKSUM_SHA256_2="810b1400c18f5dbcb35c64c56b23bd0a22b7623f2bc694f1b789f0418eaba1d1"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	daa2iso = $portVersion
--- a/app-cdr/iat/iat-0.1.7.recipe
+++ b/app-cdr/iat/iat-0.1.7.recipe
@ -8,7 +8,7 @@ REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/iat.berlios/iat-$portVersion.tar.bz2"
 CHECKSUM_SHA256="fb72c42f4be18107ec1bff8448bd6fac2a3926a574d4950a4d5120f0012d62ca"

-ARCHITECTURES="?x86_gcc2 x86 x86_64"
+ARCHITECTURES="all ?x86_gcc2"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
 fi
--- a/app-cdr/mdf2iso/mdf2iso-0.3.1.recipe
+++ b/app-cdr/mdf2iso/mdf2iso-0.3.1.recipe
@ -7,7 +7,7 @@ REVISION="1"
 SOURCE_URI="https://deb.debian.org/debian/pool/main/m/mdf2iso/mdf2iso_$portVersion.orig.tar.gz"
 CHECKSUM_SHA256="906f0583cb3d36c4d862da23837eebaaaa74033c6b0b6961f2475b946a71feb7"

-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-cdr/mirage2iso/mirage2iso-0.4.2.recipe
+++ b/app-cdr/mirage2iso/mirage2iso-0.4.2.recipe
@ -7,7 +7,7 @@ REVISION="2"
 SOURCE_URI="https://github.com/mgorny/mirage2iso/releases/download/v$portVersion/mirage2iso-$portVersion.tar.xz"
 CHECKSUM_SHA256="f92af1737a7d5756a76d6ccf4a2b7ed922d271eb0ce01e4e32efc5516638d30d"

-ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-cdr/uif2iso/uif2iso-0.1.7c.recipe
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c.recipe
@ -16,7 +16,7 @@ SOURCE_DIR=""
 SOURCE_URI_2="http://httpredir.debian.org/debian/pool/main/u/uif2iso/uif2iso_0.1.7a-1.diff.gz#noarchive"
 CHECKSUM_SHA256_2="60e91e4a3c7b64d18a144b0e2bc0499c1ab10db3676c099725aca820ff429594"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-crypt/argon2/argon2-20200709.recipe
+++ b/app-crypt/argon2/argon2-20200709.recipe
@ -22,7 +22,7 @@ if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
 	argon2-$portVersion-gcc2.patchset"
 fi

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-crypt/codecrypt/codecrypt-1.8.recipe
+++ b/app-crypt/codecrypt/codecrypt-1.8.recipe
@ -11,7 +11,7 @@ REVISION="3"
 SOURCE_URI="http://e-x-a.org/codecrypt/files/codecrypt-$portVersion.tar.gz"
 CHECKSUM_SHA256="3be7c2a548aa336dbac706c3cab2071664d02b11652c16c02a8b4fb5cac6bc88"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-crypt/gnupg/gnupg-2.2.27.recipe
+++ b/app-crypt/gnupg/gnupg-2.2.27.recipe
@ -34,7 +34,7 @@ SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
 CHECKSUM_SHA256="34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399"
 PATCHES="gnupg-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
@ -145,6 +145,6 @@ INSTALL()

 TEST()
 {
-	# FAIL: t-timestuff, t-gettime 
+	# FAIL: t-timestuff, t-gettime
 	make check
 }
--- a/app-crypt/gpgme/gpgme-1.15.1.recipe
+++ b/app-crypt/gpgme/gpgme-1.15.1.recipe
@ -14,7 +14,7 @@ SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$portVersion.tar.bz2"
 CHECKSUM_SHA256="eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad"
 PATCHES="gpgme-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 libgpgmeVersion="11.21.0"
--- a/app-crypt/johntheripper/johntheripper-1.9.0.recipe
+++ b/app-crypt/johntheripper/johntheripper-1.9.0.recipe
@ -16,7 +16,7 @@ CHECKSUM_SHA256="f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3
 SOURCE_DIR="john-$portVersion-jumbo-$jumboVersion"
 PATCHES="johntheripper-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 GLOBAL_WRITABLE_FILES="
--- a/app-crypt/libmd/libmd-1.0.1.recipe
+++ b/app-crypt/libmd/libmd-1.0.1.recipe
@ -28,7 +28,7 @@ REVISION="2"
 SOURCE_URI="https://libbsd.freedesktop.org/releases/libmd-$portVersion.tar.xz"
 CHECKSUM_SHA256="e14eeb931cf85330f95ff822262d3033125488dfb2f867441e36e2d2c4a34c71"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 libVersion="0.0.2"
--- a/app-crypt/libu2f_host/libu2f_host-1.1.10.recipe
+++ b/app-crypt/libu2f_host/libu2f_host-1.1.10.recipe
@ -14,7 +14,7 @@ CHECKSUM_SHA256="45937c6c04349f865d9f047d3a68cc50ea24e9085d18ac2c7d31fa38eb74930
 SOURCE_DIR="libu2f-host-libu2f-host-$portVersion"
 PATCHES="libu2f_host-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandBinDir=$binDir
--- a/app-crypt/libu2f_server/libu2f_server-1.1.0.recipe
+++ b/app-crypt/libu2f_server/libu2f_server-1.1.0.recipe
@ -10,7 +10,7 @@ SOURCE_URI="https://github.com/Yubico/libu2f-server/archive/libu2f-server-$portV
 CHECKSUM_SHA256="6551109e692c9c4fea61e99f1cd8377e8e54e3033e421cc191da6d673311c860"
 SOURCE_DIR="libu2f-server-libu2f-server-$portVersion"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandBinDir=$binDir
--- a/app-crypt/mcrypt/mcrypt-2.6.8.recipe
+++ b/app-crypt/mcrypt/mcrypt-2.6.8.recipe
@ -11,7 +11,7 @@ REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/mcrypt/mcrypt-$portVersion.tar.gz"
 CHECKSUM_SHA256="5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"

-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="all ?x86"

 PROVIDES="
 	mcrypt = $portVersion
--- a/app-crypt/mhash/mhash-0.9.9.9.recipe
+++ b/app-crypt/mhash/mhash-0.9.9.9.recipe
@ -11,7 +11,7 @@ REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/mhash/mhash-$portVersion.tar.gz"
 CHECKSUM_SHA256="3dcad09a63b6f1f634e64168dd398e9feb9925560f9b671ce52283a79604d13e"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86"

 libVersion="2.0.1"
--- a/app-crypt/minisign/minisign-0.9.recipe
+++ b/app-crypt/minisign/minisign-0.9.recipe
@ -9,7 +9,7 @@ REVISION="1"
 SOURCE_URI="https://github.com/jedisct1/minisign/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="caa4b3dd314e065c6f387b2713f7603673e39a8a0b1a76f96ef6c9a5b845da0f"

-ARCHITECTURES="x86_gcc2 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-crypt/olm/olm-3.1.4.recipe
+++ b/app-crypt/olm/olm-3.1.4.recipe
@ -11,7 +11,7 @@ REVISION="1"
 SOURCE_URI="https://gitlab.matrix.org/matrix-org/olm/-/archive/$portVersion/olm-$portVersion.tar.bz2"
 CHECKSUM_SHA256="eff513cff8e5c7af657e800a2c2dbbdee5be19ee9ce24c5498a2528c4b5f1dc3"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"

 libVersion="3.1.4"
--- a/app-crypt/p11-kit/p11_kit-0.23.18.1.recipe
+++ b/app-crypt/p11-kit/p11_kit-0.23.18.1.recipe
@ -5,13 +5,13 @@ in such a way that they're discoverable."
 HOMEPAGE="https://p11-glue.freedesktop.org/p11-kit.html"
 COPYRIGHT="2017 Red Hat, Inc."
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/p11-glue/p11-kit/releases/download/$portVersion/p11-kit-$portVersion.tar.gz"
 CHECKSUM_SHA256="34c3bd8c0050dd7c4e6228aecf0f168de0a1b34562ddbf74a1c70904c2523c6f"
 SOURCE_DIR="p11-kit-$portVersion"
 PATCHES="p11_kit-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="all !x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="x86"

 commandBinDir=$binDir
--- a/app-crypt/paperkey/paperkey-1.4.recipe
+++ b/app-crypt/paperkey/paperkey-1.4.recipe
@ -9,7 +9,7 @@ REVISION="4"
 SOURCE_URI="http://www.jabberwocky.com/software/paperkey/paperkey-$portVersion.tar.gz"
 CHECKSUM_SHA256="e12bb0ec835127d12a922a8d60b3dfdb3ca8ee60bb5b4d15ae4cea85bbcf336f"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
--- a/app-crypt/pinentry/pinentry-1.1.0.recipe
+++ b/app-crypt/pinentry/pinentry-1.1.0.recipe
@ -9,7 +9,7 @@ SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-$portVersion.tar.
 CHECKSUM_SHA256="68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570"
 PATCHES="pinentry-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"

 PROVIDES="
--- a/app-crypt/qca/qca-2.2.1.recipe
+++ b/app-crypt/qca/qca-2.2.1.recipe
@ -15,7 +15,7 @@ CHECKSUM_SHA256="d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b0
 SOURCE_DIR="qca-$portVersion"
 PATCHES="qca-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/app-crypt/rhash/rhash-1.4.1.recipe
+++ b/app-crypt/rhash/rhash-1.4.1.recipe
@ -15,7 +15,7 @@ CHECKSUM_SHA256="430c812733e69b78f07ce30a05db69563450e41e217ae618507a4ce2e144a29
 SOURCE_DIR="RHash-$portVersion"
 PATCHES="rhash-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/app-crypt/signify/signify-23.recipe
+++ b/app-crypt/signify/signify-23.recipe
@ -18,7 +18,7 @@ SOURCE_URI="https://github.com/aperezdc/signify/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="1c690bf0e4283e0764a4a9dd784cb3debf4bb456b975b275dd1aaac7d5afe030"
 PATCHES="signify-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 !x86_64"
+ARCHITECTURES="!all"
 SECONDARY_ARCHITECTURES="!x86"

 PROVIDES="
--- a/app-crypt/steghide/steghide-0.5.1.recipe
+++ b/app-crypt/steghide/steghide-0.5.1.recipe
@ -11,7 +11,7 @@ SOURCE_URI="https://downloads.sourceforge.net/steghide/steghide-$portVersion.tar
 CHECKSUM_SHA256="a2c7f879a3e22860879889106cc49e486000653f81448264affa0fd616a47da1"
 PATCHES="steghide-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	steghide = $portVersion
--- a/app-crypt/stegsnow/stegsnow-20130616.recipe
+++ b/app-crypt/stegsnow/stegsnow-20130616.recipe
@ -10,7 +10,7 @@ SOURCE_URI="http://www.darkside.com.au/snow/snow-$portVersion.tar.gz"
 CHECKSUM_SHA256="c0b71aa74ed628d121f81b1cd4ae07c2842c41cfbdf639b50291fc527c213865"
 SOURCE_DIR="snow-$portVersion"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	stegsnow = $portVersion
--- a/app-doc/doxygen/doxygen-1.7.6.1.recipe
+++ b/app-doc/doxygen/doxygen-1.7.6.1.recipe
@ -24,7 +24,7 @@ SOURCE_URI="http://ftp.stack.nl/pub/users/dimitri/doxygen-$portVersion.src.tar.g
 CHECKSUM_SHA256="0e60e794fb172d3fa4a9a9535f0b8e0eeb04e8366153f6b417569af0bcd61fcd"
 PATCHES="doxygen-$portVersion.patch"

-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all x86_gcc2"

 PROVIDES="
 	doxygen = $portVersion compat >= 1.7
--- a/app-doc/doxygen/doxygen-1.8.16.recipe
+++ b/app-doc/doxygen/doxygen-1.8.16.recipe
@ -24,7 +24,7 @@ CHECKSUM_SHA256="75b18117f88ca1930ab74c05f6712690a26dd4fdcfc9d7d5324be43160645fb
 SOURCE_DIR="doxygen-Release_${portVersion//./_}"
 PATCHES="doxygen-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 portVersionCompat="$portVersion compat >= 1.8"
--- a/app-doc/zeal/zeal-0.6.1.recipe
+++ b/app-doc/zeal/zeal-0.6.1.recipe
@ -13,7 +13,7 @@ SOURCE_FILENAME="zeal-$portVersion.tar.gz"
 PATCHES="zeal-$portVersion.patchset"
 ADDITIONAL_FILES="zeal.rdef.in"

-ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="all !x86_gcc2 ?x86"
 if [ "$targetArchitecture" = x86_gcc2 ]; then
 SECONDARY_ARCHITECTURES="x86"
 fi
--- a/app-editors/emacs/emacs-26.2.recipe
+++ b/app-editors/emacs/emacs-26.2.recipe
@ -19,7 +19,7 @@ CHECKSUM_SHA256="151ce69dbe5b809d4492ffae4a4b153b2778459de6deb26f35691e1281a9c58
 PATCHES="emacs-$portVersion.patchset"
 ADDITIONAL_FILES="emacs.rdef.in"

-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="all ?x86_gcc2 ?x86"
 SECONDARY_ARCHITECTURES="x86"

 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
--- a/app-editors/featherpad/featherpad-1.0.1.recipe
+++ b/app-editors/featherpad/featherpad-1.0.1.recipe
@ -1,6 +1,6 @@
 SUMMARY="A lightweight Qt5 plain-text editor for Linux"
 DESCRIPTION="FeatherPad (by Pedram Pourang, a.k.a. Tsu Jan \
-<tsujan2000@gmail.com>) is a lightweight Qt5 plain-text editor for Linux \
+<tsujan2000@gmail.com>) is a lightweight Qt5 plain-text editor for Linux. \
 It is independent of any desktop environment and has: \
 * Drag-and-drop support, including tab detachment and attachment;
 * X11 virtual desktop awareness (using tabs on current desktop but opening \
@ -18,30 +18,31 @@ saving with encoding;
 * Auto-saving;
 * Printing;
 * Text zooming;
-* Appropriate but non-interrupting prompts;
-* Haiku OS support; and
-* Other features that can be found in its settings,
+* Appropriate but non-interrupting prompts; and
+* Other features that can be found in its settings, \
 on its menus or when it is actually used."
 HOMEPAGE="https://github.com/tsujan/FeatherPad"
 COPYRIGHT="2016, 2018 Pedram Pourang"
 LICENSE="GNU GPL v3"
 REVISION="1"
-SOURCE_URI="https://github.com/tsujan/FeatherPad/archive/V$portVersion.tar.gz"
-CHECKSUM_SHA256="f3ed0bc17b1679e8498d3e453209055274a9f89b1fec01a1201389365d47e67c"
+SOURCE_URI="https://github.com/tsujan/FeatherPad/archive/refs/tags/V$portVersion.tar.gz"
+CHECKSUM_SHA256="62bcb8ceb788a1626c41ee7dc3f3fbebf73b82db31cf76708a79073da0f04414"
 SOURCE_FILENAME="FeatherPad-$portVersion-tar.gz"
 SOURCE_DIR="FeatherPad-$portVersion"
 ADDITIONAL_FILES="featherpad.rdef.in"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	featherpad$secondaryArchSuffix = $portVersion
 	app:FeatherPad$secondaryArchSuffix = $portVersion
 	"
+
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
+	lib:libhunspell_1.7$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
@ -54,6 +55,7 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libGL$secondaryArchSuffix
+	devel:libhunspell_1.7$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Network$secondaryArchSuffix
@ -62,6 +64,7 @@ BUILD_REQUIRES="
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
+
 BUILD_PREREQUIRES="
 	cmd:find
 	cmd:g++$secondaryArchSuffix
@ -69,33 +72,38 @@ BUILD_PREREQUIRES="
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:qmake$secondaryArchSuffix >= 5
+	cmd:cmake$secondaryArchSuffix
 	"

 BUILD()
 {
-	qmake PREFIX=$appsDir/FeatherPad
+	mkdir -p build
+	cd build
+	cmake .. -DCMAKE_INSTALL_PREFIX:PATH="$appsDir/FeatherPad" \
+		-DCMAKE_BUILD_TYPE=Release
+
 	make $jobArgs
 }

 INSTALL()
 {
+	cd build
 	make install

-	local APP_SIGNATURE="application/x-vnd-featherpad"
+	mv $appsDir/FeatherPad/featherpad \
+		$appsDir/FeatherPad/FeatherPad
+
+	local APP_SIGNATURE="application/x-vnd.featherpad"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	local LONG_INFO="$SUMMARY"
-
 	sed \
 		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
-		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/featherpad.rdef.in > featherpad.rdef

 	addResourcesToBinaries featherpad.rdef $appsDir/FeatherPad/FeatherPad
-	addAppDeskbarSymlink $appsDir/FeatherPad/FeatherPad
+	addAppDeskbarSymlink $appsDir/FeatherPad/FeatherPad "FeatherPad"
 }
--- a/app-editors/focuswriter/focuswriter-1.7.6.recipe
+++ b/app-editors/focuswriter/focuswriter-1.7.6.recipe
@ -12,7 +12,7 @@ SOURCE_URI="https://github.com/gottcode/focuswriter/archive/v$portVersion.tar.gz
 CHECKSUM_SHA256="bbf70def7d86ee18cabe9f8ac3922ebbf4dfdb36893df3e6fa3e026acfcb2057"
 ADDITIONAL_FILES="focuswriter.rdef.in"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/Show More
+++ b/Show More