glfw: move deskbar symlinks to demos package

This reverts commit a4c370a081.

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/  
+

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

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="

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

app-accessibility/speech_tools/speech_tools-2.4.recipe

@@ -6,7 +6,7 @@ that aide in developing machine-synthesized voices. Developed by the University
 of Edinburgh, it is used in Festival, a text-to-speech engine developed by \
 the University of Edinburgh as well.
 "
-HOMEPAGE="http://www.cstr.ed.ac.uk/projects/speech_tools/"
+HOMEPAGE="https://www.cstr.ed.ac.uk/projects/speech_tools/"
 SOURCE_URI="http://www.festvox.org/packed/festival/${portVersion}/speech_tools-${portVersion}-release.tar.gz"
 CHECKSUM_SHA256="fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010"
 SOURCE_DIR="speech_tools"
@@ -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="

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="

app-admin/keepassxc/keepassxc-2.5.4.recipe

@@ -1,142 +0,0 @@
-SUMMARY="Qt password manager"
-DESCRIPTION="KeePassXC is an application for people with extremly high \
-demands on secure personal data management. It has a light interface, is \
-cross platform and published under the terms of the GNU General Public License.
-KeePassXC saves many different information e.g. user names, passwords, urls, \
-attachments and comments in one single database. For a better management \
-user-defined titles and icons can be specified for each single entry. \
-Furthermore the entries are sorted in groups, which are customizable as well. \
-The integrated search function allows to search in a single group or the \
-complete database.
-KeePassXC offers a little utility for secure password generation. The \
-password generator is very customizable, fast and easy to use. Especially \
-someone who generates passwords frequently will appreciate this feature.
-KeePassXC is a community fork of KeePassX which aims to incorporate stalled \
-pull requests, features, and bug fixes that have never made it into the main \
-KeePassX repository."
-HOMEPAGE="https://keepassxc.org/"
-COPYRIGHT="
-	2010-2012, Felix Geyer
-	2011-2012, Florian Geyer
-	2012, Tobias Tangemann
-	2007, Trolltech ASA
-	2012, Intel Corporation
-	2012, Nokia Corporation and/or its subsidiary(-ies)
-	2000-2008, Tom Sato
-	2013, Laszlo Papp
-	2013, David Faure
-	2016-2020, KeePassXC Team
-	"
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://github.com/keepassxreboot/keepassxc/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="ebb27af867548f765d2b3aeb3937ad34f429159f7ce12af7a5db6a744997c5aa"
-ADDITIONAL_FILES="keepassxc.rdef.in"
-
-ARCHITECTURES="!x86_gcc2 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	keepassxc$secondaryArchSuffix = $portVersion
-	cmd:keepassxc_cli
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libargon2$secondaryArchSuffix
-	lib:libgcrypt$secondaryArchSuffix
-	lib:libgpg_error$secondaryArchSuffix
-	lib:libmicrohttpd$secondaryArchSuffix
-	lib:libqrencode$secondaryArchSuffix
-	lib:libsodium$secondaryArchSuffix
-	lib:libQt5Concurrent$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5DBus$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libQt5Test$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libargon2$secondaryArchSuffix
-	devel:libgcrypt$secondaryArchSuffix
-	devel:libgpg_error$secondaryArchSuffix
-	devel:libmicrohttpd$secondaryArchSuffix
-	devel:libqrencode$secondaryArchSuffix
-	devel:libsodium$secondaryArchSuffix
-	devel:libQt5Concurrent$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5DBus$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Network$secondaryArchSuffix
-	devel:libQt5Test$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:g++$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
-	cmd:make
-	cmd:qmake$secondaryArchSuffix >= 5
-	"
-
-BUILD()
-{
-	mkdir -p build ; cd build
-
-	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \
-		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
-		-DKEEPASSXC_BUILD_TYPE=Release \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DWITH_XC_NETWORKING=on \
-		-DWITH_XC_SSHAGENT=on \
-		-DWITH_XC_AUTOTYPE=on \
-		-DWITH_XC_UPDATECHECK=off \
-		-DWITH_TESTS=on \
-		-DCMAKE_CXX_FLAGS="-D_GNU_SOURCE"
-
-	make $jobArgs
-}
-
-INSTALL()
-{
-#	TODO: replace toolbar icons with https://github.com/HaikuArchives/ZumisIcons/tree/master/myhaiku/btoolbar
-	cd build
-	make install
-
-	appIconsDir=$dataDir/keepassxc/icons/application
-	rm -rf $appIconsDir/scalable
-	rm -rf $appIconsDir/16x16/apps
-	rm -rf $appIconsDir/*/mimetypes
-	for i in 32 48 64 128 256; do
-		rm -rf $appIconsDir/${i}x${i}
-	done
-
-	mkdir -p $appsDir
-	mv $prefix/bin/keepassxc $appsDir/KeePassXC
-
-	local APP_SIGNATURE="application/x-vnd.qt5-keepassxc"
-	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/keepassxc.rdef.in > keepassxc.rdef
-
-	addResourcesToBinaries keepassxc.rdef $appsDir/KeePassXC
-	addAppDeskbarSymlink $appsDir/KeePassXC
-}
-
-TEST()
-{
-	cd build
-	make test
-}

app-admin/keepassxc/keepassxc-2.6.2.recipe

@@ -0,0 +1,149 @@
+SUMMARY="Qt password manager"
+DESCRIPTION="KeePassXC is an application for people with extremly high \
+demands on secure personal data management. It has a light interface, is \
+cross platform and published under the terms of the GNU General Public License.
+KeePassXC saves many different information e.g. user names, passwords, urls, \
+attachments and comments in one single database. For a better management \
+user-defined titles and icons can be specified for each single entry. \
+Furthermore the entries are sorted in groups, which are customizable as well. \
+The integrated search function allows to search in a single group or the \
+complete database.
+KeePassXC offers a little utility for secure password generation. The \
+password generator is very customizable, fast and easy to use. Especially \
+someone who generates passwords frequently will appreciate this feature.
+KeePassXC is a community fork of KeePassX which aims to incorporate stalled \
+pull requests, features, and bug fixes that have never made it into the main \
+KeePassX repository."
+HOMEPAGE="https://keepassxc.org/"
+COPYRIGHT="
+	2010-2012, Felix Geyer
+	2011-2012, Florian Geyer
+	2012, Tobias Tangemann
+	2007, Trolltech ASA
+	2012, Intel Corporation
+	2012, Nokia Corporation and/or its subsidiary(-ies)
+	2000-2008, Tom Sato
+	2013, Laszlo Papp
+	2013, David Faure
+	2016-2020, KeePassXC Team
+	"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://github.com/keepassxreboot/keepassxc/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="9387caeadabb5e66190f1ccae4eb26887ba872125620e22bba8c79615349cf81"
+PATCHES="keepassxc-$portVersion.patchset"
+ADDITIONAL_FILES="
+	keepassxc.rdef.in
+	icons.zip
+	"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	keepassxc$secondaryArchSuffix = $portVersion
+	cmd:keepassxc_cli
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libargon2$secondaryArchSuffix
+	lib:libgcrypt$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
+	lib:libmicrohttpd$secondaryArchSuffix
+	lib:libqrencode$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix
+	lib:libsodium$secondaryArchSuffix
+	lib:libQt5Concurrent$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5DBus$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5Test$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libquazip5$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libargon2$secondaryArchSuffix
+	devel:libgcrypt$secondaryArchSuffix
+	devel:libgpg_error$secondaryArchSuffix
+	devel:libmicrohttpd$secondaryArchSuffix
+	devel:libqrencode$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 8
+	devel:libsodium$secondaryArchSuffix
+	devel:libQt5Concurrent$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5DBus$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
+	devel:libQt5Test$secondaryArchSuffix
+	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libquazip5$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:g++$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix >= 5
+	cmd:make
+	cmd:qmake$secondaryArchSuffix >= 5
+	cmd:zip
+	"
+
+PATCH()
+{
+	unzip -o $sourceDir/../../additional-files/icons.zip -d $sourceDir/share/icons
+}
+
+BUILD()
+{
+	mkdir -p build ; cd build
+
+	cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \
+		-DCMAKE_INSTALL_DATAROOTDIR=$dataDir \
+		-DKEEPASSXC_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DWITH_XC_NETWORKING=on \
+		-DWITH_XC_SSHAGENT=on \
+		-DWITH_XC_KEESHARE=on \
+		-DWITH_XC_AUTOTYPE=on \
+		-DWITH_XC_DOCS=off \
+		-DWITH_XC_UPDATECHECK=off \
+		-DWITH_TESTS=on \
+		-DCMAKE_CXX_FLAGS="-D_GNU_SOURCE"
+
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+	make install
+
+	mkdir -p $appsDir
+	mv $prefix/bin/keepassxc $appsDir/KeePassXC
+
+	local APP_SIGNATURE="application/x-vnd.qt5-keepassxc"
+	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/keepassxc.rdef.in > keepassxc.rdef
+
+	addResourcesToBinaries keepassxc.rdef $appsDir/KeePassXC
+	addAppDeskbarSymlink $appsDir/KeePassXC
+}
+
+TEST()
+{
+	cd build
+	make test
+}

app-admin/keepassxc/patches/keepassxc-2.6.2.patchset

@@ -0,0 +1,152 @@
+From 6773585b905d736159d28abe7afe395d6447084d Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Mon, 4 Jan 2021 14:27:58 +1000
+Subject: Haiku fixes
+
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0ceccdd..d5de544 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -352,9 +352,9 @@ if(APPLE)
+     endif()
+ endif()
+ if(HAIKU)
+-    target_link_libraries(keepassx_core network)
++    target_link_libraries(keepassx_core Qt5::DBus be network)
+ endif()
+-if(UNIX AND NOT APPLE)
++if(UNIX AND NOT APPLE AND NOT HAIKU)
+     target_link_libraries(keepassx_core Qt5::DBus X11)
+     include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+ endif()
+diff --git a/src/core/Resources.cpp b/src/core/Resources.cpp
+index ae8c0d4..b84a3af 100644
+--- a/src/core/Resources.cpp
++++ b/src/core/Resources.cpp
+@@ -161,7 +161,10 @@ QIcon Resources::icon(const QString& name, bool recolor, const QColor& overrideC
+     // See issue #4963: https://github.com/keepassxreboot/keepassxc/issues/4963
+     // and qt5ct issue #80: https://sourceforge.net/p/qt5ct/tickets/80/
+     QIcon::setThemeName("application");
+-
++#ifdef Q_OS_HAIKU
++    QIcon::setFallbackThemeName("haiku");
++    icon = QIcon::fromTheme(name);
++#else
+     icon = QIcon::fromTheme(name);
+     if (getMainWindow() && recolor) {
+         const QRect rect(0, 0, 48, 48);
+@@ -194,7 +197,7 @@ QIcon Resources::icon(const QString& name, bool recolor, const QColor& overrideC
+         icon.setIsMask(true);
+ #endif
+     }
+-
++#endif
+     if (!overrideColor.isValid()) {
+         m_iconCache.insert(name, icon);
+     }
+diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
+index 0c38970..48a2882 100644
+--- a/src/gui/Application.cpp
++++ b/src/gui/Application.cpp
+@@ -151,6 +151,9 @@ void Application::applyTheme()
+         if (winUtils()->isHighContrastMode()) {
+             appTheme = "classic";
+         }
++#endif
++#ifdef Q_OS_HAIKU
++        appTheme = "classic";
+ #endif
+     }
+ 
+diff --git a/src/gui/osutils/nixutils/NixUtils.cpp b/src/gui/osutils/nixutils/NixUtils.cpp
+index b252458..1168434 100644
+--- a/src/gui/osutils/nixutils/NixUtils.cpp
++++ b/src/gui/osutils/nixutils/NixUtils.cpp
+@@ -27,12 +27,16 @@
+ #include <QStyle>
+ #include <QTextStream>
+ 
++#ifdef __HAIKU__
++#include <InterfaceDefs.h>
++#else
+ #include <qpa/qplatformnativeinterface.h>
+ // namespace required to avoid name clashes with declarations in XKBlib.h
+ namespace X11
+ {
+ #include <X11/XKBlib.h>
+ }
++#endif
+ 
+ QPointer<NixUtils> NixUtils::m_instance = nullptr;
+ 
+@@ -64,6 +68,15 @@ bool NixUtils::isDarkMode() const
+ 
+ QString NixUtils::getAutostartDesktopFilename(bool createDirs) const
+ {
++#ifdef __HAIKU__
++    QDir autostartDir;
++    auto confHome = QStandardPaths::writableLocation(QStandardPaths::HomeLocation);
++    autostartDir.setPath(confHome + QStringLiteral("/config/settings/boot/launch/"));
++    if (createDirs && !autostartDir.exists()) {
++        autostartDir.mkpath(".");
++    }
++    return QFile(autostartDir.absoluteFilePath("keepassxc")).fileName();
++#else
+     QDir autostartDir;
+     auto confHome = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
+     if (confHome.isEmpty()) {
+@@ -76,6 +89,7 @@ QString NixUtils::getAutostartDesktopFilename(bool createDirs) const
+ 
+     return QFile(autostartDir.absoluteFilePath(qApp->property("KPXC_QUALIFIED_APPNAME").toString().append(".desktop")))
+         .fileName();
++#endif
+ }
+ 
+ bool NixUtils::isLaunchAtStartupEnabled() const
+@@ -94,6 +108,13 @@ void NixUtils::setLaunchAtStartup(bool enable)
+         }
+         QTextStream stream(&desktopFile);
+         stream.setCodec("UTF-8");
++#ifdef __HAIKU__
++        stream << QStringLiteral("#!/bin/sh") << '\n'
++               << QApplication::applicationFilePath() << endl;
++        desktopFile.close();
++		desktopFile.setPermissions(QFileDevice::ReadOwner | QFileDevice::ReadGroup | QFileDevice::ReadOther |
++			QFileDevice::WriteOwner | QFileDevice::ExeOwner | QFileDevice::ExeGroup | QFileDevice::ExeOther);
++#else
+         stream << QStringLiteral("[Desktop Entry]") << '\n'
+                << QStringLiteral("Name=") << QApplication::applicationDisplayName() << '\n'
+                << QStringLiteral("GenericName=") << tr("Password Manager") << '\n'
+@@ -109,6 +130,7 @@ void NixUtils::setLaunchAtStartup(bool enable)
+                << QStringLiteral("MimeType=application/x-keepass2;") << '\n'
+                << QStringLiteral("X-GNOME-Autostart-enabled=true") << endl;
+         desktopFile.close();
++#endif
+     } else if (isLaunchAtStartupEnabled()) {
+         QFile::remove(getAutostartDesktopFilename());
+     }
+@@ -116,6 +138,12 @@ void NixUtils::setLaunchAtStartup(bool enable)
+ 
+ bool NixUtils::isCapslockEnabled()
+ {
++#ifdef __HAIKU__
++	key_info keystate;
++	if (get_key_info(&keystate) == B_OK) {
++		return keystate.modifiers & B_SCROLL_LOCK;
++	}
++#else
+     QPlatformNativeInterface* native = QGuiApplication::platformNativeInterface();
+     auto* display = native->nativeResourceForWindow("display", nullptr);
+     if (!display) {
+@@ -131,6 +159,6 @@ bool NixUtils::isCapslockEnabled()
+     }
+ 
+     // TODO: Wayland
+-
++#endif
+     return false;
+ }
+-- 
+2.28.0
+

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

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

app-arch/ancient/ancient-1.0.recipe

@@ -0,0 +1,50 @@
+SUMMARY="Modern decompressor for old data compression formats"
+DESCRIPTION="This is a collection of decompression routines for old formats \
+popular in the Amiga, Atari computers and some other systems from 80's \
+and 90's as well as some that are currently used which were used in a some \
+specific way in these old systems."
+HOMEPAGE="https://github.com/temisu/ancient"
+COPYRIGHT="2017-2020 Teemu Suutari"
+LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/temisu/ancient/archive/v$portVersion.tar.gz"
+CHECKSUM_SHA256="5bb3aa98f9a0936fe7e6bb2eb16b0a84c4b5c6a64434eb51c3d8e6d21589421c"
+SOURCE_DIR="ancient-$portVersion"
+
+ARCHITECTURES="?all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	ancient$secondaryArchSuffix = $portVersion
+	cmd:ancient$commandSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $commandBinDir
+	cp -a ancient$commandSuffix $commandBinDir
+}

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

app-arch/arj/arj-3.10.22.recipe

@@ -2,15 +2,15 @@ SUMMARY="Free and portable clone of the ARJ archiver"
 DESCRIPTION="A portable version of the ARJ archiver, available for \
 a growing number of DOS-like and UNIX-like platforms on a variety o\
 f architectures."
-HOMEPAGE="https://arj.sourceforge.net/"
+HOMEPAGE="http://arj.sourceforge.net/"
 COPYRIGHT="1998-2019 ARJ Software"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://sourceforge.net/projects/arj/files/arj/2.78_3.10%20build%2022/arj-$portVersion.tar.gz"
 CHECKSUM_SHA256="589e4c9bccc8669e7b6d8d6fcd64e01f6a2c21fe10aad56a83304ecc3b96a7db"
 PATCHES="arj-$portVersion.patchset"
 
-ARCHITECTURES="x86 x86_gcc2 x86_64"
+ARCHITECTURES="all"
 
 PROVIDES="
 	$portName = $portVersion

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

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,

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="

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

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

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

app-arch/gcab/gcab-1.3.recipe

@@ -1,105 +0,0 @@
-SUMMARY="Library and tool for working with Microsoft cabinet archives"
-DESCRIPTION="gcab is command line tool that can list, extract and create \
-cabinet (.cab) archives. The Cabinet format is often used on Microsoft Windows \
-but it can also be used on other systems with open source software such as \
-cabextract, lcab and gcab. Unlike cabextract and lcab, which can only list \
-and extract cabinet archives, gcab can also create them.
-gcab also includes a GObject shared library, libgcab, which provides all the \
-functionality available to the command line tool."
-HOMEPAGE="https://wiki.gnome.org/msitools"
-COPYRIGHT="2000-2002 Stuart Caie
-	2002 Patrik Stridvall
-	2003 Greg Turner
-	2012 Marc-André Lureau
-	2017 Richard Hughes"
-LICENSE="GNU LGPL v2.1"
-REVISION="4"
-SOURCE_URI="https://download.gnome.org/sources/gcab/$portVersion/gcab-$portVersion.tar.xz"
-CHECKSUM_SHA256="10304cc8f6b550cf9f53fb3cebfb529c49394e982ef7e66e3fca9776c60a68e7"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandSuffix=
-	commandBinDir=$prefix/bin
-fi
-
-libVersion="0.0.0"
-libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
-
-PROVIDES="
-	gcab$secondaryArchSuffix = $portVersion
-	cmd:gcab$commandSuffix = $portVersion
-	lib:libgcab_1.0$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libglib_2.0$secondaryArchSuffix >= 0.4600.2
-	lib:libintl$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	gcab${secondaryArchSuffix}_devel = $portVersion
-	devel:libgcab_1.0$secondaryArchSuffix = $libVersionCompat
-	"
-REQUIRES_devel="
-	gcab$secondaryArchSuffix == $portVersion base
-	devel:libglib_2.0$secondaryArchSuffix >= 0.4600.2
-	devel:libintl$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libgettextlib$secondaryArchSuffix >= 0.14.1
-	devel:libglib_2.0$secondaryArchSuffix >= 0.4600.2
-	devel:libintl$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:gtkdoc_scan
-	cmd:ld$secondaryArchSuffix
-	cmd:meson
-	cmd:ninja
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-defineDebugInfoPackage gcab$secondaryArchSuffix \
-	"$libDir"/libgcab-1.0.so.$libVersion
-
-BUILD()
-{
-	export CFLAGS=-fno-stack-protector
-	meson build -Dintrospection=false \
-		--buildtype=release --prefix=$prefix \
-		--libdir=$libDir --includedir=$includeDir
-	ninja -C build
-}
-
-INSTALL()
-{
-	ninja -C build install
-
-	mkdir -p $dataDir
-	mv $prefix/share/gtk-doc $dataDir
-	rm -rf $prefix/share
-
-	prepareInstalledDevelLibs \
-		libgcab-1.0
-	fixPkgconfig
-
-	packageEntries devel \
-		$developDir \
-		$dataDir/gtk-doc
-}
-
-TEST()
-{
-	meson test -C build
-}

app-arch/gcab/gcab-1.4.recipe

@@ -0,0 +1,105 @@
+SUMMARY="Library and tool for working with Microsoft cabinet archives"
+DESCRIPTION="gcab is command line tool that can list, extract and create \
+cabinet (.cab) archives. The Cabinet format is often used on Microsoft Windows \
+but it can also be used on other systems with open source software such as \
+cabextract, lcab and gcab. Unlike cabextract and lcab, which can only list \
+and extract cabinet archives, gcab can also create them.
+gcab also includes a GObject shared library, libgcab, which provides all the \
+functionality available to the command line tool."
+HOMEPAGE="https://wiki.gnome.org/msitools"
+COPYRIGHT="2000-2002 Stuart Caie
+	2002 Patrik Stridvall
+	2003 Greg Turner
+	2012 Marc-André Lureau
+	2017 Richard Hughes"
+LICENSE="GNU LGPL v2.1"
+REVISION="1"
+SOURCE_URI="https://download.gnome.org/sources/gcab/$portVersion/gcab-$portVersion.tar.xz"
+CHECKSUM_SHA256="67a5fa9be6c923fbc9197de6332f36f69a33dadc9016a2b207859246711c048f"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+libVersion="0.1.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
+PROVIDES="
+	gcab$secondaryArchSuffix = $portVersion
+	cmd:gcab$commandSuffix = $portVersion
+	lib:libgcab_1.0$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix >= 0.4600.2
+	lib:libintl$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	gcab${secondaryArchSuffix}_devel = $portVersion
+	devel:libgcab_1.0$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	gcab$secondaryArchSuffix == $portVersion base
+	devel:libglib_2.0$secondaryArchSuffix >= 0.4600.2
+	devel:libintl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libgettextlib$secondaryArchSuffix >= 0.14.1
+	devel:libglib_2.0$secondaryArchSuffix >= 0.4600.2
+	devel:libintl$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:gtkdoc_scan
+	cmd:ld$secondaryArchSuffix
+	cmd:meson
+	cmd:ninja
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage gcab$secondaryArchSuffix \
+	"$libDir"/libgcab-1.0.so.$libVersion
+
+BUILD()
+{
+	export CFLAGS=-fno-stack-protector
+	meson build -Dintrospection=false \
+		--buildtype=release --prefix=$prefix \
+		--libdir=$libDir --includedir=$includeDir
+	ninja -C build
+}
+
+INSTALL()
+{
+	ninja -C build install
+
+	mkdir -p $dataDir
+	mv $prefix/share/gtk-doc $dataDir
+	rm -rf $prefix/share
+
+	prepareInstalledDevelLibs \
+		libgcab-1.0
+	fixPkgconfig
+
+	packageEntries devel \
+		$developDir \
+		$dataDir/gtk-doc
+}
+
+TEST()
+{
+	meson test -C build
+}

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

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

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

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

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

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

app-arch/libarchive/libarchive-3.5.0.recipe

@@ -1,108 +0,0 @@
-SUMMARY="C library and tools for working with many archive formats"
-DESCRIPTION="The libarchive library features:
-
-* Support for a variety of archive and compression formats.
-* Robust automatic format detection, including archive/compression \
-combinations such as tar.gz.
-* Zero-copy internal architecture for high performance.
-* Streaming architecture eliminates all limits on size of archive, limits on \
-entry sizes depend on particular formats.
-* Carefully factored code to minimize bloat when programs are statically linked.
-* Growing test suite ? to verify correctness of new ports.
-* Works on most POSIX-like systems
-* Supports Windows, including Cygwin, MinGW, and Visual Studio.
-The bsdtar and bscpio command-line utilities are feature- and \
-performance-competitive with other tar and cpio implementations:
-* Reads a variety of formats, including tar, pax, cpio, zip, xar, lha, ar, \
-cab, mtree, rar, and ISO images.
-* Writes tar, pax, cpio, zip, xar, ar, ISO, mtree, and shar archives
-* Automatically handles archives compressed with gzip, bzip2, lzip, xz, lzma, \
-or compress.
-* Unique format conversion feature."
-HOMEPAGE="http://www.libarchive.org/"
-COPYRIGHT="2003-2013 Tim Kientzle"
-LICENSE="BSD (2-clause)"
-REVISION="1"
-SOURCE_URI="http://www.libarchive.org/downloads/libarchive-$portVersion.tar.gz"
-CHECKSUM_SHA256="fc4bc301188376adc18780d35602454cc8df6396e1b040fbcbb0d4c0469faf54"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandSuffix=$secondaryArchSuffix
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-    commandSuffix=
-    commandBinDir=$prefix/bin
-fi
-
-PROVIDES="
-	libarchive$secondaryArchSuffix = $portVersion compat >= 3.0
-	cmd:bsdcat$commandSuffix = $portVersion compat >= 3.0
-	cmd:bsdcpio$commandSuffix = $portVersion compat >= 3.0
-	cmd:bsdtar$commandSuffix = $portVersion compat >= 3.0
-	lib:libarchive$secondaryArchSuffix = 13.4.2 compat >= 13
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libbz2$secondaryArchSuffix
-	lib:libcrypto$secondaryArchSuffix
-	lib:liblzma$secondaryArchSuffix
-	lib:libssl$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0
-	devel:libarchive$secondaryArchSuffix = 13.4.2 compat >= 13
-	"
-REQUIRES_devel="
-	libarchive$secondaryArchSuffix == $portVersion
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libbz2$secondaryArchSuffix
-	devel:libcrypto$secondaryArchSuffix
-	devel:liblzma$secondaryArchSuffix
-	devel:libssl$secondaryArchSuffix
-	devel:libxml2$secondaryArchSuffix
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:gcc$secondaryArchSuffix
-	cmd:libtoolize
-	cmd:make
-	cmd:pkg_config$secondaryArchSuffix
-	cmd:xml2_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	autoreconf -fi
-	LDFLAGS="-lbsd" CFLAGS="-D_BSD_SOURCE" ac_cv_func_readpassphrase=yes \
-		runConfigure --omit-dirs binDir \
-		./configure --bindir=$commandBinDir
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	rm $libDir/libarchive.la
-
-	prepareInstalledDevelLibs libarchive
-	fixPkgconfig
-	packageEntries devel $developDir $manDir/man3
-}
-
-TEST()
-{
-	make check
-}

app-arch/libarchive/libarchive-3.5.1.recipe

@@ -0,0 +1,108 @@
+SUMMARY="C library and tools for working with many archive formats"
+DESCRIPTION="The libarchive library features:
+
+* Support for a variety of archive and compression formats.
+* Robust automatic format detection, including archive/compression \
+combinations such as tar.gz.
+* Zero-copy internal architecture for high performance.
+* Streaming architecture eliminates all limits on size of archive, limits on \
+entry sizes depend on particular formats.
+* Carefully factored code to minimize bloat when programs are statically linked.
+* Growing test suite ? to verify correctness of new ports.
+* Works on most POSIX-like systems
+* Supports Windows, including Cygwin, MinGW, and Visual Studio.
+The bsdtar and bscpio command-line utilities are feature- and \
+performance-competitive with other tar and cpio implementations:
+* Reads a variety of formats, including tar, pax, cpio, zip, xar, lha, ar, \
+cab, mtree, rar, and ISO images.
+* Writes tar, pax, cpio, zip, xar, ar, ISO, mtree, and shar archives
+* Automatically handles archives compressed with gzip, bzip2, lzip, xz, lzma, \
+or compress.
+* Unique format conversion feature."
+HOMEPAGE="http://www.libarchive.org/"
+COPYRIGHT="2003-2013 Tim Kientzle"
+LICENSE="BSD (2-clause)"
+REVISION="1"
+SOURCE_URI="http://www.libarchive.org/downloads/libarchive-$portVersion.tar.gz"
+CHECKSUM_SHA256="9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+    commandSuffix=
+    commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	libarchive$secondaryArchSuffix = $portVersion compat >= 3.0
+	cmd:bsdcat$commandSuffix = $portVersion compat >= 3.0
+	cmd:bsdcpio$commandSuffix = $portVersion compat >= 3.0
+	cmd:bsdtar$commandSuffix = $portVersion compat >= 3.0
+	lib:libarchive$secondaryArchSuffix = 13.5.1 compat >= 13
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:liblzma$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0
+	devel:libarchive$secondaryArchSuffix = 13.5.1 compat >= 13
+	"
+REQUIRES_devel="
+	libarchive$secondaryArchSuffix == $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libbz2$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
+	devel:liblzma$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:xml2_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	autoreconf -fi
+	LDFLAGS="-lbsd" CFLAGS="-D_BSD_SOURCE" ac_cv_func_readpassphrase=yes \
+		runConfigure --omit-dirs binDir \
+		./configure --bindir=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/libarchive.la
+
+	prepareInstalledDevelLibs libarchive
+	fixPkgconfig
+	packageEntries devel $developDir $manDir/man3
+}
+
+TEST()
+{
+	make check
+}

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="

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="

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"

app-arch/lzip/lzip-1.21.recipe

@@ -1,84 +0,0 @@
-SUMMARY="Lossless data compressor based on the LZMA algorithm"
-DESCRIPTION="Lzip is a lossless data compressor with a user interface \
-similar to the one of gzip or bzip2. Lzip is about as fast as gzip, \
-compresses most files more than bzip2, and is better than both \
-from a data recovery perspective. Lzip is a clean implementation \
-of the LZMA \"algorithm\".
-
-The lzip file format is designed for data sharing and long-term \
-archiving, taking into account both data integrity and decoder \
-availability:
-
-- The lzip format provides very safe integrity checking and some \
-data recovery means. The lziprecover program can repair bit-flip \
-errors (one of the most common forms of data corruption) in lzip \
-files, and provides data recovery capabilities, including \
-error-checked merging of damaged copies of a file.
-- The lzip format is as simple as possible (but not simpler). \
-The lzip manual provides the code of a simple decompressor along \
-with a detailed explanation of how it works, so that with the only \
-help of the lzip manual it would be possible for a digital \
-archaeologist to extract the data from a lzip file long after \
-quantum computers eventually render LZMA obsolete.
-- Additionally the lzip reference implementation is copylefted, \
-which guarantees that it will remain free forever."
-HOMEPAGE="http://www.nongnu.org/lzip/lzip.html"
-COPYRIGHT="2008-2018 Antonio Diaz Diaz"
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="https://download.savannah.gnu.org/releases/lzip/lzip-$portVersion.tar.gz"
-CHECKSUM_SHA256="e48b5039d3164d670791f9c5dbaa832bf2df080cb1fbb4f33aa7b3300b670d8b"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-SECONDARY_ARCHITECTURES="x86"
-fi
-
-# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandBinDir=$prefix/bin
-fi
-
-PROVIDES="
-	lzip$secondaryArchSuffix = $portVersion
-	cmd:lzip = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cmp
-	cmd:g++$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	./configure --prefix=$prefix \
-		--bindir=$commandBinDir \
-		--datarootdir=$dataRootDir \
-		--infodir=$infoDir \
-		--mandir=$manDir
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-
-	# Create expander rule
-	mkdir -p $dataDir/expander/rules
-	echo '"application/x-lzip"	.tar.lz	"'$binDir/'lzip -cd %s | tar -tvf -"	"'$binDir/'lzip -cd %s | tar -xvf -"' > $dataDir/expander/rules/lzip
-	echo '"application/x-lzip"	.tlz	"'$binDir/'lzip -cd %s | tar -tvf -"	"'$binDir/'lzip -cd %s | tar -xvf -"' >> $dataDir/expander/rules/lzip
-	echo '"application/x-lzip"	.lz	"echo %s | sed '\''s/.lz$//g'\''"	"'$binDir/'lzip -df %s"' >> $dataDir/expander/rules/lzip
-}
-
-TEST()
-{
-	make check
-}

app-arch/lzip/lzip-1.22.recipe

@@ -0,0 +1,84 @@
+SUMMARY="Lossless data compressor based on the LZMA algorithm"
+DESCRIPTION="Lzip is a lossless data compressor with a user interface \
+similar to the one of gzip or bzip2. Lzip is about as fast as gzip, \
+compresses most files more than bzip2, and is better than both \
+from a data recovery perspective. Lzip is a clean implementation \
+of the LZMA \"algorithm\".
+
+The lzip file format is designed for data sharing and long-term \
+archiving, taking into account both data integrity and decoder \
+availability:
+
+- The lzip format provides very safe integrity checking and some \
+data recovery means. The lziprecover program can repair bit-flip \
+errors (one of the most common forms of data corruption) in lzip \
+files, and provides data recovery capabilities, including \
+error-checked merging of damaged copies of a file.
+- The lzip format is as simple as possible (but not simpler). \
+The lzip manual provides the code of a simple decompressor along \
+with a detailed explanation of how it works, so that with the only \
+help of the lzip manual it would be possible for a digital \
+archaeologist to extract the data from a lzip file long after \
+quantum computers eventually render LZMA obsolete.
+- Additionally the lzip reference implementation is copylefted, \
+which guarantees that it will remain free forever."
+HOMEPAGE="http://www.nongnu.org/lzip/lzip.html"
+COPYRIGHT="2008-2018 Antonio Diaz Diaz"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://download.savannah.gnu.org/releases/lzip/lzip-$portVersion.tar.gz"
+CHECKSUM_SHA256="c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948"
+
+ARCHITECTURES="all !x86_gcc2"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+SECONDARY_ARCHITECTURES="x86"
+fi
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	lzip$secondaryArchSuffix = $portVersion
+	cmd:lzip = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:cmp
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	./configure --prefix=$prefix \
+		--bindir=$commandBinDir \
+		--datarootdir=$dataRootDir \
+		--infodir=$infoDir \
+		--mandir=$manDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# Create expander rule
+	mkdir -p $dataDir/expander/rules
+	echo '"application/x-lzip"	.tar.lz	"'$binDir/'lzip -cd %s | tar -tvf -"	"'$binDir/'lzip -cd %s | tar -xvf -"' > $dataDir/expander/rules/lzip
+	echo '"application/x-lzip"	.tlz	"'$binDir/'lzip -cd %s | tar -tvf -"	"'$binDir/'lzip -cd %s | tar -xvf -"' >> $dataDir/expander/rules/lzip
+	echo '"application/x-lzip"	.lz	"echo %s | sed '\''s/.lz$//g'\''"	"'$binDir/'lzip -df %s"' >> $dataDir/expander/rules/lzip
+}
+
+TEST()
+{
+	make check
+}

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

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="

app-arch/ncompress/ncompress-4.2.4.4.recipe

@@ -19,13 +19,11 @@ SOURCE_URI="http://sourceforge.net/projects/ncompress/files/ncompress-4.2.4.4.ta
 CHECKSUM_SHA256="b00ba28d3f332b38aa75478a15c1b789957aa6c02d6453471f452c0ec3e6517a"
 PATCHES="ncompress-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="all"
 
 PROVIDES="
 	ncompress = $portVersion
 	cmd:compress
-	cmd:zcat
-	cmd:zmore
 	"
 REQUIRES="
 	haiku
@@ -41,6 +39,10 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:sh
 	"
+TEST_REQUIRES="
+	cmd:cmp
+	cmd:find
+	"
 
 BUILD()
 {
@@ -49,7 +51,9 @@ BUILD()
 
 INSTALL()
 {
+	mkdir -p $binDir $manDir
 	echo -e "1\n$binDir\n$manDir\n7\n-DNOFUNCDEF=1\ni\n\n\nq"|sh build
+	rm $binDir/z* $binDir/uncompress $manDir/z*
 }
 
 TEST()

app-arch/ncompress/patches/ncompress-4.2.4.4.patchset

@@ -1,4 +1,4 @@
-From a5cc6167a1fc7195f43828613970826658fc35f8 Mon Sep 17 00:00:00 2001
+From a301cb8be4e889b6020972697dde1be115fadf81 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@gmail.com>
 Date: Tue, 14 Oct 2014 14:42:10 +0200
 Subject: Make build script work on haiku
@@ -109,5 +109,31 @@ index 647373d..d00cbf9 100755
  				:
  			else
 -- 
-1.8.3.4
+2.30.0
+
+
+From a331882984444e1e0d9b3fe73568b592594020b4 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sun, 17 Jan 2021 12:01:21 +0100
+Subject: install symbolic links
+
+
+diff --git a/build b/build
+index d00cbf9..b054c59 100755
+--- a/build
++++ b/build
+@@ -711,9 +711,9 @@ do
+ 			cp compress ${BINDIR}/compress || exit 1
+ 			strip ${BINDIR}/compress
+ 			rm -f ${BINDIR}/uncompress || exit 1
+-			ln ${BINDIR}/compress ${BINDIR}/uncompress || exit 1
++			ln -sr ${BINDIR}/compress ${BINDIR}/uncompress || exit 1
+ 			rm -f  ${BINDIR}/zcat || exit 1
+-			ln -f ${BINDIR}/compress ${BINDIR}/zcat || exit 1
++			ln -fsr ${BINDIR}/compress ${BINDIR}/zcat || exit 1
+ 			cp zcmp zdiff zmore ${BINDIR}/. || exit 1
+ 			chmod 0755 ${BINDIR}/compress ${BINDIR}/zcmp ${BINDIR}/zdiff \
+                    	${BINDIR}/zmore || exit 1
+-- 
+2.30.0
 

app-arch/p7zip/p7zip-16.02.recipe

@@ -1,49 +0,0 @@
-SUMMARY="7-zip file compression program"
-DESCRIPTION="
-p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, \
-OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
-HOMEPAGE="http://p7zip.sourceforge.net"
-COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
-LICENSE="GNU LGPL v2.1"
-REVISION="1"
-SOURCE_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/$portVersion/p7zip_${portVersion}_src_all.tar.bz2"
-CHECKSUM_SHA256="5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f"
-SOURCE_DIR="p7zip_$portVersion"
-PATCHES="p7zip-$portVersion.patchset"
-ADDITIONAL_FILES="p7zip-expander-rules"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PROVIDES="
-	p7zip = $portVersion
-	cmd:7za = $portVersion compat >= 9
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	"
-
-BUILD()
-{
-	cp makefile.haiku makefile.machine
-	make
-}
-
-INSTALL()
-{
-	make install DEST_DIR="" DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \
-		DEST_MAN=$manDir
-
-	expanderRulesDir=$dataDir/expander/rules
-	mkdir -p $expanderRulesDir
-	cp "$portDir/additional-files/p7zip-expander-rules" \
-		"$expanderRulesDir/p7zip"
-}

app-arch/p7zip/p7zip-17.04.recipe

@@ -0,0 +1,59 @@
+SUMMARY="7-zip file compression program"
+DESCRIPTION="
+p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, \
+OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
+HOMEPAGE="http://p7zip.sourceforge.net"
+COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
+LICENSE="GNU LGPL v2.1"
+REVISION="2"
+SOURCE_URI="https://github.com/jinfeihan57/p7zip/archive/v$portVersion/p7zip-$portVersion.tar.gz"
+CHECKSUM_SHA256="ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef"
+PATCHES="p7zip-$portVersion.patchset"
+ADDITIONAL_FILES="p7zip-expander-rules"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	p7zip$secondaryArchSuffix = $portVersion
+	cmd:7z = $portVersion compat >= 17
+	cmd:7za = $portVersion compat >= 9
+	cmd:7zr = $portVersion compat >= 17
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	REPLACES="
+		p7zip
+		"
+fi
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	cp makefile.haiku makefile.machine
+	make $jobArgs 7z 7zr 7za
+}
+
+INSTALL()
+{
+	make install DEST_DIR="" DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \
+		DEST_MAN=$manDir
+
+	expanderRulesDir=$dataDir/expander/rules
+	mkdir -p $expanderRulesDir
+	cp "$portDir/additional-files/p7zip-expander-rules" \
+		"$expanderRulesDir/p7zip"
+}

app-arch/p7zip/patches/p7zip-16.02.patchset

@@ -1,54 +0,0 @@
-From 1efb55bb4d6997f5ea85a873c5cae442eb77df73 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sun, 14 Feb 2016 10:08:25 +0100
-Subject: applying patch p7zip-9.20.1.patch
-
-
-diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
-index 322fce2..69a9f43 100644
---- a/CPP/Windows/System.cpp
-+++ b/CPP/Windows/System.cpp
-@@ -15,7 +15,7 @@
- #include <sys/sysinfo.h>
- #endif
- 
--#if defined(ENV_BEOS)
-+#if defined(ENV_BEOS) || defined(ENV_HAIKU)
- #include <be/kernel/OS.h>
- #endif
- 
-@@ -79,7 +79,7 @@ namespace NWindows
- 			if (nbcpu < 1) nbcpu = 1;
- 			return nbcpu;
- 		}
--		#elif defined(ENV_BEOS)
-+		#elif defined(ENV_BEOS) || defined(ENV_HAIKU)
- 		UInt32 GetNumberOfProcessors() {
- 			system_info info;
- 			get_system_info(&info);
--- 
-2.24.0
-
-
-From 2dd149a5be8a9b67f5be5bc840759777881436b3 Mon Sep 17 00:00:00 2001
-From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Sun, 14 Feb 2016 10:15:58 +0100
-Subject: Fix detection of RAM size.
-
-
-diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
-index 69a9f43..5b4e0d9 100644
---- a/CPP/Windows/System.cpp
-+++ b/CPP/Windows/System.cpp
-@@ -154,7 +154,7 @@ namespace NWindows
- 			if ( pstat( PSTAT_STATIC, pu, (size_t)sizeof(pst), (size_t)0, 0 ) != -1 ) {
- 				size = ((UInt64)pst.physical_memory)*pst.page_size;
- 			}
--#elif defined(ENV_BEOS)
-+#elif defined(ENV_BEOS) || defined(ENV_HAIKU)
- 			system_info info;
- 			get_system_info(&info);
- 			size = info.max_pages;
--- 
-2.24.0
-

app-arch/p7zip/patches/p7zip-17.04.patchset

@@ -0,0 +1,195 @@
+From b0f81cbba1b9014d4770841c124683de9aa20268 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 14 Feb 2016 10:08:25 +0100
+Subject: applying patch p7zip-9.20.1.patch
+
+
+diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
+index 322fce2..69a9f43 100644
+--- a/CPP/Windows/System.cpp
++++ b/CPP/Windows/System.cpp
+@@ -15,7 +15,7 @@
+ #include <sys/sysinfo.h>
+ #endif
+ 
+-#if defined(ENV_BEOS)
++#if defined(ENV_BEOS) || defined(ENV_HAIKU)
+ #include <be/kernel/OS.h>
+ #endif
+ 
+@@ -79,7 +79,7 @@ namespace NWindows
+ 			if (nbcpu < 1) nbcpu = 1;
+ 			return nbcpu;
+ 		}
+-		#elif defined(ENV_BEOS)
++		#elif defined(ENV_BEOS) || defined(ENV_HAIKU)
+ 		UInt32 GetNumberOfProcessors() {
+ 			system_info info;
+ 			get_system_info(&info);
+-- 
+2.30.0
+
+
+From 3371112ba4216088da75d9219c418496f4dfa9d8 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sun, 14 Feb 2016 10:15:58 +0100
+Subject: Fix detection of RAM size.
+
+
+diff --git a/CPP/Windows/System.cpp b/CPP/Windows/System.cpp
+index 69a9f43..5b4e0d9 100644
+--- a/CPP/Windows/System.cpp
++++ b/CPP/Windows/System.cpp
+@@ -154,7 +154,7 @@ namespace NWindows
+ 			if ( pstat( PSTAT_STATIC, pu, (size_t)sizeof(pst), (size_t)0, 0 ) != -1 ) {
+ 				size = ((UInt64)pst.physical_memory)*pst.page_size;
+ 			}
+-#elif defined(ENV_BEOS)
++#elif defined(ENV_BEOS) || defined(ENV_HAIKU)
+ 			system_info info;
+ 			get_system_info(&info);
+ 			size = info.max_pages;
+-- 
+2.30.0
+
+
+From cf62c205d25d73372f92625068e873bbf4362c9a Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 4 Jan 2021 12:29:26 +0100
+Subject: haiku: uses libiconv
+
+
+diff --git a/makefile.haiku b/makefile.haiku
+index a6e71c2..99d781a 100644
+--- a/makefile.haiku
++++ b/makefile.haiku
+@@ -11,7 +11,7 @@ CXX=g++
+ CC=gcc
+ LINK_SHARED=-nostart
+ 
+-LOCAL_LIBS=-lbe
++LOCAL_LIBS=-lbe -liconv
+ LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+ 
+ OBJ_CRC32=$(OBJ_CRC32_C)
+-- 
+2.30.0
+
+
+From 78d3cc427e57013ae6cc047c885c430a09304142 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Thu, 15 Apr 2021 18:54:32 +0200
+Subject: Haiku: fix 7z and 7zr build on x86_64
+
+
+diff --git a/C/hashes/hash.h b/C/hashes/hash.h
+index 3abf275..e3074ef 100644
+--- a/C/hashes/hash.h
++++ b/C/hashes/hash.h
+@@ -39,6 +39,11 @@
+ #define __hash_h__
+ 
+ #include <string.h>
++#ifdef __HAIKU__
++#include <stdint.h>
++#define _UINT32_T_DECLARED
++#define _UINT64_T_DECLARED
++#endif
+ 
+ #include "../7zTypes.h"
+ 
+diff --git a/CPP/Windows/DLL.cpp b/CPP/Windows/DLL.cpp
+index 744af1f..796c7b4 100644
+--- a/CPP/Windows/DLL.cpp
++++ b/CPP/Windows/DLL.cpp
+@@ -37,7 +37,7 @@ TRACEN((printf("CLibrary::Free(this=%p,%p)\n",(void *)this,(void *)_module)))
+ #ifdef __APPLE_CC__
+   int ret = NSUnLinkModule ((NSModule)_module, 0);
+ #elif ENV_BEOS
+-  int ret = unload_add_on((image_id)_module);
++  int ret = unload_add_on((image_id)(uintptr_t)_module);
+ #else
+   int ret = dlclose(_module);
+ #endif
+@@ -65,7 +65,7 @@ static FARPROC local_GetProcAddress(HMODULE module,LPCSTR lpProcName)
+       ptr = 0;
+     }
+ #elif ENV_BEOS
+-    if (get_image_symbol((image_id)module, lpProcName, B_SYMBOL_TYPE_TEXT, &ptr) != B_OK)
++    if (get_image_symbol((image_id)(uintptr_t)module, lpProcName, B_SYMBOL_TYPE_TEXT, &ptr) != B_OK)
+       ptr = 0;
+ #else
+     ptr = dlsym (module, lpProcName);
+@@ -122,11 +122,11 @@ bool CLibrary::Load(LPCTSTR lpLibFileName)
+   image_id image = load_add_on(p.Path());
+ TRACEN((printf("load_add_on(%s)=%d\n",p.Path(),(int)image)))
+   if (image < 0) {
+-    err = (image_id)handler;
++    err = (image_id)(uintptr_t)handler;
+     handler = 0;
+   } else {
+     err = 0;
+-    handler = (HMODULE)image;
++    handler = (HMODULE)(uintptr_t)image;
+   }
+ #else
+   int options_dlopen = 0;
+diff --git a/makefile.haiku b/makefile.haiku
+index 99d781a..9321912 100644
+--- a/makefile.haiku
++++ b/makefile.haiku
+@@ -1,7 +1,7 @@
+ 
+ OPTFLAGS=-O -s
+ 
+-ALLFLAGS=${OPTFLAGS} \
++ALLFLAGS=${OPTFLAGS} -pipe \
+ 	-DENV_BEOS -DENV_HAIKU \
+     	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ 	-DNDEBUG -D_REENTRANT -DENV_UNIX \
+@@ -9,7 +9,8 @@ ALLFLAGS=${OPTFLAGS} \
+ 
+ CXX=g++
+ CC=gcc
+-LINK_SHARED=-nostart
++CC_SHARED=-fPIC
++LINK_SHARED=-fPIC -shared
+ 
+ LOCAL_LIBS=-lbe -liconv
+ LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+diff --git a/makefile.machine b/makefile.machine
+index a89b568..d7169cd 100644
+--- a/makefile.machine
++++ b/makefile.machine
+@@ -1,14 +1,11 @@
+-#
+-# makefile for Linux (x86, PPC, alpha ...)
+-#
+ 
+-OPTFLAGS=-O2 -s
+-#OPTFLAGS=-O0 -ggdb
++OPTFLAGS=-O -s
+ 
+ ALLFLAGS=${OPTFLAGS} -pipe \
++	-DENV_BEOS -DENV_HAIKU \
+     	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \
+ 	-DNDEBUG -D_REENTRANT -DENV_UNIX \
+-	-D_7ZIP_LARGE_PAGES \
++	-D_UINT64_T_DECLARED \
+ 	$(LOCAL_FLAGS)
+ 
+ CXX=g++
+@@ -16,8 +13,8 @@ CC=gcc
+ CC_SHARED=-fPIC
+ LINK_SHARED=-fPIC -shared
+ 
+-LOCAL_LIBS=-lpthread
+-LOCAL_LIBS_DLL=$(LOCAL_LIBS) -ldl
++LOCAL_LIBS=-lbe -liconv
++LOCAL_LIBS_DLL=$(LOCAL_LIBS)
+ 
+ OBJ_CRC32=$(OBJ_CRC32_C)
+ OBJ_AES=
+-- 
+2.30.0
+

app-arch/pigz/pigz-2.4.recipe

@@ -1,71 +0,0 @@
-SUMMARY="A parallel implementation of gzip for multi-processor machines"
-DESCRIPTION="
-pigz, which stands for Parallel Implementation of GZip, is a fully functional \
-replacement for gzip that exploits multiple processors and multiple cores to \
-the hilt when compressing data.
-
-pigz was written by Mark Adler, and uses the zlib and pthread libraries.
-
-This version of pigz is written to be portable across Unix-style operating \
-systems that provide the zlib and pthread libraries."
-HOMEPAGE="http://www.zlib.net/pigz"
-COPYRIGHT="2008-2013 Mark Adler"
-LICENSE="Zlib"
-REVISION="1"
-SOURCE_URI="http://www.zlib.net/pigz/pigz-$portVersion.tar.gz"
-CHECKSUM_SHA256="a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-SECONDARY_ARCHITECTURES="x86"
-fi
-
-# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
-commandBinDir=$binDir
-if [ "$targetArchitecture" = x86_gcc2 ]; then
-	commandBinDir=$prefix/bin
-fi
-
-PROVIDES="
-	pigz$secondaryArchSuffix = $portVersion
-	cmd:pigz = $portVersion
-	cmd:unpigz = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	devel:libz$secondaryArchSuffix
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc$secondaryArchSuffix
-	cmd:make
-	"
-
-PATCH()
-{
-	sed -i 's/-lm//g' Makefile
-	sed -i 's/-lpthread//g' Makefile
-	sed -i 's/ln -f/ln -sf/g' Makefile
-}
-
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	mkdir -p $commandBinDir
-	cp -af pigz unpigz $commandBinDir
-	mkdir -p $manDir/man1
-	cp -af pigz.1 $manDir/man1
-}
-
-TEST()
-{
-	make test
-}

app-arch/pigz/pigz-2.6.recipe

@@ -0,0 +1,71 @@
+SUMMARY="A parallel implementation of gzip for multi-processor machines"
+DESCRIPTION="
+pigz, which stands for Parallel Implementation of GZip, is a fully functional \
+replacement for gzip that exploits multiple processors and multiple cores to \
+the hilt when compressing data.
+
+pigz was written by Mark Adler, and uses the zlib and pthread libraries.
+
+This version of pigz is written to be portable across Unix-style operating \
+systems that provide the zlib and pthread libraries."
+HOMEPAGE="http://www.zlib.net/pigz"
+COPYRIGHT="2008-2013 Mark Adler"
+LICENSE="Zlib"
+REVISION="1"
+SOURCE_URI="http://www.zlib.net/pigz/pigz-$portVersion.tar.gz"
+CHECKSUM_SHA256="2eed7b0d7449d1d70903f2a62cd6005d262eb3a8c9e98687bc8cbb5809db2a7d"
+
+ARCHITECTURES="all !x86_gcc2"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+SECONDARY_ARCHITECTURES="x86"
+fi
+
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	pigz$secondaryArchSuffix = $portVersion
+	cmd:pigz = $portVersion
+	cmd:unpigz = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+PATCH()
+{
+	sed -i 's/-lm//g' Makefile
+	sed -i 's/-lpthread//g' Makefile
+	sed -i 's/ln -f/ln -sf/g' Makefile
+}
+
+BUILD()
+{
+	make
+}
+
+INSTALL()
+{
+	mkdir -p $commandBinDir
+	cp -af pigz unpigz $commandBinDir
+	mkdir -p $manDir/man1
+	cp -af pigz.1 $manDir/man1
+}
+
+TEST()
+{
+	make test
+}

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="

app-arch/snappy/snappy-1.1.7.recipe

@@ -1,80 +0,0 @@
-SUMMARY="A fast compressor/decompressor"
-DESCRIPTION="Snappy is a compression/decompression library. It does not aim \
-for maximum compression, or compatibility with any other compression library; \
-instead, it aims for very high speeds and reasonable compression. For instance, \
-compared to the fastest mode of zlib, Snappy is an order of magnitude faster \
-for most inputs, but the resulting compressed files are anywhere from 20% to \
-100% bigger."
-HOMEPAGE="https://google.github.io/snappy/"
-COPYRIGHT="2005-2017 Google Inc"
-LICENSE="BSD (3-clause)"
-REVISION="2"
-SOURCE_URI="https://github.com/google/snappy/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4"
-
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
-PROVIDES="
-	snappy$secondaryArchSuffix = $portVersion compat >= 1
-	lib:libsnappy$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-PROVIDES_devel="
-	snappy${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libsnappy$secondaryArchSuffix = $portVersion compat >= 1
-	"
-REQUIRES_devel="
-	snappy$secondaryArchSuffix == $portVersion base
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cmake
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:make
-	"
-
-BUILD()
-{
-	mkdir -p build && cd build
-	cmake .. $cmakeDirArgs -DBUILD_SHARED_LIBS=ON
-	make $jobArgs
-}
-
-INSTALL()
-{
-	cd build
-	make install
-
-	prepareInstalledDevelLib libsnappy
-
-	mkdir -p $developLibDir/pkgconfig
-	cat > $developLibDir/pkgconfig/snappy.pc << EOF
-prefix=${prefix}
-exec_prefix=${prefix}
-libdir=${libDir}
-includedir=${includeDir}
-
-Name: snappy
-Description: A fast compression/decompression library
-Version: $portVersion
-Libs: -L${developLibDir} -lsnappy
-Cflags: -I${includedir}
-EOF
-
-	packageEntries devel \
-		$developDir \
-		$libDir/cmake
-}
-
-TEST()
-{
-	build/snappy_unittest
-}

app-arch/snappy/snappy-1.1.8.recipe

@@ -0,0 +1,80 @@
+SUMMARY="A fast compressor/decompressor"
+DESCRIPTION="Snappy is a compression/decompression library. It does not aim \
+for maximum compression, or compatibility with any other compression library; \
+instead, it aims for very high speeds and reasonable compression. For instance, \
+compared to the fastest mode of zlib, Snappy is an order of magnitude faster \
+for most inputs, but the resulting compressed files are anywhere from 20% to \
+100% bigger."
+HOMEPAGE="https://google.github.io/snappy/"
+COPYRIGHT="2005-2017 Google Inc"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://github.com/google/snappy/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	snappy$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libsnappy$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	snappy${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libsnappy$secondaryArchSuffix = $portVersion compat >= 1
+	"
+REQUIRES_devel="
+	snappy$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:cmake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	mkdir -p build && cd build
+	cmake .. $cmakeDirArgs -DBUILD_SHARED_LIBS=ON
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd build
+	make install
+
+	prepareInstalledDevelLib libsnappy
+
+	mkdir -p $developLibDir/pkgconfig
+	cat > $developLibDir/pkgconfig/snappy.pc << EOF
+prefix=${prefix}
+exec_prefix=${prefix}
+libdir=${libDir}
+includedir=${includeDir}
+
+Name: snappy
+Description: A fast compression/decompression library
+Version: $portVersion
+Libs: -L${developLibDir} -lsnappy
+Cflags: -I${includedir}
+EOF
+
+	packageEntries devel \
+		$developDir \
+		$libDir/cmake
+}
+
+TEST()
+{
+	build/snappy_unittest
+}

app-arch/tar/patches/tar-1.32.patchset

@@ -1,120 +0,0 @@
-From 25395e3fa0b01a898b6e6ae456c8eef3c66849f1 Mon Sep 17 00:00:00 2001
-From: Jonathan Schleifer <js@webkeks.org>
-Date: Thu, 20 Mar 2014 14:52:58 +0100
-Subject: Implement replace-hardlinks option
-
-
-diff --git a/src/common.h b/src/common.h
-index 501e0d3..60e1ff4 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -197,6 +197,8 @@ GLOBAL enum old_files old_files_option;
- 
- GLOBAL bool keep_directory_symlink_option;
- 
-+GLOBAL bool simulate_hardlinks_option;
-+
- /* Specified file name for incremental list.  */
- GLOBAL const char *listed_incremental_option;
- /* Incremental dump level */
-diff --git a/src/extract.c b/src/extract.c
-index 8276f8f..da0962d 100644
---- a/src/extract.c
-+++ b/src/extract.c
-@@ -32,6 +32,8 @@ static bool we_are_root;	/* true if our effective uid == 0 */
- static mode_t newdir_umask;	/* umask when creating new directories */
- static mode_t current_umask;	/* current umask (which is set to 0 if -p) */
- 
-+static int extract_symlink (char *, int);
-+
- #define ALL_MODE_BITS ((mode_t) ~ (mode_t) 0)
- 
- #if ! HAVE_FCHMOD && ! defined fchmod
-@@ -1336,6 +1338,38 @@ extract_link (char *file_name, int typeflag)
-   char const *link_name;
-   int rc;
- 
-+  if (simulate_hardlinks_option)
-+  {
-+	/* symlinks have to be normalized */
-+	const char* f = file_name;
-+	const char* l = current_stat_info.link_name;
-+	int sep_pos = 0;
-+	int p_count = 0;
-+	char *link_name = (char*) xmalloc(strlen(current_stat_info.link_name) * 2);
-+
-+   for (; *f && *l; f++, l++)
-+	{
-+	  if (*f != *l)
-+		  break;
-+	  if (*f == DIRECTORY_SEPARATOR)
-+		  sep_pos = f - file_name;
-+	}
-+
-+	for (p_count = 0; *f; f++)
-+	  if (*f == DIRECTORY_SEPARATOR)
-+	    p_count++;
-+
-+	link_name[0] = '\0';
-+	while (p_count--)
-+	  strcat(link_name, "../");
-+
-+	strcat(link_name, &current_stat_info.link_name[sep_pos + 1]);
-+	free(current_stat_info.link_name);
-+	current_stat_info.link_name = link_name;
-+
-+	return extract_symlink(file_name, typeflag);
-+  }
-+
-   link_name = current_stat_info.link_name;
- 
-   if (! absolute_names_option && contains_dot_dot (link_name))
-@@ -1425,6 +1459,13 @@ extract_symlink (char *file_name, int typeflag)
- #else
-   static int warned_once;
- 
-+  /* recursion is not welcomed here */
-+  if (simulate_hardlinks_option && typeflag == LINKTYPE)
-+  {
-+	link_error (current_stat_info.link_name, file_name);
-+	return -1;
-+  }
-+
-   if (!warned_once)
-     {
-       warned_once = 1;
-diff --git a/src/tar.c b/src/tar.c
-index d66fed8..23027d2 100644
---- a/src/tar.c
-+++ b/src/tar.c
-@@ -449,6 +449,8 @@ static struct argp_option options[] = {
-   {"check-device", CHECK_DEVICE_OPTION, NULL, 0,
-    N_("check device numbers when creating incremental archives (default)"),
-    GRID+1 },
-+  {"replace-hardlinks", 'Q', 0, 0,
-+   N_("replace hardlinks with corresponding symlink when extracting"), GRID+1 },
- #undef GRID
- 
- #define GRID 30
-@@ -1728,6 +1730,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
-       set_archive_format (arg);
-       break;
- 
-+    case 'Q':
-+      simulate_hardlinks_option = true;
-+      break;
-+
-     case INDEX_FILE_OPTION:
-       index_file_name = arg;
-       break;
-@@ -2245,6 +2251,7 @@ decode_options (int argc, char **argv)
-   unquote_option = true;
-   tar_sparse_major = 1;
-   tar_sparse_minor = 0;
-+  simulate_hardlinks_option = false;
- 
-   savedir_sort_order = SAVEDIR_SORT_NONE;
- 
--- 
-2.28.0
-

app-arch/tar/patches/tar-1.34.patchset

@@ -0,0 +1,123 @@
+From a691dbde5db1ae1cb1c000be7e399e95737b061a Mon Sep 17 00:00:00 2001
+From: Jonathan Schleifer <js@webkeks.org>
+Date: Thu, 20 Mar 2014 14:52:58 +0100
+Subject: Implement replace-hardlinks option
+
+
+diff --git a/src/common.h b/src/common.h
+index 5d07956..c70608f 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -197,6 +197,8 @@ GLOBAL enum old_files old_files_option;
+ 
+ GLOBAL bool keep_directory_symlink_option;
+ 
++GLOBAL bool simulate_hardlinks_option;
++
+ /* Specified file name for incremental list.  */
+ GLOBAL const char *listed_incremental_option;
+ /* Incremental dump level */
+diff --git a/src/extract.c b/src/extract.c
+index d6d98cb..f63ee68 100644
+--- a/src/extract.c
++++ b/src/extract.c
+@@ -32,6 +32,8 @@ static bool we_are_root;	/* true if our effective uid == 0 */
+ static mode_t newdir_umask;	/* umask when creating new directories */
+ static mode_t current_umask;	/* current umask (which is set to 0 if -p) */
+ 
++static int extract_symlink (char *, int);
++
+ #define ALL_MODE_BITS ((mode_t) ~ (mode_t) 0)
+ 
+ #if ! HAVE_FCHMOD && ! defined fchmod
+@@ -1458,7 +1460,39 @@ extract_link (char *file_name, int typeflag)
+   char const *link_name;
+   int rc;
+   struct delayed_link *dl;
+-  
++
++	if (simulate_hardlinks_option)
++	{
++	/* symlinks have to be normalized */
++	const char* f = file_name;
++	const char* l = current_stat_info.link_name;
++	int sep_pos = 0;
++	int p_count = 0;
++	char *link_name = (char*) xmalloc(strlen(current_stat_info.link_name) * 2);
++
++	for (; *f && *l; f++, l++)
++	{
++	  if (*f != *l)
++		  break;
++	  if (*f == DIRECTORY_SEPARATOR)
++		  sep_pos = f - file_name;
++	}
++
++	for (p_count = 0; *f; f++)
++	  if (*f == DIRECTORY_SEPARATOR)
++	    p_count++;
++
++	link_name[0] = '\0';
++	while (p_count--)
++	  strcat(link_name, "../");
++
++	strcat(link_name, &current_stat_info.link_name[sep_pos + 1]);
++	free(current_stat_info.link_name);
++	current_stat_info.link_name = link_name;
++
++	return extract_symlink(file_name, typeflag);
++  }
++
+   link_name = current_stat_info.link_name;
+ 
+   if (! absolute_names_option && contains_dot_dot (link_name))
+@@ -1551,6 +1585,13 @@ extract_symlink (char *file_name, int typeflag)
+ #else
+   static int warned_once;
+ 
++  /* recursion is not welcomed here */
++  if (simulate_hardlinks_option && typeflag == LINKTYPE)
++  {
++	link_error (current_stat_info.link_name, file_name);
++	return -1;
++  }
++
+   if (!warned_once)
+     {
+       warned_once = 1;
+diff --git a/src/tar.c b/src/tar.c
+index 728e38b..21098df 100644
+--- a/src/tar.c
++++ b/src/tar.c
+@@ -501,6 +501,9 @@ static struct argp_option options[] = {
+   {"check-device", CHECK_DEVICE_OPTION, NULL, 0,
+    N_("check device numbers when creating incremental archives (default)"),
+    GRID_MODIFIER },
++  {"replace-hardlinks", 'Q', 0, 0,
++   N_("replace hardlinks with corresponding symlink when extracting"),
++   GRID_MODIFIER },
+ 
+   {NULL, 0, NULL, 0,
+    N_("Overwrite control:"), GRH_OVERWRITE },
+@@ -1837,6 +1840,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
+       set_archive_format (arg);
+       break;
+ 
++    case 'Q':
++      simulate_hardlinks_option = true;
++      break;
++
+     case INDEX_FILE_OPTION:
+       index_file_name = arg;
+       break;
+@@ -2288,6 +2295,7 @@ decode_options (int argc, char **argv)
+   unquote_option = true;
+   tar_sparse_major = 1;
+   tar_sparse_minor = 0;
++  simulate_hardlinks_option = false;
+ 
+   savedir_sort_order = SAVEDIR_SORT_NONE;
+ 
+-- 
+2.30.0
+

app-arch/tar/tar-1.32.recipe

@@ -1,82 +0,0 @@
-SUMMARY="Saves and restores files to/from a tape or disk archive"
-DESCRIPTION="The Tar program provides the ability to create tar archives, as \
-well as various other kinds of manipulation. For example, you can use Tar on \
-previously created archives to extract files, to store additional files, or \
-to update or list files which were already stored.
-
-Initially, tar archives were used to store files conveniently on magnetic \
-tape. The name \"Tar\" comes from this use; it stands for tape archiver. Despite \
-the utility's name, Tar can direct its output to available devices, files, or \
-other programs (using pipes), it can even access remote devices or files (as \
-archives)."
-HOMEPAGE="https://www.gnu.org/software/tar/"
-COPYRIGHT="1990-2018 Free Software Foundation, Inc."
-LICENSE="GNU GPL v3"
-REVISION="2"
-SOURCE_URI="https://ftpmirror.gnu.org/tar/tar-$portVersion.tar.bz2
-	https://ftp.gnu.org/gnu/tar/tar-$portVersion.tar.bz2"
-CHECKSUM_SHA256="e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566"
-PATCHES="tar-$portVersion.patchset"
-if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-	PATCHES+="
-		tar-$portVersion-gcc2.patchset
-		"
-fi
-
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-
-PROVIDES="
-	tar = $portVersion compat >= 1
-	cmd:tar = $portVersion compat >= 1
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:automake
-	cmd:autoreconf
-	cmd:gcc
-	cmd:ld
-	cmd:make
-	cmd:sed
-	"
-
-TEST_REQUIRES="
-	cmd:bzip2
-	cmd:compress
-	cmd:find
-	cmd:gzip
-	"
-if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-TEST_REQUIRES+="
-	cmd:lzip
-	cmd:lzma
-	cmd:xz
-	"
-fi
-
-defineDebugInfoPackage tar $binDir/tar
-
-BUILD()
-{
-	runConfigure ./configure \
-		--disable-nls \
-		--disable-gcc-warnings \
-		LDFLAGS="-lnetwork" CFLAGS="-D_BSD_SOURCE" \
-		FORCE_UNSAFE_CONFIGURE=1
-	make $jobArgs YACC=:
-}
-
-INSTALL()
-{
-	make install
-}
-
-TEST()
-{
-	make check
-}

app-arch/tar/tar-1.34.recipe

@@ -0,0 +1,92 @@
+SUMMARY="Saves and restores files to/from a tape or disk archive"
+DESCRIPTION="The Tar program provides the ability to create tar archives, as \
+well as various other kinds of manipulation. For example, you can use Tar on \
+previously created archives to extract files, to store additional files, or \
+to update or list files which were already stored.
+
+Initially, tar archives were used to store files conveniently on magnetic \
+tape. The name \"Tar\" comes from this use; it stands for tape archiver. Despite \
+the utility's name, Tar can direct its output to available devices, files, or \
+other programs (using pipes), it can even access remote devices or files (as \
+archives)."
+HOMEPAGE="https://www.gnu.org/software/tar/"
+COPYRIGHT="1990-2018 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://ftpmirror.gnu.org/tar/tar-$portVersion.tar.bz2
+	https://ftp.gnu.org/gnu/tar/tar-$portVersion.tar.bz2"
+CHECKSUM_SHA256="b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff"
+PATCHES="tar-$portVersion.patchset"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	tar$secondaryArchSuffix = $portVersion compat >= 1
+	cmd:tar$commandSuffix = $portVersion compat >= 1
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	REPLACES="
+		tar
+		"
+fi
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:automake
+	cmd:autoreconf
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	"
+
+TEST_REQUIRES="
+	cmd:bzip2
+	cmd:compress
+	cmd:find
+	cmd:gzip
+	"
+if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
+TEST_REQUIRES+="
+	cmd:lzip
+	cmd:lzma
+	cmd:xz
+	"
+fi
+
+defineDebugInfoPackage tar$secondaryArchSuffix $commandBinDir/tar
+
+BUILD()
+{
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir \
+		--disable-nls \
+		--disable-gcc-warnings \
+		LDFLAGS="-lnetwork" CFLAGS="-D_BSD_SOURCE" \
+		FORCE_UNSAFE_CONFIGURE=1
+	make $jobArgs YACC=:
+}
+
+INSTALL()
+{
+	make install
+}
+
+TEST()
+{
+#x86_64
+#testsuite: 23 24 25 55 98 100 105 106 110 111 113 116 121 124 127 128 133 134 135 138 142 143 155 157 184 failed
+	make check
+}

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="

app-arch/unrar/additional-files/unrar.rdef

@@ -9,5 +9,5 @@ resource app_version {
 	variety = 0,
 	internal = 0,
 	short_info = "UnRAR",
-	long_info = "UnRAR ©1993-2018 Alexander Roshal"
+	long_info = "UnRAR ©1993-2021 Alexander Roshal"
 };

app-arch/unrar/patches/unrar-5.6.8.patchset

@@ -1,21 +0,0 @@
-From 1c19dea55d375f6968ce54a51ab42958347726a8 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Mon, 12 May 2014 18:07:44 +0000
-Subject: initial Haiku patch
-
-
-diff --git a/archive.hpp b/archive.hpp
-index fd33ac3..787977b 100644
---- a/archive.hpp
-+++ b/archive.hpp
-@@ -67,7 +67,6 @@ class Archive:public File
-     size_t SearchSubBlock(const wchar *Type);
-     size_t SearchRR();
-     void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);
--    void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}
-     size_t ReadHeader();
-     void CheckArc(bool EnableBroken);
-     void CheckOpen(const wchar *Name);
--- 
-2.16.2
-

app-arch/unrar/patches/unrar-5.7.3.patchset

@@ -1,21 +0,0 @@
-From 1c19dea55d375f6968ce54a51ab42958347726a8 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Mon, 12 May 2014 18:07:44 +0000
-Subject: initial Haiku patch
-
-
-diff --git a/archive.hpp b/archive.hpp
-index fd33ac3..787977b 100644
---- a/archive.hpp
-+++ b/archive.hpp
-@@ -67,7 +67,6 @@ class Archive:public File
-     size_t SearchSubBlock(const wchar *Type);
-     size_t SearchRR();
-     void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);
--    void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}
-     size_t ReadHeader();
-     void CheckArc(bool EnableBroken);
-     void CheckOpen(const wchar *Name);
--- 
-2.16.2
-

app-arch/unrar/patches/unrar-5.8.3.patchset

@@ -1,21 +0,0 @@
-From 1c19dea55d375f6968ce54a51ab42958347726a8 Mon Sep 17 00:00:00 2001
-From: Jerome Duval <jerome.duval@gmail.com>
-Date: Mon, 12 May 2014 18:07:44 +0000
-Subject: initial Haiku patch
-
-
-diff --git a/archive.hpp b/archive.hpp
-index fd33ac3..787977b 100644
---- a/archive.hpp
-+++ b/archive.hpp
-@@ -67,7 +67,6 @@ class Archive:public File
-     size_t SearchSubBlock(const wchar *Type);
-     size_t SearchRR();
-     void WriteBlock(HEADER_TYPE HeaderType,BaseBlock *wb=NULL,bool OnlySetSize=false,bool NonFinalWrite=false);
--    void SetBlockSize(HEADER_TYPE HeaderType,BaseBlock *wb=NULL) {WriteBlock(HeaderType,wb,true);}
-     size_t ReadHeader();
-     void CheckArc(bool EnableBroken);
-     void CheckOpen(const wchar *Name);
--- 
-2.16.2
-

app-arch/unrar/unrar-5.6.8.recipe

@@ -1,112 +0,0 @@
-SUMMARY="Uncompress rar files"
-DESCRIPTION="UnRAR decompresses rar files. It is a powerful archive manager \
-that can backup your data and reduce the size of email attachments. UnRAR can \
-decompress the following file formats:
-- RAR
-- ZIP
-- CAB
-- ARJ
-- JZH
-- TAR
-- GZ and TAR.GZ
-- BZ2 and TAR.BZ2
-- ACE
-- UUE
-- JAR (Java Archive)
-- ISO
-- 7Z
-- XZ
-- Z (Unix Compress)"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-COPYRIGHT="1993-2018 Alexander Roshal"
-LICENSE="UnRAR"
-REVISION="1"
-SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
-CHECKSUM_SHA256="a4cc0ac14a354827751912d2af4a0a09e2c2129df5766576fa7e151791dd3dff"
-SOURCE_DIR="unrar"
-PATCHES="unrar-$portVersion.patchset"
-ADDITIONAL_FILES="
-	test.rar
-	unrar.rdef
-	"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PROVIDES="
-	unrar = $portVersion
-	cmd:unrar = $portVersion
-	devel:libunrar = $portVersion
-	lib:libunrar = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cut
-	cmd:g++
-	cmd:make
-	cmd:sed
-	"
-
-PATCH()
-{
-	if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-		sed -i \
-			-e "/^CXXFLAGS=/ s/ -Wno-logical-op-parentheses//;" \
-			-e "/^CXXFLAGS=/ s/ -Wno-dangling-else//;" \
-			makefile
-	fi
-	sed -i -e "/^LDFLAGS=/ d;" makefile
-}
-
-BUILD()
-{
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	sed \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		"$portDir"/additional-files/unrar.rdef > unrar.rdef
-
-	for i in unrar lib sfx; do
-		mkdir -p $i
-		cd $i
-		ln -f -s ../*.cpp ../*.hpp ../makefile .
-		CPPFLAGS="-D_BSD_SOURCE" LDFLAGS="-lbsd" make $i
-		cd ..
-	done
-}
-
-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
-	rm "$libDir"/libunrar.a
-
-	prepareInstalledDevelLib libunrar
-
-	addResourcesToBinaries unrar.rdef "$binDir"/unrar
-	mimeset -f "$binDir"/unrar
-}
-
-TEST()
-{
-	rm -rf dir
-	"$sourceDir"/unrar/unrar x "$portDir"/additional-files/test.rar
-	test "`cat dir/haiku.txt`" = Haiku
-
-	cat sfx/default.sfx "$portDir"/additional-files/test.rar >dir/sfxtest
-	cd dir
-	chmod +x sfxtest
-	./sfxtest
-	test "`cat dir/haiku.txt`" = Haiku
-}

app-arch/unrar/unrar-5.7.3.recipe

@@ -1,112 +0,0 @@
-SUMMARY="Uncompress rar files"
-DESCRIPTION="UnRAR decompresses rar files. It is a powerful archive manager \
-that can backup your data and reduce the size of email attachments. UnRAR can \
-decompress the following file formats:
-- RAR
-- ZIP
-- CAB
-- ARJ
-- JZH
-- TAR
-- GZ and TAR.GZ
-- BZ2 and TAR.BZ2
-- ACE
-- UUE
-- JAR (Java Archive)
-- ISO
-- 7Z
-- XZ
-- Z (Unix Compress)"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-COPYRIGHT="1993-2018 Alexander Roshal"
-LICENSE="UnRAR"
-REVISION="1"
-SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
-CHECKSUM_SHA256="40e856b78374f258d8a1f5f02c02f828c5392a0118c9300fd169a300b520a444"
-SOURCE_DIR="unrar"
-PATCHES="unrar-$portVersion.patchset"
-ADDITIONAL_FILES="
-	test.rar
-	unrar.rdef
-	"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PROVIDES="
-	unrar = $portVersion
-	cmd:unrar = $portVersion
-	devel:libunrar = $portVersion
-	lib:libunrar = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cut
-	cmd:g++
-	cmd:make
-	cmd:sed
-	"
-
-PATCH()
-{
-	if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-		sed -i \
-			-e "/^CXXFLAGS=/ s/ -Wno-logical-op-parentheses//;" \
-			-e "/^CXXFLAGS=/ s/ -Wno-dangling-else//;" \
-			makefile
-	fi
-	sed -i -e "/^LDFLAGS=/ d;" makefile
-}
-
-BUILD()
-{
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	sed \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		"$portDir"/additional-files/unrar.rdef > unrar.rdef
-
-	for i in unrar lib sfx; do
-		mkdir -p $i
-		cd $i
-		ln -f -s ../*.cpp ../*.hpp ../makefile .
-		CPPFLAGS="-D_BSD_SOURCE" LDFLAGS="-lbsd" make $i
-		cd ..
-	done
-}
-
-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
-	rm "$libDir"/libunrar.a
-
-	prepareInstalledDevelLib libunrar
-
-	addResourcesToBinaries unrar.rdef "$binDir"/unrar
-	mimeset -f "$binDir"/unrar
-}
-
-TEST()
-{
-	rm -rf dir
-	"$sourceDir"/unrar/unrar x "$portDir"/additional-files/test.rar
-	test "`cat dir/haiku.txt`" = Haiku
-
-	cat sfx/default.sfx "$portDir"/additional-files/test.rar >dir/sfxtest
-	cd dir
-	chmod +x sfxtest
-	./sfxtest
-	test "`cat dir/haiku.txt`" = Haiku
-}

app-arch/unrar/unrar-5.8.3.recipe

@@ -1,123 +0,0 @@
-SUMMARY="Uncompress rar files"
-DESCRIPTION="UnRAR decompresses rar files. It is a powerful archive manager \
-that can backup your data and reduce the size of email attachments. UnRAR can \
-decompress the following file formats:
-- RAR
-- ZIP
-- CAB
-- ARJ
-- JZH
-- TAR
-- GZ and TAR.GZ
-- BZ2 and TAR.BZ2
-- ACE
-- UUE
-- JAR (Java Archive)
-- ISO
-- 7Z
-- XZ
-- Z (Unix Compress)"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-COPYRIGHT="1993-2018 Alexander Roshal"
-LICENSE="UnRAR"
-REVISION="2"
-SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
-CHECKSUM_SHA256="3591685c8f5bbcb0be09de3d0a0544adb88966b9cccb80986f6cd2b534fd91a6"
-SOURCE_DIR="unrar"
-PATCHES="unrar-$portVersion.patchset"
-ADDITIONAL_FILES="
-	test.rar
-	unrar.rdef
-	"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-
-PROVIDES="
-	unrar = $portVersion
-	cmd:unrar = $portVersion
-	lib:libunrar = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-PROVIDES_devel="
-	unrar = $portVersion
-	devel:libunrar = $portVersion
-	"
-REQUIRES_devel="
-	unrar == $portVersion
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:cut
-	cmd:g++
-	cmd:make
-	cmd:sed
-	"
-
-PATCH()
-{
-	if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-		sed -i \
-			-e "/^CXXFLAGS=/ s/ -Wno-logical-op-parentheses//;" \
-			-e "/^CXXFLAGS=/ s/ -Wno-dangling-else//;" \
-			makefile
-	fi
-	sed -i -e "/^LDFLAGS=/ d;" makefile
-}
-
-BUILD()
-{
-	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
-	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	sed \
-		-e "s|@MAJOR@|$MAJOR|" \
-		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		"$portDir"/additional-files/unrar.rdef > unrar.rdef
-
-	for i in unrar lib sfx; do
-		mkdir -p $i
-		cd $i
-		ln -f -s ../*.cpp ../*.hpp ../makefile .
-		CPPFLAGS="-D_BSD_SOURCE" LDFLAGS="-lbsd" make $i
-		cd ..
-	done
-}
-
-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
-	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
-}
-
-TEST()
-{
-	rm -rf dir
-	"$sourceDir"/unrar/unrar x "$portDir"/additional-files/test.rar
-	test "`cat dir/haiku.txt`" = Haiku
-
-	cat sfx/default.sfx "$portDir"/additional-files/test.rar >dir/sfxtest
-	cd dir
-	chmod +x sfxtest
-	./sfxtest
-	test "`cat dir/haiku.txt`" = Haiku
-}

app-arch/unrar/unrar-6.0.7.recipe

@@ -0,0 +1,129 @@
+SUMMARY="Uncompress rar files"
+DESCRIPTION="UnRAR decompresses rar files. It is a powerful archive manager \
+that can backup your data and reduce the size of email attachments. UnRAR can \
+decompress the following file formats:
+- RAR
+- ZIP
+- CAB
+- ARJ
+- JZH
+- TAR
+- GZ and TAR.GZ
+- BZ2 and TAR.BZ2
+- ACE
+- UUE
+- JAR (Java Archive)
+- ISO
+- 7Z
+- XZ
+- Z (Unix Compress)"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+COPYRIGHT="1993-2021 Alexander Roshal"
+LICENSE="UnRAR"
+REVISION="1"
+SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
+CHECKSUM_SHA256="a7029942006cbcced3f3b7322ec197683f8e7be408972ca08099b196c038f518"
+SOURCE_DIR="unrar"
+ADDITIONAL_FILES="
+	test.rar
+	unrar.rdef
+	"
+
+ARCHITECTURES="all"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	unrar$secondaryArchSuffix = $portVersion
+	lib:libunrar$secondaryArchSuffix = $portVersion
+	"
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
+	cmd:unrar = $portVersion
+	"
+fi
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	unrar${secondaryArchSuffix}_devel = $portVersion
+	devel:libunrar$secondaryArchSuffix = $portVersion
+	"
+REQUIRES_devel="
+	unrar$secondaryArchSuffix == $portVersion
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:cut
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:sed
+	"
+
+PATCH()
+{
+	if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
+		sed -i \
+			-e "/^CXXFLAGS=/ s/ -Wno-logical-op-parentheses//;" \
+			-e "/^CXXFLAGS=/ s/ -Wno-dangling-else//;" \
+			makefile
+	fi
+	sed -i -e "/^LDFLAGS=/ d;" makefile
+}
+
+BUILD()
+{
+	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
+	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
+	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	sed \
+		-e "s|@MAJOR@|$MAJOR|" \
+		-e "s|@MIDDLE@|$MIDDLE|" \
+		-e "s|@MINOR@|$MINOR|" \
+		"$portDir"/additional-files/unrar.rdef > unrar.rdef
+
+	for i in unrar lib sfx; do
+		mkdir -p $i
+		cd $i
+		ln -f -s ../*.cpp ../*.hpp ../makefile .
+		CPPFLAGS="-D_BSD_SOURCE" LDFLAGS="-lbsd" make $i
+		cd ..
+	done
+}
+
+INSTALL()
+{
+	install -d "$libDir"/unrar
+	install -t "$libDir"/unrar sfx/default.sfx
+	make -C unrar DESTDIR="$prefix" install-unrar
+	install lib/libunrar.so $libDir
+	install -d "$includeDir"/unrar
+	install -t "$includeDir"/unrar dll.hpp
+
+	prepareInstalledDevelLib libunrar
+	fixPkgconfig
+	packageEntries devel $developDir
+
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $prefix/bin
+	else
+		addResourcesToBinaries unrar.rdef "$binDir"/unrar
+		mimeset -f "$binDir"/unrar
+	fi
+}
+
+TEST()
+{
+	rm -rf dir
+	"$sourceDir"/unrar/unrar x "$portDir"/additional-files/test.rar
+	test "`cat dir/haiku.txt`" = Haiku
+
+	cat sfx/default.sfx "$portDir"/additional-files/test.rar >dir/sfxtest
+	cd dir
+	chmod +x sfxtest
+	./sfxtest
+	test "`cat dir/haiku.txt`" = Haiku
+}

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"

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

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

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

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/.

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

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

app-arch/zpaq/licenses/zpaq

@@ -0,0 +1,57 @@
+The following applies to the files zpaq.cpp, libzpaq.h, libzpaq.cpp,
+zpaq.pod, Makefile, and readme, and any files derived thereof,
+except for the portion of libzpaq.cpp identified as divsufsort.c
+for libdivsufsort-lite.
+
+This is free and unencumbered software released into the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or
+distribute this software, either in source code form or as a compiled
+binary, for any purpose, commercial or non-commercial, and by any
+means.
+
+In jurisdictions that recognize copyright laws, the author or authors
+of this software dedicate any and all copyright interest in the
+software to the public domain. We make this dedication for the benefit
+of the public at large and to the detriment of our heirs and
+successors. We intend this dedication to be an overt act of
+relinquishment in perpetuity of all present and future rights to this
+software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <http://unlicense.org>
+
+---------------------------------------------------------------------
+
+The following applies to the section of libzpaq.cpp labeled
+as divsufsort.c for libdivsufsort-lite.
+
+Copyright (c) 2003-2008 Yuta Mori All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

app-arch/zpaq/zpaq-7.15.recipe

@@ -0,0 +1,60 @@
+SUMMARY="Incremental journaling archiver with powerful compression"
+DESCRIPTION="zpaq is a free and open source incremental, \
+journaling command-line archiver. Among its features include \
+up to four billion files and 250 terabytes of data before compression,\
+encrypted archives via AES, multi-part/split archives,\
+and powerful compression through multiple methods.\
+\
+zpaq is only intended for user-level backups. It should not be used to \
+archive the operating system, as it does not follow links or save special \
+files such as devices, sockets, or pipes."
+HOMEPAGE="http://mattmahoney.net/dc/zpaq.html"
+COPYRIGHT="2009-2016 Matt Mahoney"
+LICENSE="Public Domain
+	zpaq"
+REVISION="1"
+SOURCE_URI="http://mattmahoney.net/dc/zpaq715.zip"
+CHECKSUM_SHA256="e85ec2529eb0ba22ceaeabd461e55357ef099b80f61c14f377b429ea3d49d418"
+SOURCE_DIR=""
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	zpaq$secondaryArchSuffix = $portVersion
+	cmd:zpaq$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:cmp
+	cmd:g++$secondaryArchSuffix
+	cmd:make
+	cmd:pod2man
+	cmd:unzip
+	"
+
+PATCH()
+{
+	sed -i "s/-pthread/-lpthread/g" Makefile
+}
+
+BUILD()
+{
+	make CXX=g++ $jobArgs
+}
+
+INSTALL()
+{
+	make BINDIR=$binDir MANDIR=$manDir install
+}
+
+TEST()
+{
+	make check
+}

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
+

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
+

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

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

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
+}

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

app-backup/luckybackup/luckybackup-0.5.0.recipe

@@ -6,14 +6,14 @@ declared directories before proceeding in any data manipulation), reliable and \
 fully customizable."
 COPYRIGHT="2008-2018 Loukas Avgeriou"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 HOMEPAGE="http://luckybackup.sourceforge.net"
 SOURCE_URI="https://downloads.sourceforge.net/luckybackup/luckybackup-$portVersion.tar.gz"
 CHECKSUM_SHA256="e801af2483cbdd62bc9af8e2ded252c51adbad81482e291042f58e21c3d4925b"
 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
@@ -23,6 +23,7 @@ PROVIDES="
 	app:LuckyBackup = $portVersion
 	"
 REQUIRES="
+	cmd:rsync
 	haiku$secondaryArchSuffix
 	lib:libGL$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix

app-backup/luckybackup/patches/luckybackup-0.5.0.patchset

@@ -1,11 +1,11 @@
-From ab3fd8dfc57e6240ffcba7605a6c9602125b00cb Mon Sep 17 00:00:00 2001
+From a4f13784c1087d1bc399e4c374ff8115a7577ccd Mon Sep 17 00:00:00 2001
 From: mazbrili <mazbrili@yahoo.com>
 Date: Fri, 5 Oct 2018 09:28:19 +0700
 Subject: set current dir to application dir
 
 
 diff --git a/src/main.cpp b/src/main.cpp
-index 935603e..4f66bba 100644
+index e1f872c..dc6acc3 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
 @@ -33,6 +33,9 @@
@@ -30,20 +30,20 @@ index 935603e..4f66bba 100644
      if (!argumentsTest(argc,argv))
          return 1;		// error code1: something wrong with the command arguments - app fail to start (or just --help or --version given as args)
 -- 
-2.19.0
+2.30.2
 
 
-From 8ea9eea609a179dfe67852cfab86250d10142f83 Mon Sep 17 00:00:00 2001
+From d2e474a331e753e36c56a5c2b53b2c346ba7ea88 Mon Sep 17 00:00:00 2001
 From: fbrosson <fbrosson@localhost>
 Date: Wed, 17 Oct 2018 14:23:21 +0000
 Subject: hardcode paths for Haiku
 
 
 diff --git a/src/global.cpp b/src/global.cpp
-index 1efe3ed..3e0cb0f 100644
+index eaf70b4..8927cd0 100644
 --- a/src/global.cpp
 +++ b/src/global.cpp
-@@ -52,8 +52,8 @@ QString appVersionString = "0.4.9";
+@@ -52,8 +52,8 @@ QString appVersionString = "0.5.0";
  double const validProfileVersion = 0.21;
  double const validScheduleVersion = 0.34;
  double const validSettingsVersion = 0.3;
@@ -80,5 +80,792 @@ index 1efe3ed..3e0cb0f 100644
  
  QString countStr;
 -- 
-2.19.1
+2.30.2
+
+
+From b3432232f4164103dd9127a86998d7bddc7f534d Mon Sep 17 00:00:00 2001
+From: mazbrili <mazbrili@yahoo.com>
+Date: Wed, 14 Apr 2021 14:55:31 +0700
+Subject: Add option extended Attribute
+
+
+diff --git a/src/global.cpp b/src/global.cpp
+index 8927cd0..7ee272c 100644
+--- a/src/global.cpp
++++ b/src/global.cpp
+@@ -1833,6 +1833,7 @@ QStringList AppendArguments(operation *operationToAppend)
+     if (operationToAppend -> GetOptionsNumericIDs())        arguments.append("--numeric-ids");
+     if (operationToAppend -> GetOptionsUpdate())            arguments.append("--update");
+     if (operationToAppend -> GetOptionsDelete())            arguments.append("--delete-after");
++    if (operationToAppend -> GetOptionsAttr())            arguments.append("-X");
+     count =0;
+     while ( count < (operationToAppend -> GetOptionsListSize()) )
+     {
+diff --git a/src/modifyDialog.cpp b/src/modifyDialog.cpp
+index 1080fae..6058555 100644
+--- a/src/modifyDialog.cpp
++++ b/src/modifyDialog.cpp
+@@ -1364,6 +1364,7 @@ operation *modifyDialog::fillOperationArray()
+     pTask -> SetOptionsRecurse      ( uiM.checkBox_recurse -> isChecked() );
+     pTask -> SetOptionsSuper        ( uiM.checkBox_super -> isChecked() );
+     pTask -> SetOptionsNumericIDs   ( uiM.checkBox_numericIDs -> isChecked() );
++    pTask -> SetOptionsAttr         ( uiM.checkBox_attr -> isChecked() );
+     // windows related rsync options
+     pTask -> SetOptionsRestorent    ( uiM.checkBox_restorent -> isChecked() );
+     pTask -> SetOptionsVss          ( uiM.checkBox_vss -> isChecked() );
+@@ -1502,6 +1503,7 @@ void modifyDialog::fillModifyWindow(operation *pTask)
+     
+     uiM.checkBox_vss                -> setChecked    (pTask -> GetOptionsVss() );
+     uiM.checkBox_restorent          -> setChecked    (pTask -> GetOptionsRestorent() );
++    uiM.checkBox_attr               -> setChecked    (pTask -> GetOptionsAttr() );
+     
+     count=0;
+     while ( count < (pTask -> GetOptionsListSize()) )
+@@ -1614,6 +1616,7 @@ void modifyDialog::modifyTrailing()
+         uiM.checkBox_update         -> setChecked    (true);
+         uiM.checkBox_ownership      -> setChecked    (true);
+         uiM.checkBox_permissions    -> setChecked    (true);
++        uiM.checkBox_attr           -> setChecked    (true);
+     }
+     
+     /*if (WINrunning)     // some more adjustments for windows when the user wants to declare directly paths with "/" instead of "\" (normally for remote)
+diff --git a/src/operationClass.h b/src/operationClass.h
+index 0e054c3..fa177dd 100644
+--- a/src/operationClass.h
++++ b/src/operationClass.h
+@@ -140,6 +140,7 @@ class operation
+ 
+         bool GetOptionsUpdate () const          {return itsOptionsUpdate;}
+         bool GetOptionsDelete () const          {return itsOptionsDelete;}
++        bool GetOptionsAttr () const            {return itsOptionsAttr;}
+         bool GetOptionsRecurse () const         {return itsOptionsRecurse;}
+         bool GetOptionsOwnership () const       {return itsOptionsOwnership;}
+         bool GetOptionsSymlinks () const        {return itsOptionsSymlinks;}
+@@ -273,6 +274,7 @@ class operation
+         // Command options - templates
+         void SetOptionsUpdate (bool OptionsUpdate)          { itsOptionsUpdate = OptionsUpdate;}
+         void SetOptionsDelete (bool OptionsDelete)          { itsOptionsDelete = OptionsDelete;}
++        void SetOptionsAttr (bool OptionsAttr)              { itsOptionsAttr = OptionsAttr;}
+         void SetOptionsRecurse (bool OptionsRecurse)        { itsOptionsRecurse = OptionsRecurse;}
+         void SetOptionsOwnership (bool OptionsOwnership)    { itsOptionsOwnership = OptionsOwnership;}
+         void SetOptionsSymlinks (bool OptionsSymlinks)      { itsOptionsSymlinks = OptionsSymlinks;}
+@@ -365,6 +367,7 @@ class operation
+         int itsRemoteSSHPort;
+ 
+         bool itsOptionsUpdate;
++        bool itsOptionsAttr;
+         bool itsOptionsDelete;
+         bool itsOptionsRecurse;
+         bool itsOptionsOwnership;
+diff --git a/ui/modifyDialog.ui b/ui/modifyDialog.ui
+index 842274a..3daba07 100644
+--- a/ui/modifyDialog.ui
++++ b/ui/modifyDialog.ui
+@@ -325,7 +325,7 @@
+           <enum>QTabWidget::North</enum>
+          </property>
+          <property name="currentIndex">
+-          <number>0</number>
++          <number>4</number>
+          </property>
+          <widget class="QWidget" name="tab_Description">
+           <attribute name="title">
+@@ -362,8 +362,8 @@
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+-                <width>570</width>
+-                <height>300</height>
++                <width>475</width>
++                <height>362</height>
+                </rect>
+               </property>
+               <attribute name="label">
+@@ -692,8 +692,8 @@
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+-                <width>213</width>
+-                <height>283</height>
++                <width>214</width>
++                <height>217</height>
+                </rect>
+               </property>
+               <attribute name="label">
+@@ -1974,8 +1974,8 @@ If you have no idea what these mean, leave them untouched !!</string>
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+-                <width>570</width>
+-                <height>300</height>
++                <width>475</width>
++                <height>362</height>
+                </rect>
+               </property>
+               <attribute name="label">
+@@ -2053,8 +2053,8 @@ If you have no idea what these mean, leave them untouched !!</string>
+                  </property>
+                 </widget>
+                </item>
+-               <item row="1" column="0">
+-                <widget class="QCheckBox" name="checkBox_permissions">
++               <item row="1" column="2">
++                <widget class="QCheckBox" name="checkBox_recurse">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                    <horstretch>0</horstretch>
+@@ -2071,19 +2071,19 @@ If you have no idea what these mean, leave them untouched !!</string>
+                   <cursorShape>PointingHandCursor</cursorShape>
+                  </property>
+                  <property name="toolTip">
+-                  <string>Preserve permissions of files
+-(-p)</string>
++                  <string>Recurse into directories 
++(-r)</string>
+                  </property>
+                  <property name="text">
+-                  <string>Preserve permissions</string>
++                  <string>Recurse into directories</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+-               <item row="1" column="2">
+-                <widget class="QCheckBox" name="checkBox_recurse">
++               <item row="1" column="0">
++                <widget class="QCheckBox" name="checkBox_permissions">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                    <horstretch>0</horstretch>
+@@ -2100,11 +2100,11 @@ If you have no idea what these mean, leave them untouched !!</string>
+                   <cursorShape>PointingHandCursor</cursorShape>
+                  </property>
+                  <property name="toolTip">
+-                  <string>Recurse into directories 
+-(-r)</string>
++                  <string>Preserve permissions of files
++(-p)</string>
+                  </property>
+                  <property name="text">
+-                  <string>Recurse into directories</string>
++                  <string>Preserve permissions</string>
+                  </property>
+                  <property name="checked">
+                   <bool>true</bool>
+@@ -2140,8 +2140,8 @@ If you have no idea what these mean, leave them untouched !!</string>
+                  </property>
+                 </widget>
+                </item>
+-               <item row="2" column="2">
+-                <widget class="QCheckBox" name="checkBox_update">
++               <item row="3" column="2">
++                <widget class="QCheckBox" name="checkBox_cvs">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                    <horstretch>0</horstretch>
+@@ -2158,14 +2158,11 @@ If you have no idea what these mean, leave them untouched !!</string>
+                   <cursorShape>PointingHandCursor</cursorShape>
+                  </property>
+                  <property name="toolTip">
+-                  <string>Do not backup source files that are newer on the destination 
+-(--update)</string>
++                  <string>Ignore files using a similar algorithm to CVS 
++(-C)</string>
+                  </property>
+                  <property name="text">
+-                  <string>Skip newer destination files</string>
+-                 </property>
+-                 <property name="checked">
+-                  <bool>true</bool>
++                  <string>Ignore files the CVS way</string>
+                  </property>
+                 </widget>
+                </item>
+@@ -2204,8 +2201,8 @@ If you have no idea what these mean, leave them untouched !!</string>
+                  </property>
+                 </widget>
+                </item>
+-               <item row="3" column="2">
+-                <widget class="QCheckBox" name="checkBox_cvs">
++               <item row="2" column="2">
++                <widget class="QCheckBox" name="checkBox_update">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                    <horstretch>0</horstretch>
+@@ -2222,16 +2219,19 @@ If you have no idea what these mean, leave them untouched !!</string>
+                   <cursorShape>PointingHandCursor</cursorShape>
+                  </property>
+                  <property name="toolTip">
+-                  <string>Ignore files using a similar algorithm to CVS 
+-(-C)</string>
++                  <string>Do not backup source files that are newer on the destination 
++(--update)</string>
+                  </property>
+                  <property name="text">
+-                  <string>Ignore files the CVS way</string>
++                  <string>Skip newer destination files</string>
++                 </property>
++                 <property name="checked">
++                  <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+-               <item row="4" column="0">
+-                <widget class="QCheckBox" name="checkBox_hardLinks">
++               <item row="4" column="2">
++                <widget class="QCheckBox" name="checkBox_FATntfs">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                    <horstretch>0</horstretch>
+@@ -2248,17 +2248,17 @@ If you have no idea what these mean, leave them untouched !!</string>
+                   <cursorShape>PointingHandCursor</cursorShape>
+                  </property>
+                  <property name="toolTip">
+-                  <string>Files that are hard-linked together on the source will hard-link together on the destination
+-WARNING: All files have to be included in the transfer set !!
+-(-H)</string>
++                  <string>Check this is you use a FAT/NTFS partition as destination.
++Data ownership and permissions will NOT be preserved.
++(-t --modify-window=1)</string>
+                  </property>
+                  <property name="text">
+-                  <string>Preserve hard links</string>
++                  <string>Destination is FAT/NTFS</string>
+                  </property>
+                 </widget>
+                </item>
+-               <item row="4" column="2">
+-                <widget class="QCheckBox" name="checkBox_FATntfs">
++               <item row="4" column="0">
++                <widget class="QCheckBox" name="checkBox_hardLinks">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                    <horstretch>0</horstretch>
+@@ -2275,12 +2275,12 @@ WARNING: All files have to be included in the transfer set !!
+                   <cursorShape>PointingHandCursor</cursorShape>
+                  </property>
+                  <property name="toolTip">
+-                  <string>Check this is you use a FAT/NTFS partition as destination.
+-Data ownership and permissions will NOT be preserved.
+-(-t --modify-window=1)</string>
++                  <string>Files that are hard-linked together on the source will hard-link together on the destination
++WARNING: All files have to be included in the transfer set !!
++(-H)</string>
+                  </property>
+                  <property name="text">
+-                  <string>Destination is FAT/NTFS</string>
++                  <string>Preserve hard links</string>
+                  </property>
+                 </widget>
+                </item>
+@@ -2312,8 +2312,21 @@ and mapping them at both ends.
+                  </property>
+                 </widget>
+                </item>
+-               <item row="5" column="2">
+-                <widget class="QCheckBox" name="checkBox_super">
++               <item row="8" column="1">
++                <spacer name="verticalSpacer_3">
++                 <property name="orientation">
++                  <enum>Qt::Vertical</enum>
++                 </property>
++                 <property name="sizeHint" stdset="0">
++                  <size>
++                   <width>20</width>
++                   <height>40</height>
++                  </size>
++                 </property>
++                </spacer>
++               </item>
++               <item row="6" column="2">
++                <widget class="QCheckBox" name="checkBox_restorent">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                    <horstretch>0</horstretch>
+@@ -2330,16 +2343,11 @@ and mapping them at both ends.
+                   <cursorShape>PointingHandCursor</cursorShape>
+                  </property>
+                  <property name="toolTip">
+-                  <string>This tells the receiving side to attempt super-user activities
+-even if the receiving rsync wasn’t run by the super-user.
+-These activities include:
+-preserving users via the --owner option
+-preserving all groups (not just the current user’s groups) via the --groups option
+-and copying devices via the --devices option.
+-(--super)</string>
++                  <string>Restore backed-up windows permissions which are located in the NTFS Security Descriptor Stream 
++(--restore-nt-streams)</string>
+                  </property>
+                  <property name="text">
+-                  <string>Attempt super-user activities</string>
++                  <string>Restore permissions</string>
+                  </property>
+                 </widget>
+                </item>
+@@ -2372,8 +2380,8 @@ and copying devices via the --devices option.
+                  </property>
+                 </widget>
+                </item>
+-               <item row="6" column="2">
+-                <widget class="QCheckBox" name="checkBox_restorent">
++               <item row="5" column="2">
++                <widget class="QCheckBox" name="checkBox_super">
+                  <property name="sizePolicy">
+                   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                    <horstretch>0</horstretch>
+@@ -2390,26 +2398,28 @@ and copying devices via the --devices option.
+                   <cursorShape>PointingHandCursor</cursorShape>
+                  </property>
+                  <property name="toolTip">
+-                  <string>Restore backed-up windows permissions which are located in the NTFS Security Descriptor Stream 
+-(--restore-nt-streams)</string>
++                  <string>This tells the receiving side to attempt super-user activities
++even if the receiving rsync wasn’t run by the super-user.
++These activities include:
++preserving users via the --owner option
++preserving all groups (not just the current user’s groups) via the --groups option
++and copying devices via the --devices option.
++(--super)</string>
+                  </property>
+                  <property name="text">
+-                  <string>Restore permissions</string>
++                  <string>Attempt super-user activities</string>
+                  </property>
+                 </widget>
+                </item>
+-               <item row="7" column="1">
+-                <spacer name="verticalSpacer_3">
+-                 <property name="orientation">
+-                  <enum>Qt::Vertical</enum>
++               <item row="7" column="0">
++                <widget class="QCheckBox" name="checkBox_attr">
++                 <property name="text">
++                  <string>Preserve Attribute</string>
+                  </property>
+-                 <property name="sizeHint" stdset="0">
+-                  <size>
+-                   <width>20</width>
+-                   <height>40</height>
+-                  </size>
++                 <property name="checked">
++                  <bool>true</bool>
+                  </property>
+-                </spacer>
++                </widget>
+                </item>
+               </layout>
+              </widget>
+@@ -2418,8 +2428,8 @@ and copying devices via the --devices option.
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+-                <width>213</width>
+-                <height>237</height>
++                <width>207</width>
++                <height>187</height>
+                </rect>
+               </property>
+               <attribute name="label">
+@@ -2667,8 +2677,8 @@ and copying devices via the --devices option.
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+-                <width>570</width>
+-                <height>301</height>
++                <width>475</width>
++                <height>362</height>
+                </rect>
+               </property>
+               <attribute name="label">
+@@ -2968,8 +2978,8 @@ ATTENTION: check this if you really know what you're doing</string>
+                <rect>
+                 <x>0</x>
+                 <y>0</y>
+-                <width>213</width>
+-                <height>239</height>
++                <width>214</width>
++                <height>187</height>
+                </rect>
+               </property>
+               <attribute name="label">
+@@ -3545,374 +3555,5 @@ Leave unchecked to create an extra directory inside destination</string>
+  <resources>
+   <include location="../resources/luckybackup.qrc"/>
+  </resources>
+- <connections>
+-  <connection>
+-   <sender>lineEdit_excludeAdd</sender>
+-   <signal>returnPressed()</signal>
+-   <receiver>pushButton_excludeAdd</receiver>
+-   <slot>animateClick()</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>58</x>
+-     <y>191</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>211</x>
+-     <y>193</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>lineEdit_includeAdd</sender>
+-   <signal>returnPressed()</signal>
+-   <receiver>pushButton_includeAdd</receiver>
+-   <slot>animateClick()</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>40</x>
+-     <y>166</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>176</x>
+-     <y>165</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>label_sshPassword</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>45</x>
+-     <y>193</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>62</x>
+-     <y>191</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_remoteModule</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>label_rsyncPassword</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>74</x>
+-     <y>195</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>51</x>
+-     <y>193</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_remoteModule</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>lineEdit_rsyncPassword</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>74</x>
+-     <y>195</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>74</x>
+-     <y>193</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>label_sshPort</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>45</x>
+-     <y>193</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>62</x>
+-     <y>193</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>lineEdit_sshPort</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>45</x>
+-     <y>193</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>96</x>
+-     <y>193</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>toolButton_sshPassword</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>45</x>
+-     <y>193</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>96</x>
+-     <y>191</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_remoteModule</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>toolButton_rsyncPassword</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>74</x>
+-     <y>195</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>96</x>
+-     <y>193</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>lineEdit_executeBeforeAdd</sender>
+-   <signal>returnPressed()</signal>
+-   <receiver>pushButton_executeBeforeAdd</receiver>
+-   <slot>animateClick()</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>94</x>
+-     <y>203</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>137</x>
+-     <y>204</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>lineEdit_executeAfterAdd</sender>
+-   <signal>returnPressed()</signal>
+-   <receiver>pushButton_executeAfterAdd</receiver>
+-   <slot>animateClick()</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>58</x>
+-     <y>192</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>211</x>
+-     <y>193</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_excludeFile</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>lineEdit_excludeFile</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>105</x>
+-     <y>358</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>180</x>
+-     <y>359</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_excludeFile</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>toolButton_excludeFile</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>105</x>
+-     <y>358</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>210</x>
+-     <y>360</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_includeFile</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>toolButton_includeFile</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>47</x>
+-     <y>187</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>109</x>
+-     <y>187</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_includeFile</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>lineEdit_includeFile</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>47</x>
+-     <y>187</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>79</x>
+-     <y>187</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>lineEdit_optionsAdd</sender>
+-   <signal>returnPressed()</signal>
+-   <receiver>pushButton_optionsAdd</receiver>
+-   <slot>animateClick()</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>86</x>
+-     <y>190</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>211</x>
+-     <y>191</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_FATntfs</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>checkBox_permissions</receiver>
+-   <slot>setDisabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>364</x>
+-     <y>300</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>189</x>
+-     <y>225</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_FATntfs</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>checkBox_ownership</receiver>
+-   <slot>setDisabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>369</x>
+-     <y>300</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>194</x>
+-     <y>200</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>lineEdit_sshPassword</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>70</x>
+-     <y>338</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>341</x>
+-     <y>367</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>lineEdit_sshOptions</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>70</x>
+-     <y>338</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>357</x>
+-     <y>396</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>label_sshPassword_2</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>70</x>
+-     <y>338</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>91</x>
+-     <y>396</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>label_sshPassword_3</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>57</x>
+-     <y>334</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>359</x>
+-     <y>334</y>
+-    </hint>
+-   </hints>
+-  </connection>
+-  <connection>
+-   <sender>checkBox_ssh</sender>
+-   <signal>toggled(bool)</signal>
+-   <receiver>lineEdit_sshPasswordStr</receiver>
+-   <slot>setEnabled(bool)</slot>
+-   <hints>
+-    <hint type="sourcelabel">
+-     <x>57</x>
+-     <y>334</y>
+-    </hint>
+-    <hint type="destinationlabel">
+-     <x>495</x>
+-     <y>334</y>
+-    </hint>
+-   </hints>
+-  </connection>
+- </connections>
++ <connections/>
+ </ui>
+-- 
+2.30.2
 

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

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

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"

app-benchmarks/iozone/iozone-3.326.recipe

@@ -1,58 +0,0 @@
-SUMMARY="Filesystem benchmarking program"
-DESCRIPTION="IOzone is a filesystem benchmark tool. The benchmark generates \
-and measures a variety of file operations.
-Iozone is useful for performing a broad filesystem analysis of a vendor’s \
-computer platform. The benchmark tests file I/O performance for the following \
-operations:
-
-Read, write, re-read, re-write, read backwards, read strided, fread, fwrite, \
-random read, pread, mmap, aio_read, aio_write"
-# NOTE: The author retains the exclusive right to publish derivative works
-# based on this work, including, but not limited to, revised versions of
-# this work.
-HOMEPAGE="http://www.iozone.org/"
-COPYRIGHT="
-	1991-2001 William D. Norcott
-	2010 Don Capps
-	"
-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"
-
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
-
-PROVIDES="
-	iozone = $portVersion
-	cmd:fileop = $portVersion
-	cmd:iozone = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	cmd:cc
-	cmd:make
-	"
-BUILD_PREREQUIRES="
-	haiku_devel
-	"
-
-BUILD()
-{
-	cd src/current/
-	make haiku
-}
-
-INSTALL()
-{
-	mkdir -p $binDir $manDir/man1
-	cd src/current/
-	cp iozone $binDir
-	cp fileop $binDir
-
-	cp ../../docs/iozone.1 $manDir/man1
-}

app-benchmarks/iozone/iozone-3.492.recipe

@@ -0,0 +1,58 @@
+SUMMARY="Filesystem benchmarking program"
+DESCRIPTION="IOzone is a filesystem benchmark tool. The benchmark generates \
+and measures a variety of file operations.
+Iozone is useful for performing a broad filesystem analysis of a vendor’s \
+computer platform. The benchmark tests file I/O performance for the following \
+operations:
+
+Read, write, re-read, re-write, read backwards, read strided, fread, fwrite, \
+random read, pread, mmap, aio_read, aio_write"
+# NOTE: The author retains the exclusive right to publish derivative works
+# based on this work, including, but not limited to, revised versions of
+# this work.
+HOMEPAGE="http://www.iozone.org/"
+COPYRIGHT="
+	1991-2001 William D. Norcott
+	2010 Don Capps
+	"
+LICENSE="iozone"
+REVISION="1"
+SOURCE_URI="http://www.iozone.org/src/current/iozone3_492.tar"
+CHECKSUM_SHA256="322981e168f32bd39f54772b82b2906d598d958c37e954e75742e71baf58bb9b"
+SOURCE_DIR="iozone3_492"
+PATCHES="iozone-3.492.patchset"
+
+ARCHITECTURES="all ?x86"
+
+PROVIDES="
+	iozone = $portVersion
+	cmd:fileop = $portVersion
+	cmd:iozone = $portVersion
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_REQUIRES="
+	cmd:cc
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel
+	"
+
+BUILD()
+{
+	cd src/current/
+	make haiku
+}
+
+INSTALL()
+{
+	mkdir -p $binDir $manDir/man1
+	cd src/current/
+	cp iozone $binDir
+	cp fileop $binDir
+
+	cp ../../docs/iozone.1 $manDir/man1
+}

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
-

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
+

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

app-benchmarks/stress-ng/stress_ng-0.12.00.recipe

@@ -1,72 +0,0 @@
-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. \
-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
-
-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 \
-that only occur when a system is being thrashed hard. Use stress-ng with \
-caution as some of the tests can make a system run hot on poorly designed \
-hardware and also can cause excessive system thrashing which may be difficult \
-to stop.
-
-stress-ng can also measure test throughput rates; this can be useful to \
-observe performance changes across different operating system releases or \
-types of hardware. However, it has never been intended to be used as a \
-precise benchmark test suite, so do NOT use it in this manner.
-
-Running stress-ng with root privileges will adjust out of memory settings on \
-Linux systems to make the stressors unkillable in low memory situations, so \
-use this judiciously. With the apropriate privilege, stress-ng can allow the \
-ionice class and ionice levels to be adjusted, again, this should be used \
-with care.
-
-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"
-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="53f85538ca0ca09c6f2f1ea0186f006537f93db4af35c0338f93e13b32eec0c6"
-
-ARCHITECTURES="?x86_gcc2 x86_64"
-
-PROVIDES="
-	stressng = $portVersion
-	cmd:stress_ng = $portVersion
-	"
-REQUIRES="
-	haiku
-	gcc_syslibs
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:awk
-	cmd:g++
-	cmd:make
-	"
-
-BUILD()
-{
-	make
-}
-
-INSTALL()
-{
-	mkdir -p  $binDir
-	cp stress-ng $binDir
-}

app-benchmarks/stress-ng/stress_ng-0.13.05.recipe

@@ -0,0 +1,74 @@
+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.
+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
+
+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 \
+that only occur when a system is being thrashed hard. Use stress-ng with \
+caution as some of the tests can make a system run hot on poorly designed \
+hardware and also can cause excessive system thrashing which may be difficult \
+to stop.
+
+stress-ng can also measure test throughput rates; this can be useful to \
+observe performance changes across different operating system releases or \
+types of hardware. However, it has never been intended to be used as a \
+precise benchmark test suite, so do NOT use it in this manner.
+
+Running stress-ng with root privileges will adjust out of memory settings on \
+Linux systems to make the stressors unkillable in low memory situations, so \
+use this judiciously. With the apropriate privilege, stress-ng can allow the \
+ionice class and ionice levels to be adjusted, again, this should be used \
+with care.
+
+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-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="442c07327c5534566670a85dc67d50b1c643250aa09cc7129c793705d294cbeb"
+
+ARCHITECTURES="all !x86_gcc2"
+
+PROVIDES="
+	stress_ng = $portVersion
+	cmd:stress_ng = $portVersion
+	"
+REQUIRES="
+	haiku
+	gcc_syslibs
+	lib:libz
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libz
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:gcc
+	cmd:make
+	"
+
+BUILD()
+{
+	touch config
+	make -f Makefile.config
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp stress-ng $binDir
+}

app-benchmarks/vttest/vttest-20140305.recipe

@@ -1,43 +0,0 @@
-SUMMARY="Test program for terminal emulators"
-DESCRIPTION="Vttest tests the compatibility (demonstrates the non-compatibility) \
-of so-called \"VT100-compatible\" terminals. In conformance of the good old \
-hacker traditions, the only documentation of this program is the source code \
-itself. To understand it, you also need a copy of the original VT100 manual \
-from DEC.
-
-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"
-LICENSE="BSD (3-clause)"
-REVISION="2"
-SOURCE_URI="ftp://ftp.invisible-island.net/vttest/vttest.tar.gz"
-CHECKSUM_SHA256="0168aa34061d4470a68b0dd0781a2a9e2bbfb1493e540c99f615b867a11cbf83"
-
-ARCHITECTURES="x86_gcc2"
-
-PROVIDES="
-	vttest = $portVersion
-	cmd:vttest
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:gcc
-	cmd:make
-	"
-
-BUILD()
-{
-	runConfigure --omit-dirs "docDir" ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}

app-benchmarks/vttest/vttest-20210210.recipe

@@ -0,0 +1,43 @@
+SUMMARY="Test program for terminal emulators"
+DESCRIPTION="Vttest tests the compatibility (demonstrates the non-compatibility) \
+of so-called \"VT100-compatible\" terminals. In conformance of the good old \
+hacker traditions, the only documentation of this program is the source code \
+itself. To understand it, you also need a copy of the original VT100 manual \
+from DEC.
+
+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-2020,2021 by Thomas E. Dickey"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://invisible-mirror.net/archives/vttest/vttest-$portVersion.tgz"
+CHECKSUM_SHA256="0f98a2e305982915f1520984c3e8698e3acd508ee210711528c89f5a7ea7f046"
+
+ARCHITECTURES="all"
+
+PROVIDES="
+	vttest = $portVersion
+	cmd:vttest
+	"
+REQUIRES="
+	haiku
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel
+	cmd:gcc
+	cmd:make
+	"
+
+BUILD()
+{
+	runConfigure --omit-dirs "docDir" ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}

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

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
 }

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

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="

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

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

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="

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="