WIP: quaternion beta5

disabled to avoid conflicts with gcc 8.3
the patch for Beta2 can be removed on Beta3+

app-admin/keepassxc/keepassxc-2.6.2.recipe

@@ -30,8 +30,12 @@ COPYRIGHT="
 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"
+CHECKSUM_SHA256="9387caeadabb5e66190f1ccae4eb26887ba872125620e22bba8c79615349cf81"
+PATCHES="keepassxc-$portVersion.patchset"
+ADDITIONAL_FILES="
+	keepassxc.rdef.in
+	icons.zip
+	"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -47,6 +51,7 @@ REQUIRES="
 	lib:libgpg_error$secondaryArchSuffix
 	lib:libmicrohttpd$secondaryArchSuffix
 	lib:libqrencode$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix
 	lib:libsodium$secondaryArchSuffix
 	lib:libQt5Concurrent$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
@@ -55,6 +60,7 @@ REQUIRES="
 	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5Test$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libquazip5$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
 
@@ -65,6 +71,7 @@ BUILD_REQUIRES="
 	devel:libgpg_error$secondaryArchSuffix
 	devel:libmicrohttpd$secondaryArchSuffix
 	devel:libqrencode$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 8
 	devel:libsodium$secondaryArchSuffix
 	devel:libQt5Concurrent$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
@@ -73,6 +80,7 @@ BUILD_REQUIRES="
 	devel:libQt5Network$secondaryArchSuffix
 	devel:libQt5Test$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libquazip5$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
@@ -81,8 +89,14 @@ BUILD_PREREQUIRES="
 	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
@@ -93,7 +107,9 @@ BUILD()
 		-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"
@@ -103,18 +119,9 @@ BUILD()
 
 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
 

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-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="!x86_gcc2 ?x86 ?x86_64"
+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/arj/arj-3.10.22.recipe

@@ -2,10 +2,10 @@ 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"

app-arch/gcab/gcab-1.4.recipe

@@ -13,9 +13,9 @@ COPYRIGHT="2000-2002 Stuart Caie
 	2012 Marc-André Lureau
 	2017 Richard Hughes"
 LICENSE="GNU LGPL v2.1"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://download.gnome.org/sources/gcab/$portVersion/gcab-$portVersion.tar.xz"
-CHECKSUM_SHA256="10304cc8f6b550cf9f53fb3cebfb529c49394e982ef7e66e3fca9776c60a68e7"
+CHECKSUM_SHA256="67a5fa9be6c923fbc9197de6332f36f69a33dadc9016a2b207859246711c048f"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -28,7 +28,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-libVersion="0.0.0"
+libVersion="0.1.0"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="

app-arch/libarchive/libarchive-3.5.1.recipe

@@ -24,7 +24,7 @@ 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"
+CHECKSUM_SHA256="9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -42,7 +42,7 @@ PROVIDES="
 	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
+	lib:libarchive$secondaryArchSuffix = 13.5.1 compat >= 13
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -56,7 +56,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libarchive${secondaryArchSuffix}_devel = $portVersion compat >= 3.0
-	devel:libarchive$secondaryArchSuffix = 13.4.2 compat >= 13
+	devel:libarchive$secondaryArchSuffix = 13.5.1 compat >= 13
 	"
 REQUIRES_devel="
 	libarchive$secondaryArchSuffix == $portVersion

app-arch/lzip/lzip-1.22.recipe

@@ -27,7 +27,7 @@ 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"
+CHECKSUM_SHA256="c3342d42e67139c165b8b128d033b5c96893a13ac5f25933190315214e87a948"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 if [ "$targetArchitecture" = x86_gcc2 ]; then

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="x86_gcc2 x86_64"
 
 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-17.04.recipe

@@ -5,36 +5,46 @@ 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"
+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="x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	p7zip = $portVersion
+	p7zip$secondaryArchSuffix = $portVersion
+	cmd:7z = $portVersion compat >= 17
 	cmd:7za = $portVersion compat >= 9
+	cmd:7zr = $portVersion compat >= 17
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
 	"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	REPLACES="
+		p7zip
+		"
+fi
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:gcc
-	cmd:ld
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	"
 
 BUILD()
 {
 	cp makefile.haiku makefile.machine
-	make
+	make $jobArgs 7z 7zr 7za
 }
 
 INSTALL()

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/snappy/snappy-1.1.8.recipe

@@ -8,9 +8,9 @@ for most inputs, but the resulting compressed files are anywhere from 20% to \
 HOMEPAGE="https://google.github.io/snappy/"
 COPYRIGHT="2005-2017 Google Inc"
 LICENSE="BSD (3-clause)"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/google/snappy/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4"
+CHECKSUM_SHA256="16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

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

@@ -1,11 +1,11 @@
-From 25395e3fa0b01a898b6e6ae456c8eef3c66849f1 Mon Sep 17 00:00:00 2001
+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 501e0d3..60e1ff4 100644
+index 5d07956..c70608f 100644
 --- a/src/common.h
 +++ b/src/common.h
 @@ -197,6 +197,8 @@ GLOBAL enum old_files old_files_option;
@@ -18,7 +18,7 @@ index 501e0d3..60e1ff4 100644
  GLOBAL const char *listed_incremental_option;
  /* Incremental dump level */
 diff --git a/src/extract.c b/src/extract.c
-index 8276f8f..da0962d 100644
+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 */
@@ -30,12 +30,14 @@ index 8276f8f..da0962d 100644
  #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)
+@@ -1458,7 +1460,39 @@ extract_link (char *file_name, int typeflag)
    char const *link_name;
    int rc;
- 
-+  if (simulate_hardlinks_option)
-+  {
+   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;
@@ -43,7 +45,7 @@ index 8276f8f..da0962d 100644
 +	int p_count = 0;
 +	char *link_name = (char*) xmalloc(strlen(current_stat_info.link_name) * 2);
 +
-+   for (; *f && *l; f++, l++)
++	for (; *f && *l; f++, l++)
 +	{
 +	  if (*f != *l)
 +		  break;
@@ -69,7 +71,7 @@ index 8276f8f..da0962d 100644
    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)
+@@ -1551,6 +1585,13 @@ extract_symlink (char *file_name, int typeflag)
  #else
    static int warned_once;
  
@@ -84,19 +86,20 @@ index 8276f8f..da0962d 100644
      {
        warned_once = 1;
 diff --git a/src/tar.c b/src/tar.c
-index d66fed8..23027d2 100644
+index 728e38b..21098df 100644
 --- a/src/tar.c
 +++ b/src/tar.c
-@@ -449,6 +449,8 @@ static struct argp_option options[] = {
+@@ -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+1 },
+    GRID_MODIFIER },
 +  {"replace-hardlinks", 'Q', 0, 0,
-+   N_("replace hardlinks with corresponding symlink when extracting"), GRID+1 },
- #undef GRID
++   N_("replace hardlinks with corresponding symlink when extracting"),
++   GRID_MODIFIER },
  
- #define GRID 30
-@@ -1728,6 +1730,10 @@ parse_opt (int key, char *arg, struct argp_state *state)
+   {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;
  
@@ -107,7 +110,7 @@ index d66fed8..23027d2 100644
      case INDEX_FILE_OPTION:
        index_file_name = arg;
        break;
-@@ -2245,6 +2251,7 @@ decode_options (int argc, char **argv)
+@@ -2288,6 +2295,7 @@ decode_options (int argc, char **argv)
    unquote_option = true;
    tar_sparse_major = 1;
    tar_sparse_minor = 0;
@@ -116,5 +119,5 @@ index d66fed8..23027d2 100644
    savedir_sort_order = SAVEDIR_SORT_NONE;
  
 -- 
-2.28.0
+2.30.0
 

app-arch/tar/tar-1.34.recipe

@@ -12,35 +12,43 @@ archives)."
 HOMEPAGE="https://www.gnu.org/software/tar/"
 COPYRIGHT="1990-2018 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="2"
+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="e4bb9e08e12e7fa9f11fef544efc85e59ba34538593d9ad38148c7ca2bfbb566"
+CHECKSUM_SHA256="b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff"
 PATCHES="tar-$portVersion.patchset"
-if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-	PATCHES+="
-		tar-$portVersion-gcc2.patchset
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64 arm"
+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
 
-ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
-
-PROVIDES="
-	tar = $portVersion compat >= 1
-	cmd:tar = $portVersion compat >= 1
-	"
-REQUIRES="
-	haiku
-	"
-
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:automake
 	cmd:autoreconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
@@ -59,11 +67,11 @@ TEST_REQUIRES+="
 	"
 fi
 
-defineDebugInfoPackage tar $binDir/tar
+defineDebugInfoPackage tar$secondaryArchSuffix $commandBinDir/tar
 
 BUILD()
 {
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir \
 		--disable-nls \
 		--disable-gcc-warnings \
 		LDFLAGS="-lnetwork" CFLAGS="-D_BSD_SOURCE" \
@@ -78,5 +86,7 @@ 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/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-6.0.4.recipe

@@ -18,43 +18,47 @@ decompress the following file formats:
 - XZ
 - Z (Unix Compress)"
 HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-COPYRIGHT="1993-2018 Alexander Roshal"
+COPYRIGHT="1993-2021 Alexander Roshal"
 LICENSE="UnRAR"
-REVISION="2"
+REVISION="4"
 SOURCE_URI="https://www.rarlab.com/rar/unrarsrc-$portVersion.tar.gz"
-CHECKSUM_SHA256="3591685c8f5bbcb0be09de3d0a0544adb88966b9cccb80986f6cd2b534fd91a6"
+CHECKSUM_SHA256="130197e495d6e2c2ee790a5beee123edeed642508be13f0159672e5397aca6c1"
 SOURCE_DIR="unrar"
-PATCHES="unrar-$portVersion.patchset"
 ADDITIONAL_FILES="
 	test.rar
 	unrar.rdef
 	"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
-	unrar = $portVersion
-	cmd:unrar = $portVersion
-	lib:libunrar = $portVersion
+	unrar$secondaryArchSuffix = $portVersion
+	lib:libunrar$secondaryArchSuffix = $portVersion
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
+	cmd:unrar = $portVersion
+	"
+fi
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	unrar = $portVersion
-	devel:libunrar = $portVersion
+	unrar${secondaryArchSuffix}_devel = $portVersion
+	devel:libunrar$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
-	unrar == $portVersion
+	unrar$secondaryArchSuffix == $portVersion
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:cut
-	cmd:g++
+	cmd:g++$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
@@ -94,19 +98,21 @@ INSTALL()
 {
 	install -d "$libDir"/unrar
 	install -t "$libDir"/unrar sfx/default.sfx
-	for i in unrar lib; do
-		make -C $i DESTDIR="$prefix" install-$i
-	done
+	make -C unrar DESTDIR="$prefix" install-unrar
+	install lib/libunrar.so $libDir
 	install -d "$includeDir"/unrar
 	install -t "$includeDir"/unrar dll.hpp
-	rm "$libDir"/libunrar.a
 
 	prepareInstalledDevelLib libunrar
 	fixPkgconfig
 	packageEntries devel $developDir
 
-	addResourcesToBinaries unrar.rdef "$binDir"/unrar
-	mimeset -f "$binDir"/unrar
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $prefix/bin
+	else
+		addResourcesToBinaries unrar.rdef "$binDir"/unrar
+		mimeset -f "$binDir"/unrar
+	fi
 }
 
 TEST()

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="!x86_gcc2 x86 x86_64"
+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-backup/luckybackup/luckybackup-0.5.0.recipe

@@ -6,7 +6,7 @@ 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"
@@ -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/stress-ng/patches/stress_ng-0.12.01.patchset

@@ -0,0 +1,22 @@
+From 4f6b80ad397cacf8196e9ee2ddabad53dfeae5c0 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Wed, 20 Jan 2021 11:27:46 +1000
+Subject: Disable mlock for Haiku
+
+
+diff --git a/stress-ng.h b/stress-ng.h
+index a3e07e9..31c319f 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -1200,7 +1200,7 @@ typedef struct {
+ #endif
+ 
+ /* GCC mlocked data and data section attribute */
+-#if defined(__GNUC__) && NEED_GNUC(4,6,0) && !defined(__sun__)
++#if defined(__GNUC__) && NEED_GNUC(4,6,0) && !defined(__sun__) && !defined(__HAIKU__)
+ #define MLOCKED_DATA	__attribute__((__section__("mlocked_data")))
+ #define MLOCKED_TEXT	__attribute__((__section__("mlocked_text")))
+ #define MLOCKED_SECTION 1
+-- 
+2.30.0
+

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

@@ -0,0 +1,75 @@
+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="17fff86fa6bc061802822bf4b076e511c577b51c114855ff679a38a11e6ca79e"
+PATCHES="stress_ng-$portVersion.patchset"
+
+ARCHITECTURES="?x86_gcc2 x86_64"
+
+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:g++
+	cmd:make
+	"
+
+BUILD()
+{
+	touch config
+	make -f Makefile.config
+	make
+}
+
+INSTALL()
+{
+	mkdir -p  $binDir
+	cp stress-ng $binDir
+}

app-crypt/argon2/argon2-20200709.recipe

@@ -11,9 +11,9 @@ COPYRIGHT="2015-2017 Daniel Dinu
 LICENSE="Apache v2
 	Public Domain"
 REVISION="1"
-srcGitRev="cd5dd359960cea3962ace607d4915da7da5cf180"
+srcGitRev="440ceb9612d5a20997e3e12728542df2de713ca4"
 SOURCE_URI="https://github.com/P-H-C/phc-winner-argon2/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="98122d8520ee368f118c10c9e2598bf7de4eff766148e73bbe5b47462d740248"
+CHECKSUM_SHA256="bb7a9d6fa631fdb61b95a93596f2c9c38ad3035b774459b793acf46cd3502647"
 SOURCE_FILENAME="argon2-$srcGitRev.tar.gz"
 SOURCE_DIR="phc-winner-argon2-$srcGitRev"
 PATCHES="argon2-$portVersion.patchset"
@@ -68,6 +68,7 @@ PATCH()
 		sed -i 's,develop/headers,develop/headers/x86,g' Makefile
 		sed -i 's,LIBRARY_REL ?= lib,LIBRARY_REL ?= lib/x86,g' Makefile
 	fi
+	sed -i 's/-march=\$(OPTTARGET)//' Makefile
 }
 
 BUILD()

app-crypt/gnupg/gnupg-1.4.23.recipe

@@ -8,12 +8,12 @@ other applications."
 HOMEPAGE="https://gnupg.org/"
 COPYRIGHT="1998-2018 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
 CHECKSUM_SHA256="c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba"
 PATCHES="gnupg-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2"
 
 PROVIDES="
 	gnupg = $portVersion

app-crypt/gnupg/gnupg-2.2.27.recipe

@@ -6,9 +6,24 @@ well as access modules for all kinds of public key directories. GnuPG, also \
 known as GPG, is a command line tool with features for easy integration with \
 other applications."
 HOMEPAGE="https://gnupg.org/"
-COPYRIGHT="1998-2018 Free Software Foundation, Inc.
-	2000, Dimitrios Souflis
-	2008, 2009, 2010, 2012-2016  William Ahern"
+COPYRIGHT="1997-2019 Werner Koch
+	1994-2021 Free Software Foundation, Inc.
+	2003-2021 g10 Code GmbH
+	2002 Klarälvdalens Datakonsult AB
+	1995-1997, 2000-2007 Ulrich Drepper
+	1994 X Consortium
+	1998 by The Internet Society
+	1998-2004 The OpenLDAP Foundation
+	1998-2004 Kurt D. Zeilenga
+	1998-2004 Net Boolean Incorporated
+	2001-2004 IBM Corporation
+	1999-2003 Howard Y.H. Chu
+	1999-2003 Symas Corporation
+	1998-2003 Hallvard B. Furuseth
+	1992-1996 Regents of the University of Michigan
+	2000 Dimitrios Souflis
+	2008-2010,2012-2016 William Ahern
+	2017 Bundesamt für Sicherheit in der Informationstechnik"
 LICENSE="CC0 v1.0
 	GNU GPL v2
 	GNU GPL v3
@@ -16,10 +31,10 @@ LICENSE="CC0 v1.0
 	GNU LGPL v3"
 REVISION="1"
 SOURCE_URI="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$portVersion.tar.bz2"
-CHECKSUM_SHA256="61e83278fb5fa7336658a8b73ab26f379d41275bb1c7c6e694dd9f9a6e8e76ec"
+CHECKSUM_SHA256="34e60009014ea16402069136e0a5f63d9b65f90096244975db5cea74b3d02399"
 PATCHES="gnupg-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -39,6 +54,7 @@ PROVIDES="
 	cmd:gpgparsemail$secondaryArchSuffix
 	cmd:gpgscm$secondaryArchSuffix
 	cmd:gpgsm$secondaryArchSuffix
+	cmd:gpgsplit$secondaryArchSuffix
 	cmd:gpgtar$secondaryArchSuffix
 	cmd:gpgv$secondaryArchSuffix
 	cmd:kbxutil$secondaryArchSuffix
@@ -87,12 +103,14 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
+	cmd:aclocal
+	cmd:autoreconf
 	cmd:automake
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:pinentry$secondaryArchSuffix
@@ -107,7 +125,7 @@ TEST_REQUIRES="
 
 BUILD()
 {
-	./autogen.sh
+	autoreconf -vfi
 	runConfigure ./configure \
 		--libexecdir=$libDir/gnupg \
 		--enable-wks-tools \
@@ -127,9 +145,6 @@ INSTALL()
 
 TEST()
 {
-	# FAIL: tests/openpgp/{tofu,trust-pgp-[123],gpgconf}.scm
-	HOME="$sourceDir"/home
-	mkdir -p "$HOME"
-	export HOME
+	# FAIL: t-timestuff, t-gettime 
 	make check
 }

app-crypt/gnupg/patches/gnupg-2.2.27.patchset

@@ -1,14 +1,14 @@
-From 91a5f692cadcd200f06c8be18b6d404a22daea66 Mon Sep 17 00:00:00 2001
+From 1b7d94138cd9492b4bfda28fad7129bcac6355fc Mon Sep 17 00:00:00 2001
 From: "Charles W. Ross" <15680744+cwross@users.noreply.github.com>
 Date: Tue, 14 Jul 2020 13:55:34 -0600
 Subject: Fix detection of libnetwork
 
 
 diff --git a/configure.ac b/configure.ac
-index 1d05d39..1e7f9b3 100644
+index 7a2d410..0c9cf73 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1057,11 +1057,9 @@ AC_MSG_NOTICE([checking for networking options])
+@@ -1085,11 +1085,9 @@ AC_MSG_NOTICE([checking for networking options])
  # ELF runtime link paths), then link will fail and LDAP support won't
  # be detected.
  #
@@ -23,7 +23,7 @@ index 1d05d39..1e7f9b3 100644
  
  #
  # Check standard resolver functions.
-@@ -1074,8 +1072,8 @@ if test "$build_dirmngr" = "yes"; then
+@@ -1102,8 +1100,8 @@ if test "$build_dirmngr" = "yes"; then
    # the dirmngr option --standard-resolver.
  
    # the double underscore thing is a glibc-ism?
@@ -35,20 +35,20 @@ index 1d05d39..1e7f9b3 100644
                   AC_SEARCH_LIBS(__dn_expand,resolv bind,,have_resolver=no))
  
 -- 
-2.27.0
+2.30.0
 
 
-From 23caf740f3e35510bca78f473abe9c6875cc7c0e Mon Sep 17 00:00:00 2001
+From 0f99ded0e89ffb11d07584259ee6367949e0967e Mon Sep 17 00:00:00 2001
 From: "Charles W. Ross" <15680744+cwross@users.noreply.github.com>
 Date: Tue, 14 Jul 2020 13:59:24 -0600
 Subject: Add settings path for Haiku
 
 
 diff --git a/configure.ac b/configure.ac
-index 1e7f9b3..8454a4d 100644
+index 0c9cf73..6f53cb3 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -504,6 +504,8 @@ AH_BOTTOM([
+@@ -503,6 +503,8 @@ AH_BOTTOM([
  # endif
  #elif defined(__VMS)
  #define GNUPG_DEFAULT_HOMEDIR "/SYS$LOGIN/gnupg"
@@ -58,5 +58,5 @@ index 1e7f9b3..8454a4d 100644
  #define GNUPG_DEFAULT_HOMEDIR "~/.gnupg"
  #endif
 -- 
-2.27.0
+2.30.0
 

app-crypt/gpgme/gpgme-1.15.1.recipe

@@ -1,26 +1,20 @@
 SUMMARY="GnuPG Made Easy is a library for making GnuPG easier to use"
-DESCRIPTION="
-GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG \
+DESCRIPTION="GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG \
 easier for applications. It provides a High-Level Crypto API for \
 encryption, decryption, signing, signature verification and key management. \
 Currently it uses GnuPG as its backend but the API isn't restricted to \
-this engine; in fact we have already developed a backend for CMS (S/MIME).
-"
+this engine; in fact we have already developed a backend for CMS (S/MIME)."
 HOMEPAGE="http://www.gnupg.org/gpgme.html"
-COPYRIGHT="
-	1998-2018 Free Software Foundation, Inc.
-	2001-2010 g10 Code GmbH
-	"
-LICENSE="
-	GNU GPL v2
-	GNU LGPL v2.1
-	"
-REVISION="3"
+COPYRIGHT="1998-2020 Free Software Foundation, Inc.
+	2001-2021 g10 Code GmbH"
+LICENSE="GNU GPL v2
+	GNU LGPL v2.1"
+REVISION="1"
 SOURCE_URI="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-$portVersion.tar.bz2"
-CHECKSUM_SHA256="b4dc951c3743a60e2e120a77892e9e864fb936b2e58e7c77e8581f4d050e8cd8"
+CHECKSUM_SHA256="eebc3c1b27f1c8979896ff361ba9bb4778b508b2496c2fc10e3775a40b1de1ad"
 PATCHES="gpgme-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 x86 x86 x86_64"
+ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 libgpgmeVersion="11.21.0"

app-crypt/gpgme/patches/gpgme-1.15.1.patchset

@@ -1,4 +1,4 @@
-From 54b2d7cab751b041efbc6dfe3c6f2d1ea86a35a2 Mon Sep 17 00:00:00 2001
+From 1f62e93200d3307b0c777c27f3fe35cbd4d308b1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
 Date: Sun, 16 Nov 2014 14:50:17 +0100
 Subject: configure.ac: Haiku does have a thread-safe getenv
@@ -6,19 +6,19 @@ Subject: configure.ac: Haiku does have a thread-safe getenv
 Also force HAVE_PTHREAD.
 
 diff --git a/configure.ac b/configure.ac
-index 0dac6ce..c1e7477 100644
+index 628e5ff..b9d4410 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -218,6 +218,9 @@ case "${host}" in
- 	    AC_HELP_STRING([--enable-w32-glib], [build GPGME Glib for W32]),
- 	    		   build_w32_glib=$enableval)
-        ;;
+@@ -230,6 +230,9 @@ case "${host}" in
+     *-apple-darwin*)
+         have_macos_system=yes
+         ;;
 +    *-haiku*)
 +        have_thread_safe_getenv=yes
 +        ;;
-     *)
- 
- 	# XXX: Probably use exec-prefix here?
+ esac
+ case "${host}" in
+     *-mingw32*)
 -- 
-2.13.1
+2.30.0
 

app-crypt/johntheripper/johntheripper-1.9.0.recipe

@@ -9,14 +9,12 @@ COPYRIGHT="1996-2013 Solar Designer
 	2014 John the Ripper '-jumbo' authors"
 LICENSE="GNU GPL v2
 	John the Ripper"
-REVISION="2"
+REVISION="1"
 jumboVersion="1"
-SOURCE_URI="http://www.openwall.com/john/j/john-$portVersion-jumbo-$jumboVersion.tar.xz"
-CHECKSUM_SHA256="bac93d025995a051f055adbd7ce2f1975676cac6c74a6c7a3ee4cfdd9c160923"
+SOURCE_URI="http://www.openwall.com/john/k/john-$portVersion-jumbo-$jumboVersion.tar.xz"
+CHECKSUM_SHA256="f5d123f82983c53d8cc598e174394b074be7a77756f5fb5ed8515918c81e7f3b"
 SOURCE_DIR="john-$portVersion-jumbo-$jumboVersion"
-# Upstream patches, can be dropped in the next version
-PATCHES="johntheripper-$portVersion-upstreamed.patchset
-	johntheripper-$portVersion.patchset"
+PATCHES="johntheripper-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -33,7 +31,7 @@ PROVIDES="
 	johntheripper$secondaryArchSuffix = $portVersion
 	cmd:john = $portVersion
 	"
-bins=(calc_stat cprepair genmkvpwd luks2john mkvcalcproba raw2dyna
+bins=(calc_stat cprepair genmkvpwd mkvcalcproba raw2dyna
 	tgtsnarf uaf2john wpapcap2john)
 syms=(base64conv dmg2john gpg2john hccap2john keepass2john keychain2john
 	keyring2john keystore2john kwallet2john pfx2john putty2john pwsafe2john
@@ -68,9 +66,8 @@ BUILD_PREREQUIRES="
 	cmd:sed
 	"
 
-
-# Instruction sets for fallback chain
-instr=(ssse3 sse4.1 avx xop)
+# Instruction sets for fallback chain (AVX|XOP are not supported it seems)
+instr=(ssse3 sse4.1)
 # SSE2 is enabled by default for x86_64, but not for x86.
 # To check for enabled instruction set, run:
 # gcc -dM -E -x c /dev/null | grep -E "(MMX|SSE|AVX|XOP)"
@@ -86,7 +83,7 @@ BUILD()
 		#define CFG_ALT_NAME "$constantSettingsDir/john/john.ini"
 		#define CFG_PRIVATE_FULL_NAME "~config/john/john.conf"
 		#define CFG_PRIVATE_ALT_NAME "~config/john/john.ini"
-		#define CPU_FALLBACK 1
+		#define CPU_FALLBACK 0
 		#define JOHN_SYSTEMWIDE 1
 		#define JOHN_SYSTEMWIDE_EXEC "$libExecDir/john"
 		#define JOHN_SYSTEMWIDE_HOME "$dataDir/john"
@@ -117,7 +114,7 @@ INSTALL()
 {
 	install -d -m 755 "$dataDir/bash-completion/completions" \
 		"$dataDir/zsh/site-functions" \
-		"$dataDir/john" "$docDir" "$libExecDir/john" "$settingsDir/john" \
+		"$dataDir/john" "$docDir/extras" "$libExecDir/john" "$settingsDir/john" \
 		"$prefix/bin"
 
 	# configs
@@ -125,15 +122,14 @@ INSTALL()
 	sed run/john.conf > "$settingsDir/john/john.conf" \
 		-e "s|\$JOHN/john.local.conf|$constantSettingsDir/john/john.local.conf|g"
 
-	install -m 644 run/john.local.conf "$docDir/john.local.conf.example"
+	install -m 644 run/john.conf "$docDir/john.local.conf.example"
 	install -t "$dataDir/john" -m 644 run/*.conf
-	rm "$dataDir/john/"john{,.local}.conf
-
-	# docs
-	install -t "$docDir" -m 644 doc/*
+	#rm "$dataDir/john/"john{,.local}.conf
 
 	# remove stuff that only devs need
-	rm "$docDir/"{AddressSanitizer-HOWTO.txt,INSTALL*}
+	rm -rf doc/extras
+	# docs
+	install -t "$docDir" -m 644 doc/*
 
 	# licenses
 	rm "$docDir/COPYING" # no need for another GPL v2 copy

app-crypt/johntheripper/patches/johntheripper-1.8.0-upstreamed.patchset

@@ -1,119 +0,0 @@
-From 10525817cb0192c749ed6a1b98c3bdc627d61765 Mon Sep 17 00:00:00 2001
-From: Solar <solar@openwall.com>
-Date: Thu, 18 Dec 2014 21:24:01 +0100
-Subject: Fix a bug in truecrypt for non-x86 archs. Closes #912.
-
-
-diff --git a/src/truecrypt_fmt_plug.c b/src/truecrypt_fmt_plug.c
-index 1c95c39..8cef85e 100644
---- a/src/truecrypt_fmt_plug.c
-+++ b/src/truecrypt_fmt_plug.c
-@@ -310,8 +310,8 @@ static int crypt_all(int *pcount, struct db_salt *salt)
- 			pbkdf2_sha512_sse((const unsigned char **)pin, lens, psalt->salt, 64, psalt->num_iterations, &(x.poutc), sizeof(key), 0);
- 		}
- #else
--		if (is_sha512)
--			pbkdf2_sha512((const unsigned char*)key_buffer[i], strlen(key_buffer[i]), psalt->salt, 64, num_iterations, key, sizeof(key), 0);
-+		if (psalt->hash_type == IS_SHA512)
-+			pbkdf2_sha512((const unsigned char*)key_buffer[i], strlen((char*)key_buffer[i]), psalt->salt, 64, psalt->num_iterations, key, sizeof(key), 0);
- #endif
- 		else if (psalt->hash_type == IS_RIPEMD160)
- 			pbkdf2_ripemd160(key_buffer[i], strlen((char*)(key_buffer[i])), psalt->salt, 64, psalt->num_iterations, key, sizeof(key), 0);
--- 
-2.15.0
-
-
-From ef31fea6ee020e40857c52ab5310003b6fc7844f Mon Sep 17 00:00:00 2001
-From: magnum <john.magnum@hushmail.com>
-Date: Wed, 13 May 2015 12:05:00 +0200
-Subject: Add another solution to #1093. This make it possible to build using
- gcc 5 without --std=gnu89 (although I kept the latter for now). See also
- #1250.
-
-
-diff --git a/src/DES_bs_b.c b/src/DES_bs_b.c
-index e97c4de..0a48ff2 100644
---- a/src/DES_bs_b.c
-+++ b/src/DES_bs_b.c
-@@ -1247,6 +1247,9 @@ static MAYBE_INLINE void DES_bs_finalize_keys(void)
- #endif
- 
- #if DES_bs_mt
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE void DES_bs_set_salt_for_thread(int t, unsigned int salt)
- #else
- void DES_bs_set_salt(ARCH_WORD salt)
-diff --git a/src/MD5_std.c b/src/MD5_std.c
-index 40bf79e..842eb38 100644
---- a/src/MD5_std.c
-+++ b/src/MD5_std.c
-@@ -490,9 +490,15 @@ extern void MD5_body(MD5_word x[15], MD5_word out[4]);
- #if MD5_std_mt
- #define MD5_body(x, out) \
- 	MD5_body_for_thread(t, x, out)
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE_BODY void MD5_body_for_thread(int t,
- 	MD5_word x[15], MD5_word out[4])
- #else
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4])
- #endif
- {
-@@ -589,10 +595,16 @@ MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4])
- #if MD5_std_mt
- #define MD5_body(x0, x1, out0, out1) \
- 	MD5_body_for_thread(t, x0, x1, out0, out1)
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE_BODY void MD5_body_for_thread(int t,
- 	MD5_word x0[15], MD5_word x1[15],
- 	MD5_word out0[4], MD5_word out1[4])
- #else
-+#if __GNUC__ >= 5
-+extern
-+#endif
- MAYBE_INLINE_BODY void MD5_body(MD5_word x0[15], MD5_word x1[15],
- 	MD5_word out0[4], MD5_word out1[4])
- #endif
--- 
-2.15.0
-
-
-From db958159908e72908c5d366883ca19159eae7bb7 Mon Sep 17 00:00:00 2001
-From: Leorize <alaviss@users.noreply.github.com>
-Date: Sat, 23 Dec 2017 11:25:01 +0700
-Subject: idle: add Haiku support
-
-
-diff --git a/src/idle.c b/src/idle.c
-index 1515833..225dfae 100644
---- a/src/idle.c
-+++ b/src/idle.c
-@@ -35,7 +35,7 @@ static int use_yield = 0;
- extern int nice(int);
- #endif
- 
--#ifdef __BEOS__
-+#if defined(__BEOS__) || defined(__HAIKU__)
- #include <OS.h>
- #endif
- 
-@@ -78,7 +78,7 @@ void idle_init(struct fmt_main *format)
- #if defined(__MINGW32__) || defined (_MSC_VER)
- 	SetPriorityClass(GetCurrentProcess(), IDLE_PRIORITY_CLASS);
- 	SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_IDLE);
--#elif defined(__BEOS__)
-+#elif defined(__BEOS__) || defined(__HAIKU__)
- 	set_thread_priority(getpid(), 1);
- #else
- /*
--- 
-2.15.0
-

app-crypt/johntheripper/patches/johntheripper-1.9.0.patchset

@@ -1,19 +1,50 @@
-From e70ffaaaa9542949d6a371b9755914d1a093b28b Mon Sep 17 00:00:00 2001
+From 58fbb6cc44d44ea7fdc268d7f3f91747c69d0a6c Mon Sep 17 00:00:00 2001
 From: Leorize <alaviss@users.noreply.github.com>
 Date: Sun, 24 Dec 2017 19:41:43 +0700
-Subject: path: add expansion for "~config" and "~data"
+Subject: Import partial patch from 1.8.0 by Leorize
 
-This commit enable the ability to dynamically expand user configuration
-folder and user data folder for Haiku.
-
-This could also be further extended to support XDG Base Directory
-Specification.
 
+diff --git a/src/params.h b/src/params.h
+index b6d7cd1..d46eef5 100644
+--- a/src/params.h
++++ b/src/params.h
+@@ -111,8 +111,10 @@
+ #ifndef JOHN_SYSTEMWIDE_HOME
+ #define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
+ #endif
++#ifndef JOHN_PRIVATE_HOME
+ #define JOHN_PRIVATE_HOME		"~/.john"
+ #endif
++#endif
+ 
+ #ifndef OMP_FALLBACK
+ #define OMP_FALLBACK			0
+@@ -162,16 +164,20 @@
+  * File names.
+  */
+ #ifdef __DJGPP__
++#ifndef CFG_FULL_NAME
+ #define CFG_FULL_NAME			"$JOHN/john.ini"
+ #else
+ #define CFG_FULL_NAME			"$JOHN/john.conf"
+ #endif
++#endif
+ #if JOHN_SYSTEMWIDE
+ #ifdef __DJGPP__
++#ifndef CFG_PRIVATE_FULL_NAME
+ #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.ini"
+ #else
+ #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
+ #endif
++#endif
+ #define POT_NAME			JOHN_PRIVATE_HOME "/john.pot"
+ #define SEC_POT_NAME			JOHN_PRIVATE_HOME "/secure.pot"
+ #define LOG_NAME			JOHN_PRIVATE_HOME "/john.log"
 diff --git a/src/path.c b/src/path.c
-index 14f6310..444ecb8 100644
+index 06714e5..7ebf010 100644
 --- a/src/path.c
 +++ b/src/path.c
-@@ -31,9 +31,16 @@ static int john_home_lengthex;
+@@ -30,9 +30,16 @@ static int john_home_length;
  #include <pwd.h>
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -29,9 +60,9 @@ index 14f6310..444ecb8 100644
 +static int user_data_length;
  #endif
  
- #include "memdbg.h"
-@@ -66,6 +73,26 @@ void path_init(char **argv)
- 	memcpy(user_home_path, pw->pw_dir, user_home_length - 1);
+ 
+@@ -72,6 +79,26 @@ void path_init(char **argv)
+ 	memcpy(user_home_path, home_dir, user_home_length - 1);
  	user_home_path[user_home_length - 1] = '/';
  
 +	if (user_config_path) return;
@@ -57,7 +88,7 @@ index 14f6310..444ecb8 100644
  #ifdef JOHN_PRIVATE_HOME
  	private = path_expand(JOHN_PRIVATE_HOME);
  	if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) {
-@@ -166,6 +193,24 @@ char *path_expand(char *name)
+@@ -131,6 +158,24 @@ const char *path_expand(const char *name)
  		}
  		return name + 2;
  	}
@@ -82,17 +113,16 @@ index 14f6310..444ecb8 100644
  #endif
  
  	return name;
-@@ -200,6 +245,8 @@ void path_done(void)
+@@ -200,5 +245,7 @@ void path_done(void)
  	MEM_FREE(john_home_path);
  #if JOHN_SYSTEMWIDE
  	MEM_FREE(user_home_path);
 +	MEM_FREE(user_config_path);
 +	MEM_FREE(user_data_path);
  #endif
- 	if (john_home_pathex)
- 		MEM_FREE(john_home_pathex);
+ }
 diff --git a/src/path.h b/src/path.h
-index eeb4b04..9b64e80 100644
+index c5393d7..0c13241 100644
 --- a/src/path.h
 +++ b/src/path.h
 @@ -21,7 +21,7 @@
@@ -103,96 +133,58 @@ index eeb4b04..9b64e80 100644
 + * Expands "$JOHN/", "~/", "~config/" and "~data/" in a path name.
   * The returned buffer might be overwritten with subsequent calls.
   */
- extern char *path_expand(char *name);
--- 
-2.15.0
-
-
-From a531b588f256bb4a4f559ffc23e861ca31b9e556 Mon Sep 17 00:00:00 2001
-From: Leorize <alaviss@users.noreply.github.com>
-Date: Sun, 24 Dec 2017 20:17:07 +0700
-Subject: params: allow changing various paths
-
-
-diff --git a/src/params.h b/src/params.h
-index 29e6509..bd1ee50 100644
---- a/src/params.h
-+++ b/src/params.h
-@@ -90,8 +90,10 @@
- #ifndef JOHN_SYSTEMWIDE_HOME
- #define JOHN_SYSTEMWIDE_HOME		"/usr/share/john"
- #endif
-+#ifndef JOHN_PRIVATE_HOME
- #define JOHN_PRIVATE_HOME		"~/.john"
- #endif
-+#endif
- 
- #ifndef OMP_FALLBACK
- #define OMP_FALLBACK			0
-@@ -140,11 +142,19 @@
- /*
-  * File names.
-  */
-+#ifndef CFG_FULL_NAME
- #define CFG_FULL_NAME			"$JOHN/john.conf"
-+#endif
-+#ifndef CFG_ALT_NAME
- #define CFG_ALT_NAME			"$JOHN/john.ini"
-+#endif
- #if JOHN_SYSTEMWIDE
-+#ifndef CFG_PRIVATE_FULL_NAME
- #define CFG_PRIVATE_FULL_NAME		JOHN_PRIVATE_HOME "/john.conf"
-+#endif
-+#ifndef CFG_PRIVATE_ALT_NAME
- #define CFG_PRIVATE_ALT_NAME		JOHN_PRIVATE_HOME "/john.ini"
-+#endif
- #define POT_NAME			JOHN_PRIVATE_HOME "/john.pot"
- #define SEC_POT_NAME			JOHN_PRIVATE_HOME "/secure.pot"
- #define LOG_NAME			JOHN_PRIVATE_HOME "/john.log"
--- 
-2.15.0
-
-
-From 58dc5c82ea65bc7ca176b52c2729560bb6be90b6 Mon Sep 17 00:00:00 2001
-From: Leorize <alaviss@users.noreply.github.com>
-Date: Wed, 27 Dec 2017 12:00:07 +0700
-Subject: x86-64: disable SIMD code path for NT fmt on Haiku
-
-
+ extern const char *path_expand(const char *name);
 diff --git a/src/x86-64.S b/src/x86-64.S
-index 80cce05..9905794 100644
+index 9b8e369..915d9a2 100644
 --- a/src/x86-64.S
 +++ b/src/x86-64.S
-@@ -1672,6 +1672,7 @@ CPU_detect_fail:
+@@ -1750,6 +1750,6 @@ CPU_detect_fail:
  	ret
  #endif
  
-+#ifdef NT_X86_64
- /* The following was written by Alain Espinosa <alainesp at gmail.com> in 2007.
-  * No copyright is claimed, and the software is hereby placed in the public domain.
-  * In case this attempt to disclaim copyright and place the software in the
-@@ -2029,6 +2030,7 @@ nt_crypt_all_8859_1_x86_64:
- 	xchgq %r8,%rax
- 	EPILOGUE
- 	ret
-+#endif
- 
- #if defined(__ELF__) && defined(__linux__)
+-#if defined(__ELF__) && defined(__linux__)
++#if defined(__ELF__) && defined(__linux__) && defined(__HAIKU__)
  .section .note.GNU-stack,"",@progbits
+ #endif
 diff --git a/src/x86-64.h b/src/x86-64.h
-index 12dc07a..6696ac0 100644
+index f77c44a..d13b126 100644
 --- a/src/x86-64.h
 +++ b/src/x86-64.h
-@@ -314,7 +314,9 @@
- #define MMX_TYPE			" SSE2"
- #define MMX_COEF			4
+@@ -317,7 +317,9 @@
+ #define SHA512_N_STR		PARA_TO_N(SIMD_COEF_64)
+ #endif
  
 +#ifndef __HAIKU__
  #define NT_X86_64
 +#endif
  
- #define MMX_COEF_SHA256 4
- #define MMX_COEF_SHA512 2
+ #endif	/* !defined(JOHN_NO_SIMD) */
+ 
 -- 
-2.15.0
+2.28.0
+
+
+From f1c24e8655cad397aa70e6f376825d44215828b5 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 28 Nov 2020 13:34:46 +0000
+Subject: BYTE_ORDER is defined in endian.h
+
+
+diff --git a/src/int-util.h b/src/int-util.h
+index ae32613..cf82552 100644
+--- a/src/int-util.h
++++ b/src/int-util.h
+@@ -13,6 +13,10 @@
+ #include <sys/param.h>
+ #endif
+ 
++#if defined(__HAIKU__)
++#include <endian.h>
++#endif
++
+ #if defined(_MSC_VER)
+ #include <stdlib.h>
+ // VC has no sys/parm.h   These defines were taken from defines found on cygwin
+-- 
+2.28.0
 

app-editors/jdtextedit/additional-files/distribution.json

@@ -0,0 +1,4 @@
+{
+	"enableUpdater": false,
+	"aboutMessage": "jdTextEdit was installed from HaikuDepot"
+}

app-editors/jdtextedit/additional-files/jdtextedit.rdef

@@ -0,0 +1,69 @@
+resource app_signature "application/x-vnd.jdtextedit";
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = 8,
+	middle = 2,
+	minor  = 0,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "An advanced text editor",
+	long_info = "An advanced text editor"
+};
+
+resource large_icon array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFFDDDDD5D4D4D4D4D4FFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFD5DDDDDDDDDDDDDDD4D4D4D4D4D4FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFD4D4D4D5DD27272727272726DDD4D4D4D5DDFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFD3D4D4DC2626272727272727262625DCD4D4DDDDFFFFFFFFFFFF"
+	$"FFFFFFFFFFB3B3D3D4252526262626262626262625D4D3D3D4DDDDFFFFFFFFFF"
+	$"FFFFFFFFD3B3D3D3D425262626DDDCDCDCDD26262625D3D3D3D4DD27FFFFFFFF"
+	$"FFFFFFD4D4D3D3D3DC26DDDCD4D4D4D4D4D4D4D4D52626D4D3D3D4DD04FFFFFF"
+	$"FFFFD4D4D3D3D3D426DCD4D4D4D4D4D4D4D4D487AEDC2626D4D3D3D42828FFFF"
+	$"FFFFDDD4D3D3D425DCD4D4D3D3D3D3D3D3ADADAD87B4D4DDD5AED3D32728FFFF"
+	$"FFDDDDD4D3D3DDDCD4D4D3D3D3D3D3D3D3878D87ADADD4D4AEAED3D3DC2829FF"
+	$"FF27DDD3D3D4DCD4D4D3D3D3D3D3B3ADAD87878DADD4B4AED5DDDCD3D42729FF"
+	$"FF28DCD3D426D4D4D3D3D3D3B3B3878DAD8787ADD3AEAED4DD2626D4D42629FF"
+	$"2804DCD3DCDCD4D4D3D3D3B3ADAD8717AD878DD3AEAED4D4DC252625DC252929"
+	$"2928DCD425DCD4D3D3D3D3ADAD8787878787ADAEADD4D4D4D4DC2626DCDC2829"
+	$"2928DCDC26DCD4D3D3D3B3ADAD87878787ADAED4D4D4D4D4D4DC2626DCD42829"
+	$"2928DCDC26DCD4D3D3D3B3AD87878787AD87ADD4D4D3D3D4D4DC2626D4D42729"
+	$"2927D4DC26DCD4D3D3ADAD8787878DADADAE87D3D3D3D3D4D4DC2626D4D32729"
+	$"2927D4D426DCD4D387AD87878DADADAEB4D4D3D3D3D3D3D4D4DC2626D3D32729"
+	$"2928D3D426DCD4AD87878787ADADAEB4D4D3D3D3D3D3D4D4D4DD2625D3D32829"
+	$"2828D4D3DC25D4D4D387ADADB3B4D4D4D3D3D3D3D3D3D4D4DC2626DCD3D42929"
+	$"FF28DCD3D426D4D48DD3ADD3B4D4D4D3D3D3D3D3D3D4D4D4DC2626D3D3DD29FF"
+	$"FF27DDD3D325D5AE87B3D3AEAED4D3D3D3D3D3D3D4D4D4DC262625D3D32702FF"
+	$"FFDDDDD4D3D426D4AED4AE87D4D4D3D3D3D3D3D4D4D4DC252626D4D3DC2829FF"
+	$"FFFFDDD4D3D3DC26D4AE11D4D4D4D4D4D4D4D4D4D4DC252626DCD4D42728FFFF"
+	$"FFFFD4D4D4D4D3D4AE0FD5DCD4D4D4D4D4D4D4DCDC26262625D4DCDD28FFFFFF"
+	$"FFFFFFD4D4D4D4D4AED52625DCDCDCDCDCDCDC2626262625DCDCDDDE04FFFFFF"
+	$"FFFFFFFFD3D3D4D4DCDC262626262626262626262626252425DDDD27FFFFFFFF"
+	$"FFFFFFFFFFB3B3D4DC252425262626262626262625252526DDDDDDFFFFFFFFFF"
+	$"FFFFFFFFFFFFD3D4D4DC262525252525252526262626DDD5DDDDFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFD4D4D4D5DD2626262627272626DDD4D4D5DDFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFD5DDDDDDDDDDDDD5D4D4D4D4D4D4FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFDDDDD5D4D4D4D4D4FFFFFFFFFFFFFFFFFFFFFFFF"
+};
+
+resource mini_icon array {
+	$"FFFFFFFFFFDDDDDDD4D4D4FFFFFFFFFF"
+	$"FFFFFFD4D42627272726DCD4DDFFFFFF"
+	$"FFFFB3D3DC262626262625D3D4DEFFFF"
+	$"FFD4D3D325D4D4D4D4D4D425D3D428FF"
+	$"FFD4D3DDD4D3D3D3AD8787D4AED327FF"
+	$"28D4D4D4D3D3D3878787D4AEDDDCDC29"
+	$"28D4DDD4D3B3AD8787ADAED4DC26DC29"
+	$"29DCDCD4D3AD8787ADAED4D4DC26D429"
+	$"28D4DCD4AD8787ADB4B3D3D4DC26D329"
+	$"28D326D48D8DADB4D3D3D3D4DC26D329"
+	$"28D4DCD4ADD3D4D3D3D3D4D426D4DC29"
+	$"FFDDD3DDD4AED4D3D3D4D42626D428FF"
+	$"FFD4D4D4AEDDDCD4DCDC2626DCDD28FF"
+	$"FFFFB3D4DC25262626262525DD27FFFF"
+	$"FFFFFFD4D42626262626DDD5DDFFFFFF"
+	$"FFFFFFFFFFDDDDD5D4D4D4FFFFFFFFFF"
+};

app-editors/jdtextedit/jdtextedit-8.3.recipe

@@ -0,0 +1,63 @@
+SUMMARY="An advanced text editor"
+DESCRIPTION="An advanced text editor, written in Python, with useful features:
+* Syntax highlighting
+* Code completion
+* Session restore
+* Code folding
+* Macros
+* External commands
+* Spell checker"
+HOMEPAGE="https://gitlab.com/JakobDev/jdTextEdit"
+COPYRIGHT="2019-2021 JakobDev"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://gitlab.com/JakobDev/jdTextEdit/-/archive/$portVersion/jdTextEdit-$portVersion.tar.gz"
+CHECKSUM_SHA256="2eaf2a1f13105f6f450b010ee468694597bd409d6fa32dd578d7a21fde0ebb75"
+SOURCE_DIR="jdTextEdit-$portVersion"
+ADDITIONAL_FILES="
+	distribution.json
+	jdtextedit.rdef
+	"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	jdtextedit = $portVersion
+	app:jdTextEdit = $portVersion
+	"
+REQUIRES="
+	haiku
+	cmd:python3.8
+	chardet_python38
+	editorconfig_core_py_python38
+	jdtranslationhelper_python38
+	pyenchant_python38
+	pyqt5_python38
+	qscintilla_python38
+	requests_python38
+	setuptools_python38
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	setuptools_python38
+	"
+
+INSTALL()
+{
+	python3.8 setup.py install \
+		--root=/ --prefix=$prefix \
+		--install-data=$dataDir
+
+	cp $portDir/additional-files/distribution.json \
+		$prefix/lib/python3.8/vendor-packages/jdTextEdit/distribution.json
+
+	mkdir -p $appsDir
+	mv $prefix/bin/jdTextEdit $appsDir/jdTextEdit
+	settype -t application/x-vnd.Be-elfexecutable $appsDir/jdTextEdit
+
+	rc  $portDir/additional-files/jdtextedit.rdef
+	resattr -o $appsDir/jdTextEdit  $portDir/additional-files/jdtextedit.rsrc
+
+	addAppDeskbarSymlink $appsDir/jdTextEdit
+}

app-editors/nano/nano-5.7.recipe

@@ -16,7 +16,7 @@ COPYRIGHT="1999-2020 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
 REVISION="1"
 SOURCE_URI="https://www.nano-editor.org/dist/v5/nano-$portVersion.tar.xz"
-CHECKSUM_SHA256="7c0d94be69cd066f20df2868a2da02f7b1d416ce8d47c0850a8bd270897caa36"
+CHECKSUM_SHA256="d4b181cc2ec11def3711b4649e34f2be7a668e70ab506860514031d069cccafa"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"

app-editors/retext/retext-7.0.1.recipe

@@ -5,50 +5,52 @@ HOMEPAGE="https://github.com/retext-project/retext"
 COPYRIGHT="2011–2016 Dmitry Shachnev
 	2011–2016 Maurice van der Pot"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="4"
 SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz"
 CHECKSUM_SHA256="c32ccdbcf31094258c792bc0589ff3ff212dea85466d776b7f60fa7b39da4b6c"
 PATCHES="retext-$portVersion.patchset"
 
-ARCHITECTURES="any"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	retext$secondaryArchSuffix = $portVersion
-	cmd:retext$secondaryArchSuffix = $portVersion
+	cmd:retext = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	markdown_python3
-	markups_python3
-	pyqt_python3
-	cmd:python3
+	markdown_python38
+	markups_python38
+	pyqt5_python38
+	cmd:python3.8
 	lib:libxcb$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	pyqt_python3 >= 5
-	setuptools_python3
+	pyqt5_python38
+	setuptools_python38
 	"
 BUILD_PREREQUIRES="
-	cmd:lrelease
-	cmd:python3
+	cmd:lrelease$secondaryArchSuffix >= 5
+	cmd:python3.8
 	"
 
 TEST_REQUIRES="
-	markups_python3
+	markups_python38
+	python_markdown_math_python38
 	qthaikuplugins$secondaryArchSuffix
 	"
 
 BUILD()
 {
-	$portPackageLinksDir/cmd~python3/bin/python3 setup.py build
+	$portPackageLinksDir/cmd~python3.8/bin/python3.8 setup.py build
 }
 
 INSTALL()
 {
 	# GENERIC: all python_setuptools-based installs need this
-	python=$portPackageLinksDir/cmd~python3/bin/python3
+	python=$portPackageLinksDir/cmd~python3.8/bin/python3.8
 	pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
 	installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
 	export PYTHONPATH=$installLocation:$PYTHONPATH
@@ -63,5 +65,5 @@ INSTALL()
 
 TEST()
 {
-	python3 setup.py test
+	python3.8 setup.py test
 }

app-editors/vim/vim-8.2.2501.recipe

@@ -10,11 +10,11 @@ configuration files.
 Despite this, Vim can be configured to work in a very simple (Notepad-like) \
 way, called evim or Easy Vim."
 HOMEPAGE="https://www.vim.org/"
-COPYRIGHT="1991-2020 Bram Moleenar et al."
+COPYRIGHT="1991-2021 Bram Moleenar et al."
 LICENSE="Vim"
 REVISION="1"
 SOURCE_URI="https://github.com/vim/vim/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="fbb96732953cd257e4ac0d6ef962c369952d35b28e18bfaae175ea255d6d13e4"
+CHECKSUM_SHA256="f38e9e14eed5b0d82e68720c53a1ef15dc1e10551f7c5026d0669b1cf24d7268"
 SOURCE_FILENAME="vim-$portVersion.tar.gz"
 
 ARCHITECTURES="!x86_gcc2 x86_64"

app-emulation/81_libretro/81_libretro-1.0a_20210311.recipe

@@ -6,9 +6,9 @@ HOMEPAGE="https://github.com/libretro/81-libretro/"
 COPYRIGHT="2008-2018 Michael D Wynne, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="7d769d09b1b6932466272aaf82b37922c1e2e61f"
+srcGitRev="028da99de5a69c1d067eb3f270c0507377c83bb7"
 SOURCE_URI="https://github.com/libretro/81-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="732aefb2058ac6c506534a3986af9001e9f495fc08db9c98d386843429e38c76"
+CHECKSUM_SHA256="76a5c2520b7d1e73e7950398cc5ed68c33aa6aa99b29d6bb039b78237a745240"
 SOURCE_FILENAME="81-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="81-libretro-$srcGitRev"
 ADDITIONAL_FILES="81_libretro.info.in"

app-emulation/81_libretro/additional-files/81_libretro.info.in

@@ -30,3 +30,5 @@ needs_fullpath = "false"
 disk_control = "false"
 is_experimental = "false"
 notes = "[1] Amstrad have kindly given their permission for the redistribution|[^] of their copyrighted material but retain that copyright."
+
+description = "A work-in-progress port of EightyOne (a.k.a. THE Sinclair Emulator) to libretro. The core currently only emulates the Sinclair ZX81 with 16Kb RAM and correctly loads and runs many games in the "p" and "tzx" formats. The core will attempt to autoconfigure any games that are included in its internal database, which includes many homebrew and colorized games. While EightyOne is capable of emulating some ZX Spectrum machines, they are not included in this core, as they are already covered by the Fuse libretro core."

app-emulation/aranym/aranym-1.1.0.recipe

@@ -0,0 +1,62 @@
+SUMMARY="Atari Running on Any Machine"
+DESCRIPTION="ARAnyM (Atari Running on Any Machine) is a multiplatform virtual \
+machine for running Atari ST/TT/Falcon operating systems and applications."
+HOMEPAGE="https://aranym.github.io/"
+COPYRIGHT="2001-2014 ARAnyM developer team"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://github.com/aranym/aranym/archive/ARANYM_${portVersion//./_}.tar.gz"
+CHECKSUM_SHA256="1636cf9ec68bd2089f537e3b5e82d04fafec61a4f8fb5e216a263d357e935b63"
+SOURCE_FILENAME="anarym-$portVersion.tar.gz"
+SOURCE_DIR="aranym-ARANYM_${portVersion//./_}"
+PATCHES="aranym-$portVersion.patchset"
+
+ARCHITECTURES="!x86_gcc2 x86_64"
+
+PROVIDES="
+	aranym = $portVersion
+	app:ARAnyM = $portVersion
+	cmd:aranym = $portVersion
+	"
+REQUIRES="
+	haiku
+	lib:libsdl
+	lib:libsdl_image
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libsdl
+	devel:libSDL_image
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:gcc
+	cmd:make
+	"
+
+BUILD()
+{
+	WITHDISDIP=""
+	if [ $effectiveTargetArchitecture == x86_gcc2 ]; then
+		WITHDISDIP="--enable-disdip"
+	fi
+
+	NO_CONFIGURE=1 ./autogen.sh
+
+	export CXXFLAGS="$CXXFLAGS -Wno-unused-function -Wno-unused-variable"
+	export CFLAGS="$CFLAGS -Wno-unused-function -Wno-unused-variable"
+	runConfigure ./configure --enable-fpe=uae --enable-cxx-exceptions $WITHDISDIP
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $docDir
+
+	make install
+
+	mimeset $prefix/bin/aranym
+	addAppDeskbarSymlink /bin/aranym ARAnyM
+}

app-emulation/aranym/patches/aranym-1.1.0.patchset

@@ -0,0 +1,21 @@
+From a46c58e7ce229a6de67d03a1cb751494d4731c51 Mon Sep 17 00:00:00 2001
+From: Gabriele Baldassarre <gabriele@gabrielebaldassarre.com>
+Date: Sun, 14 Jun 2020 23:28:00 +0200
+Subject: Haiku proper  path to config folder
+
+
+diff --git a/configure.ac b/configure.ac
+index 4c5fd67..59222c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -519,6 +519,7 @@ case "$host_os" in
+     AC_PATH_PROG(BEOS_SETVERSION, setversion, [AC_MSG_ERROR([setversion not found.])])
+     WANT_UNIXSERIALPORT=no
+     ac_cv_tun_tap_support=no
++	AC_DEFINE([ARANYMHOME], "config/settings/aranym")
+     ;;
+   *)
+     ;;
+-- 
+2.26.0
+

app-emulation/atari800_libretro/additional-files/atari800_libretro.info.in

@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Atari - 5200 (Atari800)"
 authors = "Petr Stehlik"
-supported_extensions = "xfd|atr|atx|cdm|cas|bin|a52|xex|zip"
+supported_extensions = "xfd|atr|cdm|cas|bin|a52|zip|atx|car|com|xex"
 corename = "Atari800"
 categories = "Emulator"
 license = "GPLv2"
@@ -37,3 +37,5 @@ firmware0_desc = "5200.rom (5200 BIOS)"
 firmware0_path = "5200.rom"
 firmware0_opt = "false"
 notes = "(!) 5200.rom (md5): 281f20ea4320404ec820fb7ec0693b38"
+
+description = "A port of the free and portable Atari800 emulator to libretro. This core supports games and programs written for the Atari 8-bit computers (400, 800, 600 XL, 800XL, 130XE) and 5200 console. When loaded, the core should boot to the Atari Computer - Memo Pad screen and will generate a .atari800.cfg config file in the frontend's home directory and will add the required BIOS files it detects in the frontend's system directory to the config file. Once that is done, users may manually select which Atari system to emulate through the Atari System core option. These and other options can also be modified through the core's own menu, accessible through the retrokeyboard's F1 key."

app-emulation/atari800_libretro/atari800_libretro-3.1.0_20210415.recipe

@@ -6,9 +6,9 @@ HOMEPAGE="https://atari800.github.io/"
 COPYRIGHT="2001-2018, the Atari800 Dev team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="bda9478afca6b25a1c3899a31a934f1b17cdea40"
+srcGitRev="86c87b543f2076e7edcff5d7f5031845ca4ffb96"
 SOURCE_URI="https://github.com/libretro/libretro-atari800/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="76962b2d75cecb3565dd703bb59e1a9c86efca834351b5ec9044d93bbe086ea4"
+CHECKSUM_SHA256="6a477a7eeb26bb2cdc3890d841ab5900eb1456d0e7190171237ca4ccfe526623"
 SOURCE_FILENAME="libretro-atari800-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-atari800-$srcGitRev"
 ADDITIONAL_FILES="atari800_libretro.info.in"

app-emulation/bk_libretro/additional-files/bk_libretro.info.in

@@ -0,0 +1,50 @@
+display_name = "Elektronika - BK-0010/BK-0011(M)"
+authors = "Eric A. Edwards, Leonid A. Broukhis, emestee, arcade-mini, phcoder"
+supported_extensions = "bin"
+corename = "bk"
+categories = "Computer"
+database = "BK-0010/BK-0011"
+systemname = "BK-0010/BK-0011(M)"
+license = "BSD"
+permissions = ""
+display_version = "@DISPLAY_VERSION@"
+supports_no_game = "true"
+
+# BIOS/Firmware
+firmware_count = 8
+
+firmware0_desc = "bk/B11M_BOS.ROM"
+firmware0_path = "bk/B11M_BOS.ROM"
+firmware0_opt = "true"
+
+firmware1_desc = "bk/B11M_EXT.ROM"
+firmware1_path = "bk/B11M_EXT.ROM"
+firmware1_opt = "true"
+
+firmware2_desc = "bk/BAS11M_0.ROM"
+firmware2_path = "bk/BAS11M_0.ROM"
+firmware2_opt = "true"
+
+firmware3_desc = "bk/BAS11M_1.ROM"
+firmware3_path = "bk/BAS11M_1.ROM"
+firmware3_opt = "true"
+
+firmware4_desc = "bk/DISK_327.ROM"
+firmware4_path = "bk/DISK_327.ROM"
+firmware4_opt = "true"
+
+firmware5_desc = "bk/BASIC10.ROM"
+firmware5_path = "bk/BASIC10.ROM"
+firmware5_opt = "true"
+
+firmware6_desc = "bk/FOCAL10.ROM"
+firmware6_path = "bk/FOCAL10.ROM"
+firmware6_opt = "true"
+
+firmware7_desc = "bk/MONIT10.ROM"
+firmware7_path = "bk/MONIT10.ROM"
+firmware7_opt = "true"
+
+notes = "(!) bk/B11M_BOS.ROM (md5): fe4627d1e3a1535874085050733263e7|(!) bk/B11M_EXT.ROM (md5): dc52f365d56fa1951f5d35b1101b9e3f|(!) bk/BAS11M_0.ROM (md5): 946f6f23ded03c0e26187f0b3ca75993|(!) bk/BAS11M_1.ROM (md5): 1e6637f32aa7d1de03510030cac40bcf|(!) bk/DISK_327.ROM (md5): 5015228eeeb238e65da8edcd1b6dfac7|(!) bk/BASIC10.ROM (md5): 3fa774326d75410a065659aea80252f0|(!) bk/FOCAL10.ROM (md5): 5737f972e8638831ab71e9139abae052|(!) bk/MONIT10.ROM (md5): 95f8c41c6abf7640e35a6a03cecebd01"
+
+description = "A port of the PDP11 emulator to libretro. This core emulates the Soviet Electronica BK computers series, including the BK-0010, BK-0010.01 and BK-0011(M), as well as the Terak 8510/a, which is a 1976 American PDP-11/03 platform that the Electronica BK series were designed after. The BK series computers were the first mass-produced, affordable personal computers in Russia in the 1980s and they had a tremendous effect on the development of the Russian-speaking software community, similar to the C64, ZX Spectrum and Atari 2600 communities elsewhere in the world. These computers will accept console commands in English but respond mostly in Russian, so this core is mostly of use to Russian-speaking users."

app-emulation/bk_libretro/bk_libretro-1.0_20210315.recipe

@@ -0,0 +1,59 @@
+SUMMARY="A Soviet Electronica BK computers emulator core for libretro"
+DESCRIPTION="This core emulates the Soviet Electronica BK computers series, \
+including the BK-0010, BK-0010.01 and BK-0011(M), as well as the Terak \
+8510/a, which is a 1976 American PDP-11/03 platform that the Electronica BK \
+series were designed after. The BK series computers were the first \
+mass-produced, affordable personal computers in Russia in the 1980s and they \
+had a tremendous effect on the development of the Russian-speaking software \
+community, similar to the C64, ZX Spectrum and Atari 2600 communities \
+elsewhere in the world. These computers will accept console commands in \
+English but respond mostly in Russian, so this core is mostly of use to \
+Russian-speaking users."
+HOMEPAGE="http://www.mailcom.com/bk0010/index_en.shtml"
+COPYRIGHT="1994-2021, Eric A. Edwards, Leonid A. Broukhis, the libretro team"
+LICENSE="MIT"
+REVISION="1"
+srcGitRev="70f4a2d812379b8e3e3c7ed3025d08583dee98b1"
+SOURCE_URI="https://github.com/libretro/bk-emulator/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="872f4dc1d74abde95b3b052e1fd6f4443e39ee4dd9a566732577163721ab4749"
+SOURCE_FILENAME="bk-emulator-${portVersion/_/-}-$srcGitRev.tar.gz"
+SOURCE_DIR="bk-emulator-$srcGitRev"
+ADDITIONAL_FILES="bk_libretro.info.in"
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	bk_libretro$secondaryArchSuffix = $portVersion
+	addon:bk_libretro$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	retroarch$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	sed -e "s/@DISPLAY_VERSION@/v${portVersion/_/-}/" \
+		$portDir/additional-files/bk_libretro.info.in \
+		> bk_libretro.info
+	make -f Makefile.libretro $jobArgs GIT_VERSION=${srcGitRev:0:7}
+}
+
+INSTALL()
+{
+	install -m 0755 -d "$docDir"
+	install -m 0644 -t "$docDir" COPYING README.md README.html
+	install -m 0755 -d "$addOnsDir"/libretro
+	install -m 0644 -t "$addOnsDir"/libretro \
+		bk_libretro.info \
+		bk_libretro.so
+}

app-emulation/bluemsx_libretro/additional-files/bluemsx_libretro.info.in

@@ -31,3 +31,5 @@ disk_control = "true"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
 notes = "(!) The libretro port of blueMSX requires the BIOS files|from full standalone package inside the 'System\Machines' directory |and media database files into 'System\Databases' directory.|https://docs.libretro.com/library/bluemsx/#bios|(!) ColecoVision Gamepad Mapping is as follow:|Button 1 as Retropad A|Button 2 as Retropad B|Dial keys 1 to 8 as X, Y, R, L, R2, L2, R3, L3|Star as Select, Hash as Start|0 & 9 are on keyboard 1 & 2 for Player 1|0 & 9 are on keyboard 3 & 4 for Player 2.|(!) To play SpectraVideo cassettes type 'cload' then 'run'|or BLOAD ''CAS:'',R depending of game."
+
+description = "A port of the blueMSX emulator to libretro. This emulator is cycle accurate and covers all generations of MSX computers, as well as SVI, ColecoVision and Sega SG-1000 machines. This core requires the 'Databases' and 'Machines' folders from a standalone installation of blueMSX to be placed in the frontend's system directory to function."

app-emulation/bluemsx_libretro/bluemsx_libretro-2.9.0_20210409.recipe

@@ -6,9 +6,9 @@ HOMEPAGE="http://bluemsx.msxblue.com/"
 COPYRIGHT="2003-2020 Daniel Vik, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="29eca1e7874f16bf9f997c51bf1dc14298083e71"
+srcGitRev="ec24a00edb1a767a7cd41f26e78698af6b60463d"
 SOURCE_URI="https://github.com/libretro/blueMSX-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="0a0333988d7afe0cad4ae923bf9f90d50d5a67c7b096c11b1e23aa9a8df78a07"
+CHECKSUM_SHA256="a6f748fff0ebd7642d2f2351b1a5a6d8b9ec77444d517a401cca76c2f0e0ee45"
 SOURCE_FILENAME="libretro-bluemsx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="blueMSX-libretro-$srcGitRev"
 ADDITIONAL_FILES="bluemsx_libretro.info.in"

app-emulation/bochs/bochs-2.6.11.recipe

@@ -1,12 +1,13 @@
 SUMMARY="The open-source IA-32 emulator"
-DESCRIPTION="Bochs IA-32 Emulator provides a virtual PC that can run operating systems such as Windows, Linux, and BSD"
+DESCRIPTION="Bochs IA-32 Emulator provides a virtual PC that can run \
+operating systems such as Windows, Linux, and BSD"
 HOMEPAGE="http://bochs.sourceforge.net/"
-COPYRIGHT="2001-2017 The Bochs Project"
+COPYRIGHT="2001-2020 The Bochs Project"
 LICENSE="GNU LGPL v2.1
 	Bochs"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/bochs/bochs-$portVersion.tar.gz"
-CHECKSUM_SHA256="ee5b677fd9b1b9f484b5aeb4614f43df21993088c0c0571187f93acb0866e98c"
+CHECKSUM_SHA256="63897b41fbbbdfb1c492d3c4dee1edb4224282a07bbdf442a4a68c19bcc18862"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

app-emulation/cap32_libretro/additional-files/cap32_libretro.info.in

@@ -1,7 +1,7 @@
 # Software Information
 display_name = "Amstrad - CPC (Caprice32)"
 authors = "Ulrich Doewich|dantoine"
-supported_extensions = "dsk|sna|zip|tap|cdt|voc|m3u"
+supported_extensions = "dsk|sna|zip|tap|cdt|voc|cpr|m3u"
 corename = "Caprice32"
 license = "GPLv2"
 permissions = ""
@@ -30,3 +30,5 @@ needs_fullpath = "true"
 disk_control = "true"
 is_experimental = "false"
 needs_kbd_mouse_focus = "true"
+
+description = "A port of the Caprice32 emulator to libretro. This core emulates the Amstrad CPC 8-bit home computer series, including the CPC464, CPC664, CPC128, CPC6128+ and GX4000 models, with a high degree of accuracy and compatibility. While the core's autoloaunch options do a pretty good job of guessing the command required to launch a game, users may specify a command to be executed on launch via an m3u playlist. See the core's documentation for further details."

app-emulation/cap32_libretro/cap32_libretro-4.2.0_20210327.recipe

@@ -5,9 +5,9 @@ HOMEPAGE="https://sourceforge.net/projects/caprice32/"
 COPYRIGHT="1997-2020 Ulrich Doewich, dantoine, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="4c470bb36b6bca00866d07c2036732ab85747a2a"
+srcGitRev="408da091504dabe9678b25b7a6c3bbef0bc4c140"
 SOURCE_URI="https://github.com/libretro/libretro-cap32/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="40a5cb903b1c45c08cc7671a8546d7b3da9e88499e0910bf3aab483655efd57b"
+CHECKSUM_SHA256="aa9474099c350d2fbac149f3feab28512e66d68f2a566d9f2de32ae5d37e26fc"
 SOURCE_FILENAME="cap32-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-cap32-$srcGitRev"
 ADDITIONAL_FILES="cap32_libretro.info.in"

app-emulation/fmsx_libretro/additional-files/fmsx_libretro.info.in

@@ -1,16 +1,23 @@
+# Software Information
 display_name = "Microsoft - MSX (fMSX)"
 authors = "Marat Fayzullin"
 supported_extensions = "rom|mx1|mx2|dsk|cas"
 corename = "fMSX"
-manufacturer = "Various"
 categories = "Emulator"
-systemname = "MSX"
-systemid = "msx"
-database = "Microsoft - MSX|Microsoft - MSX2"
 license = "Non-commercial"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Various"
+systemname = "MSX"
+systemid = "msx"
+
+# Libretro Features
+database = "Microsoft - MSX|Microsoft - MSX2"
 supports_no_game = "false"
+
+# BIOS / Firmware
 firmware_count = 10
 firmware0_desc = "MSX.ROM (MSX BIOS)"
 firmware0_path = "MSX.ROM"
@@ -43,3 +50,5 @@ firmware9_desc = "KANJI.ROM (Kanji Font)"
 firmware9_path = "KANJI.ROM"
 firmware9_opt = "true"
 notes = "(!) MSX.ROM (md5): 364a1a579fe5cb8dba54519bcfcdac0d|(!) MSX2.ROM (md5): ec3a01c91f24fbddcbcab0ad301bc9ef|(!) MSX2EXT.ROM (md5): 2183c2aff17cf4297bdb496de78c2e8a|(!) MSX2P.ROM (md5): 847cc025ffae665487940ff2639540e5|(!) MSX2PEXT.ROM (md5): 7c8243c71d8f143b2531f01afa6a05dc |(!) DISK.ROM (md5): 80dcd1ad1a4cf65d64b7ba10504e8190 |(!) FMPAC.ROM (md5): 6f69cc8b5ed761b03afd78000dfb0e19 |(!) MSXDOS2.ROM (md5): 6418d091cd6907bbcf940324339e43bb |(!) PAINTER.ROM (md5): 403cdea1cbd2bb24fae506941f8f655e |(!) KANJI.ROM (md5): febe8782b466d7c3b16de6d104826b34"
+
+description = "A port of the Marat Fayzullin's fMSX emulator to libretro. This core emulates MSX, MSX2 and MSX2+ 8-bit home consoles."

app-emulation/fmsx_libretro/fmsx_libretro-4.9_20210327.recipe

@@ -5,9 +5,9 @@ HOMEPAGE="https://fms.komkon.org/fMSX/"
 COPYRIGHT="1993-2020 Marat Fayzullin, the libretro team"
 LICENSE="fMSX"
 REVISION="1"
-srcGitRev="fdc6a2f5f40428f2b38d5e533f542e2a9206b080"
+srcGitRev="2c412ee4ca5675c06a47382a319f1770be735803"
 SOURCE_URI="https://github.com/libretro/fmsx-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="2b3a68ca3f0c3f2a6e65dac5d661958e7fd779d24890ac1fb2270da2e948644b"
+CHECKSUM_SHA256="12f42361c3952aaecdba556aeed6c635983937de29e43d9c5d54b7529f04bfd0"
 SOURCE_FILENAME="libretro-fmsx-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="fmsx-libretro-$srcGitRev"
 ADDITIONAL_FILES="fmsx_libretro.info.in"

app-emulation/fs-uae-launcher/fs_uae_launcher-2.8.3.recipe

@@ -8,7 +8,7 @@ setting up FS-UAE."
 HOMEPAGE="https://fs-uae.net/launcher/"
 COPYRIGHT="2011-2017 Frode Solheim"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="4"
 SOURCE_URI="https://fs-uae.net/stable/$portVersion/fs-uae-launcher-$portVersion.tar.gz"
 CHECKSUM_SHA256="8ce764031013516daab76e996eff9e9fdead6c0f00b4e497fc927f7719d8a233"
 SOURCE_DIR="fs-uae-launcher-$portVersion"
@@ -24,8 +24,8 @@ PROVIDES="
 REQUIRES="
     haiku$secondaryArchSuffix
     fs_uae$secondaryArchSuffix
-    pip_python3$secondaryArchSuffix
-    pyqt_python3$secondaryArchSuffix
+    pip_python38$secondaryArchSuffix
+    pyqt5_python38$secondaryArchSuffix
     "
 
 BUILD_REQUIRES="
@@ -34,9 +34,14 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:make
 	cmd:msgfmt
-	cmd:python3
+	cmd:python3.8
 	"
 
+PATCH()
+{
+	sed -i -e "s|python3|python3.8|g" Makefile
+}
+
 BUILD()
 {
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"

app-emulation/fuse_libretro/additional-files/fuse_libretro.info.in

@@ -1,14 +1,48 @@
+# Software Information
 display_name = "Sinclair - ZX Spectrum (Fuse)"
 authors = "Team Fuse"
-supported_extensions = "tzx|tap|z80|rzx|scl|trd"
+supported_extensions = "tzx|tap|z80|rzx|scl|trd|dsk"
 corename = "Fuse"
-manufacturer = "Sinclair|Amstrad"
 categories = "Emulator"
-systemname = "ZX Spectrum (various)"
-systemid = "zx_spectrum"
-database = "Sinclair - ZX Spectrum +3|Sinclair - ZX Spectrum"
 license = "GPLv3"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Sinclair|Amstrad"
+systemname = "ZX Spectrum (various)"
+systemid = "zx_spectrum"
+
+# Libretro Features
 supports_no_game = "false"
+database = "Sinclair - ZX Spectrum +3|Sinclair - ZX Spectrum"
+
+# BIOS / Firmware
+firmware_count = 8
+firmware0_desc = "128p-0.rom (Pentagon)"
+firmware0_path = "128p-0.rom"
+firmware0_opt = "true"
+firmware1_desc = "128p-1.rom (Pentagon machines)"
+firmware1_path = "128p-1.rom"
+firmware1_opt = "true"
+firmware2_desc = "trdos.rom (Pentagon machines)"
+firmware2_path = "trdos.rom"
+firmware2_opt = "true"
+firmware3_desc = "gluck.rom (Pentagon 128K / 1024)"
+firmware3_path = "gluck.rom"
+firmware3_opt = "true"
+firmware4_desc = "256s-0.rom (Scorpion 256K)"
+firmware4_path = "256s-0.rom"
+firmware4_opt = "true"
+firmware5_desc = "256s-1.rom (Scorpion 256K)"
+firmware5_path = "256s-1.rom"
+firmware5_opt = "true"
+firmware6_desc = "256s-2.rom (Scorpion 256K)"
+firmware6_path = "256s-2.rom"
+firmware6_opt = "true"
+firmware7_desc = "256s-3.rom (Scorpion 256K)"
+firmware7_path = "256s-3.rom"
+firmware7_opt = "true"
 notes = "[1] Amstrad have kindly given their permission for the redistribution|[^] of their copyrighted material but retain that copyright."
+
+description = "A port of the Fuse Unix Spectrum Emulator to libretro, this core supports many Spectrum, Timex, Pentagon and Scorpion variants. The Pentagon and Scorpion machines need BIOS images placed inside a 'fuse' subdirectory inside the frontend's 'system' directory. This core is a good first choice for playing Spectrum games, with 81 (EightyOne) covering the Sinclair ZX 81 games."

app-emulation/fuse_libretro/fuse_libretro-1.1.1_20210419.recipe

@@ -6,9 +6,9 @@ HOMEPAGE="http://fuse-emulator.sourceforge.net/"
 COPYRIGHT="1999-2020, the Fuse team, the libretro team"
 LICENSE="GNU GPL v3"
 REVISION="1"
-srcGitRev="33710427a519c82bb38654c5a098272e14fc1823"
+srcGitRev="330655e4735ce2ace887dcc641a837fb5747d47f"
 SOURCE_URI="https://github.com/libretro/fuse-libretro/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="dde8486f541b942682bf7ffdcd0b4537c8391db44f6a78d2f6e6dfce499d1b3e"
+CHECKSUM_SHA256="cdd26e1d8f050f988f9937d35512c42417ec10cc33c16fb22bbfed70320e181c"
 SOURCE_FILENAME="fuse-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="fuse-libretro-$srcGitRev"
 ADDITIONAL_FILES="fuse_libretro.info.in"

app-emulation/hatari_libretro/additional-files/hatari_libretro.info.in

@@ -1,17 +1,38 @@
+# Software Information
 display_name = "Atari - ST/STE/TT/Falcon (Hatari)"
 authors = "Nicolas Pomarède"
 supported_extensions = "st|msa|zip|stx|dim|ipf|m3u"
 corename = "Hatari"
-manufacturer = "Atari"
-categories = "Emulator"
-systemname = "Atari ST/STE/TT/Falcon"
-systemid = "atari_st"
 license = "GPLv2"
 permissions = ""
 display_version = "@DISPLAY_VERSION@"
+categories = "Emulator"
+
+# Hardware Information
+manufacturer = "Atari"
+systemname = "Atari ST/STE/TT/Falcon"
+systemid = "atari_st"
+
+# Libretro Features
 supports_no_game = "false"
+savestate = "false"
+savestate_features = "null"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "true"
+core_options_version = "1.0"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+
+# Firmware / BIOS
 firmware_count = 1
 firmware0_desc = "tos.img (TOS 1.02 US aka Mega TOS)"
 firmware0_path = "tos.img"
 firmware0_opt = "false"
 notes = "(!) tos.img (md5): c1c57ce48e8ee4135885cee9e63a68a2"
+
+description = "A port of the Hatari emulator to libretro. This core supports Atari's 16-/32-bit ST/STE/TT/Falcon hardware and, unlike many other ST emulators that just try to give a good environment for running GEM applications, Hatari tries to emulate the hardware as closely as possible, so it can support most of the old Atari games and demos. The core requires a TOS image to function and supports m3u playlists for use with multi-disk games. This core is a good option for most users on a modern device."

app-emulation/hatari_libretro/hatari_libretro-1.8_20210317.recipe

@@ -10,9 +10,9 @@ HOMEPAGE="https://hatari.tuxfamily.org/"
 COPYRIGHT="2001-2020 Nicolas Pomarède, the Hatari team, the libretro team"
 LICENSE="GNU GPL v2"
 REVISION="1"
-srcGitRev="f19bc118b4e39f5b5131505d5ead09109384be8f"
+srcGitRev="cea06eebf695b078fadc0e78bb0f2b2baaca799f"
 SOURCE_URI="https://github.com/libretro/hatari/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="62606ae3763b0fe152a09ebb303e4c22cdafdec333d437800d71d5842fcbd594"
+CHECKSUM_SHA256="41a044a0a5625052a4a477dca47897aafccd23d835dc20b43e41b37a38e64628"
 SOURCE_FILENAME="hatari-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="hatari-$srcGitRev"
 ADDITIONAL_FILES="hatari_libretro.info.in"

app-emulation/nekop2_libretro/additional-files/nekop2_libretro.info.in

@@ -1,13 +1,32 @@
+# Software Information
 display_name = "NEC - PC-98 (Neko Project II)"
 authors = "Neko Project II Team"
 supported_extensions = "d98|zip|98d|fdi|fdd|2hd|tfd|d88|88d|hdm|xdf|dup|cmd|hdi|thd|nhd|hdd"
 corename = "Neko Project II"
+license = "MIT"
+permissions = ""
+display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
 manufacturer = "NEC"
 categories = "Emulator"
 systemname = "PC-98"
 systemid = "pc_98"
-database = "PC-98"
-license = ""
-permissions = ""
-display_version = "@DISPLAY_VERSION@"
+
+# Libretro Features
 supports_no_game = "false"
+database = "PC-98"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "false"
+memory_descriptors = "false"
+libretro_saves = "false"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+is_experimental = "false"
+
+description = "An emulator for NEC's PC-9801 (aka PC-98) personal computer platform, ported to libretro. This core has been completely superseded by the Neko Project II Kai core."

app-emulation/nekop2_libretro/nekop2_libretro-0.86_20210317.recipe

@@ -4,10 +4,10 @@ the non IBM compatible NEC PC-98xx family. This is the libretro port of NekoP2."
 HOMEPAGE="https://www.yui.ne.jp/np2/"
 COPYRIGHT="2005-2020 the NekoP2 team, the libretro team"
 LICENSE="MIT"
-REVISION="2"
-srcGitRev="b005f6b7f608e22ab33bccafe581c62a025050bb"
+REVISION="1"
+srcGitRev="cd389b3490d5048873c40edd949a1b0631e0606d"
 SOURCE_URI="https://github.com/libretro/libretro-meowPC98/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="97f01caac41bd909bdcf0f3dbc31aabfff77da06b6f6e329e2be5221c514921f"
+CHECKSUM_SHA256="6689487085533e6db9f95151ad202a7a04f0b6ddfcc9db87b32cbb34ed4ef4c0"
 SOURCE_FILENAME="nekop2-libretro-${portVersion/_/-}-$srcGitRev.tar.gz"
 SOURCE_DIR="libretro-meowPC98-$srcGitRev"
 ADDITIONAL_FILES="nekop2_libretro.info.in"

app-emulation/puae_libretro/additional-files/puae_libretro.info.in

@@ -0,0 +1,54 @@
+# Software Information
+display_name = "Commodore - Amiga (PUAE)"
+categories = "Emulator"
+authors = "UAE Team"
+corename = "PUAE"
+supported_extensions = "adf|adz|dms|fdi|ipf|hdf|hdz|lha|slave|info|cue|ccd|nrg|mds|iso|chd|uae|m3u|zip|7z"
+license = "GPLv2"
+permissions = ""
+display_version = "@DISPLAY_VERSION@"
+
+# Hardware Information
+manufacturer = "Commodore"
+systemname = "Amiga"
+systemid = "commodore_amiga"
+
+# Libretro Features
+database = "Commodore - Amiga"
+supports_no_game = "true"
+savestate = "true"
+savestate_features = "serialized"
+cheats = "false"
+input_descriptors = "true"
+memory_descriptors = "false"
+libretro_saves = "true"
+core_options = "true"
+load_subsystem = "false"
+hw_render = "false"
+needs_fullpath = "true"
+disk_control = "true"
+is_experimental = "false"
+
+# Firmware
+firmware_count = 6
+firmware0_desc = "kick34005.A500 (Amiga 500 BIOS, Kickstart v1.3 Rev. 34.005)"
+firmware0_path = "kick34005.A500"
+firmware0_opt = "false"
+firmware1_desc = "kick37175.A500 (Amiga 500+ BIOS, Kickstart v2.04 Rev. 37.175)"
+firmware1_path = "kick37175.A500"
+firmware1_opt = "false"
+firmware2_desc = "kick40063.A600 (Amiga 600 BIOS, Kickstart v3.1 Rev. 40.063)"
+firmware2_path = "kick40063.A600"
+firmware2_opt = "false"
+firmware3_desc = "kick40068.A1200 (Amiga 1200 BIOS, Kickstart v3.1 Rev. 40.068)"
+firmware3_path = "kick40068.A1200"
+firmware3_opt = "false"
+firmware4_desc = "kick40060.CD32 (Amiga CD32 BIOS, Kickstart v3.1 Rev. 40.060)"
+firmware4_path = "kick40060.CD32"
+firmware4_opt = "true"
+firmware5_desc = "kick40060.CD32.ext (Amiga CD32 Extended BIOS, CD32 Extended ROM Rev. 40.060)"
+firmware5_path = "kick40060.CD32.ext"
+firmware5_opt = "true"
+notes = "(!) kick34005.A500 (md5): 82a21c1890cae844b3df741f2762d48d|(!) kick37175.A500 (md5): dc10d7bdd1b6f450773dfb558477c230|(!) kick40063.A600 (md5): e40a5dfb3d017ba8779faba30cbd1c8e|(!) kick40068.A1200 (md5): 646773759326fbac3b2311fd8c8793ee|(!) kick40060.CD32 (md5): 5f8924d013dd57a89cf349f4cdedc6b1|(!) kick40060.CD32.ext (md5): bb72565701b1b6faece07d68ea5da639"
+
+description = "A port of the PUAE Amiga emulator, which is itself a continuation of the E-UAE emulator, to libretro. The core has a built-in AROS fallback Kickstart that is compatible enough for some A500 games, but a proper Kickstart ROM is preferred. This core is well-integrated with libretro and is the first option users should try when seeking to play Amiga games via libretro."

app-emulation/puae_libretro/puae_libretro-2.6.1_20210427.recipe

@@ -0,0 +1,56 @@
+SUMMARY="A Commodore Amiga emulator for the libretro API"
+DESCRIPTION="A port of the PUAE Amiga emulator, which is itself a continuation \
+of the E-UAE emulator, to libretro. The core has a built-in AROS fallback \
+Kickstart that is compatible enough for some A500 games, but a proper \
+KS ROM is preferred. This core is well-integrated with libretro and is the \
+first option users should try when seeking to play Amiga games via libretro."
+HOMEPAGE="https://github.com/libretro/libretro-uae"
+COPYRIGHT="2014-2021, GnoStiC, Richard Drummond, the libretro team"
+LICENSE="GNU GPL v2"
+REVISION="1"
+srcGitRev="26e303a522b7a8f4c46b8ad32dc3d56f4357c43f"
+SOURCE_URI="https://github.com/libretro/libretro-uae/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="3e8963b48700374bb91a48207592b92fd023f813807b8e42a9ed9c9021329200"
+SOURCE_FILENAME="libretro-uae-${portVersion/_/-}-$srcGitRev.tar.gz"
+SOURCE_DIR="libretro-uae-$srcGitRev"
+ADDITIONAL_FILES="puae_libretro.info.in"
+
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	uae_libretro$secondaryArchSuffix = $portVersion
+	addon:uae_libretro$secondaryArchSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	retroarch$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{
+	sed -e "s/@DISPLAY_VERSION@/v${portVersion/_/-}/" \
+		$portDir/additional-files/puae_libretro.info.in \
+		> puae_libretro.info
+	make $jobArgs GIT_VERSION=${srcGitRev:0:7}
+}
+
+INSTALL()
+{
+	install -m 0755 -d "$docDir"
+	install -m 0644 -t "$docDir" README.md COPYING
+	install -m 0755 -d "$addOnsDir"/libretro
+	install -m 0644 -t "$addOnsDir"/libretro \
+		puae_libretro.info \
+		puae_libretro.so
+}

app-emulation/qemu/qemu-3.1.1.1.recipe

@@ -7,7 +7,7 @@ achieves very good performance."
 HOMEPAGE="https://www.qemu.org/"
 COPYRIGHT="2003-2019 Fabrice Bellard"
 LICENSE="GNU GPL v2"
-REVISION="2"
+REVISION="6"
 SOURCE_URI="https://download.qemu.org/qemu-$portVersion.tar.xz"
 CHECKSUM_SHA256="b148fc3c7382c5addd915db433383160ca7b840bc6ea90bb0d35c6b253526d56"
 SOURCE_DIR="qemu-$portVersion"
@@ -24,13 +24,14 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
-platformList="x86 arm mips ppc sparc m68k"
+platformList="x86 arm mips ppc sparc m68k riscv"
 archList_x86="i386 x86_64"
 archList_arm="arm aarch64"
 archList_mips="mips mipsel mips64 mips64el"
 archList_ppc="ppc ppc64"
 archList_sparc="sparc sparc64"
 archList_m68k="m68k"
+archList_riscv="riscv32 riscv64"
 
 PROVIDES="
 	qemu$secondaryArchSuffix = $portVersion
@@ -117,6 +118,13 @@ PROVIDES_m68k="
 	"
 REQUIRES_m68k=$REQUIRES_x86
 
+PROVIDES_riscv="
+	qemu_riscv$secondaryArchSuffix = $portVersion
+	cmd:qemu_system_riscv$commandSuffix = $portVersion
+	cmd:qemu_system_riscv64$commandSuffix = $portVersion
+	"
+REQUIRES_riscv=$REQUIRES_x86
+
 BUILD_REQUIRES="
 	devel:libbz2$secondaryArchSuffix
 	devel:libcapstone$secondaryArchSuffix
@@ -130,7 +138,7 @@ BUILD_REQUIRES="
 	devel:libjpeg$secondaryArchSuffix
 	devel:liblzo2$secondaryArchSuffix
 	devel:libncursesw$secondaryArchSuffix
-	devel:libnettle$secondaryArchSuffix >= 7
+	devel:libnettle$secondaryArchSuffix >= 8
 	devel:libpixman_1$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
 	devel:libSDL_1.2$secondaryArchSuffix

app-emulation/tinyemu/additional-files/tinyemu.rdef.in

@@ -0,0 +1,32 @@
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "TinyEmu",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon {
+	$"6E63696609020006023A04153D236BBDB07B3A5EB14A336448019E00FFFFFFFF"
+	$"FFAA00020006023827C73BDA22BC0BE2384A444B907C47205D00FFFFFFFFFFD4"
+	$"82020106023ED062354433B559313EE278459C72465CA10092B8EBFF15569E02"
+	$"0106023E03F63A5E99BC5E8B4003EA44F89F46C73B00FFFFFFFF15569E020006"
+	$"023CE58E3213B9B0B70F3BC95949F6DE48785200FFAA00FFAC73040200060237"
+	$"AC85382719B8ED62387F754A8B8D489E2500FFCD6EFFC9860503013D5B050104"
+	$"016B0B06069A0E31284C333F3A5132423A3B3A443AB95B0A0431283824522F4C"
+	$"330A044C3F4C33532F533B0A043A514C3F513C414C0A033E564C4A4C5D0A044C"
+	$"4A534553554C5D0606BA0E282A2E2639313728BD66BBC13839333C3433BBC8BC"
+	$"092F2A0605B60227492A3539362BBB2BBFBE2A3A37530A042A3B30393D503753"
+	$"0A054C5E595E60565F4B4B520A0539534D555D443E3A27490A0A08020A09000A"
+	$"07090001020304050607081001178322040A03020608000A020107000A010101"
+	$"000A04020203000A000100000A020104000A060105000A050100100117810004"
+};

app-emulation/tinyemu/patches/tinyemu-2019.12.21.patchset

@@ -0,0 +1,910 @@
+From 28b0d93f3fd754e25cb75ce657f1247a0f69dc7d Mon Sep 17 00:00:00 2001
+From: X512 <danger_mail@list.ru>
+Date: Wed, 12 May 2021 18:03:24 +0900
+Subject: WIP: Haiku patches, share UART with RISC-V machine
+
+
+diff --git a/Makefile b/Makefile
+index 390ae37..dc059cd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -24,12 +24,12 @@
+ 
+ # if set, network filesystem is enabled. libcurl and libcrypto
+ # (openssl) must be installed.
+-CONFIG_FS_NET=y
++#CONFIG_FS_NET=y
+ # SDL support (optional)
+ CONFIG_SDL=y
+ # if set, compile the 128 bit emulator. Note: the 128 bit target does
+ # not compile if gcc does not support the int128 type (32 bit hosts).
+-CONFIG_INT128=y
++#CONFIG_INT128=y
+ # build x86 emulator
+ CONFIG_X86EMU=y
+ # win32 build (not usable yet)
+@@ -62,7 +62,7 @@ endif
+ 
+ all: $(PROGS)
+ 
+-EMU_OBJS:=virtio.o pci.o fs.o cutils.o iomem.o simplefb.o \
++EMU_OBJS:=virtio.o uart.o pci.o fs.o cutils.o iomem.o simplefb.o \
+     json.o machine.o temu.o
+ 
+ ifdef CONFIG_SLIRP
+@@ -72,7 +72,8 @@ endif
+ 
+ ifndef CONFIG_WIN32
+ EMU_OBJS+=fs_disk.o
+-EMU_LIBS=-lrt
++#EMU_LIBS=-lrt
++EMU_LIBS=-lnetwork
+ endif
+ ifdef CONFIG_FS_NET
+ CFLAGS+=-DCONFIG_FS_NET
+diff --git a/cutils.h b/cutils.h
+index 689542e..19283e2 100644
+--- a/cutils.h
++++ b/cutils.h
+@@ -84,7 +84,7 @@ static inline int min_int(int a, int b)
+ 
+ void *mallocz(size_t size);
+ 
+-#if defined(_WIN32)
++#if defined(_WIN32) || defined(__HAIKU__)
+ static inline uint32_t bswap_32(uint32_t v)
+ {
+     return ((v & 0xff000000) >> 24) | ((v & 0x00ff0000) >>  8) |
+diff --git a/fs_disk.c b/fs_disk.c
+index bf96c89..11708d9 100644
+--- a/fs_disk.c
++++ b/fs_disk.c
+@@ -27,9 +27,13 @@
+ #include <inttypes.h>
+ #include <assert.h>
+ #include <stdarg.h>
++#if !defined(__HAIKU__)
+ #include <sys/statfs.h>
++#endif
+ #include <sys/stat.h>
++#if !defined(__HAIKU__)
+ #include <sys/sysmacros.h>
++#endif
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <dirent.h>
+@@ -144,6 +148,7 @@ static void stat_to_qid(FSQID *qid, const struct stat *st)
+ 
+ static void fs_statfs(FSDevice *fs1, FSStatFS *st)
+ {
++#if !defined(__HAIKU__)
+     FSDeviceDisk *fs = (FSDeviceDisk *)fs1;
+     struct statfs st1;
+     statfs(fs->root_path, &st1);
+@@ -153,6 +158,7 @@ static void fs_statfs(FSDevice *fs1, FSStatFS *st)
+     st->f_bavail = st1.f_bavail;
+     st->f_files = st1.f_files;
+     st->f_ffree = st1.f_ffree;
++#endif
+ }
+ 
+ static char *compose_path(const char *path, const char *name)
+@@ -312,6 +318,10 @@ static int fs_readdir(FSDevice *fs, FSFile *f, uint64_t offset,
+         if ((pos + len) > count)
+             break;
+         offset = telldir(f->u.dirp);
++#if defined(__HAIKU__)
++            d_type = 0;
++            type = P9_QTFILE;
++#else
+         d_type = de->d_type;
+         if (d_type == DT_UNKNOWN) {
+             char *path;
+@@ -330,6 +340,7 @@ static int fs_readdir(FSDevice *fs, FSFile *f, uint64_t offset,
+             type = P9_QTSYMLINK;
+         else
+             type = P9_QTFILE;
++#endif
+         buf[pos++] = type;
+         put_le32(buf + pos, 0); /* version */
+         pos += 4;
+@@ -507,6 +518,9 @@ static int fs_mknod(FSDevice *fs, FSQID *qid,
+              FSFile *f, const char *name, uint32_t mode, uint32_t major,
+              uint32_t minor, uint32_t gid)
+ {
++#if defined(__HAIKU__)
++    return -errno_to_p9(ENOTSUP);
++#else
+     char *path;
+     struct stat st;
+     
+@@ -522,6 +536,7 @@ static int fs_mknod(FSDevice *fs, FSQID *qid,
+     free(path);
+     stat_to_qid(qid, &st);
+     return 0;
++#endif
+ }
+ 
+ static int fs_readlink(FSDevice *fs, char *buf, int buf_size, FSFile *f)
+diff --git a/riscv_cpu.c b/riscv_cpu.c
+index ba4fa4c..cfb910a 100644
+--- a/riscv_cpu.c
++++ b/riscv_cpu.c
+@@ -40,7 +40,7 @@
+ #error CONFIG_RISCV_MAX_XLEN must be defined
+ #endif
+ 
+-//#define DUMP_INVALID_MEM_ACCESS
++#define DUMP_INVALID_MEM_ACCESS
+ //#define DUMP_MMU_EXCEPTIONS
+ //#define DUMP_INTERRUPTS
+ //#define DUMP_INVALID_CSR
+@@ -377,6 +377,8 @@ int target_read_slow(RISCVCPUState *s, mem_uint_t *pval,
+ #ifdef DUMP_INVALID_MEM_ACCESS
+             printf("target_read_slow: invalid physical address 0x");
+             print_target_ulong(paddr);
++            printf(", PC: ");
++            print_target_ulong(s->pc);
+             printf("\n");
+ #endif
+             return 0;
+@@ -464,7 +466,10 @@ int target_write_slow(RISCVCPUState *s, target_ulong addr,
+ #ifdef DUMP_INVALID_MEM_ACCESS
+             printf("target_write_slow: invalid physical address 0x");
+             print_target_ulong(paddr);
++            printf(", PC: ");
++            print_target_ulong(s->pc);
+             printf("\n");
++            exit(1);
+ #endif
+         } else if (pr->is_ram) {
+             phys_mem_set_dirty_bit(pr, paddr - pr->addr);
+diff --git a/riscv_machine.c b/riscv_machine.c
+index a7149fd..0e27da4 100644
+--- a/riscv_machine.c
++++ b/riscv_machine.c
+@@ -35,6 +35,7 @@
+ #include "cutils.h"
+ #include "iomem.h"
+ #include "riscv_cpu.h"
++#include "uart.h"
+ #include "virtio.h"
+ #include "machine.h"
+ 
+@@ -56,6 +57,7 @@ typedef struct RISCVMachine {
+     /* HTIF */
+     uint64_t htif_tohost, htif_fromhost;
+ 
++    SerialState *serial_state;
+     VIRTIODevice *keyboard_dev;
+     VIRTIODevice *mouse_dev;
+ 
+@@ -74,6 +76,9 @@ typedef struct RISCVMachine {
+ #define PLIC_BASE_ADDR 0x40100000
+ #define PLIC_SIZE      0x00400000
+ #define FRAMEBUFFER_BASE_ADDR 0x41000000
++#define UART_BASE_ADDR 0x10000000
++#define UART_SIZE 0x100
++#define UART_IRQ 10
+ 
+ #define RTC_FREQ 10000000
+ #define RTC_FREQ_DIV 16 /* arbitrary, relative to CPU freq to have a
+@@ -192,6 +197,14 @@ static void htif_poll(RISCVMachine *s)
+ }
+ #endif
+ 
++static void serial_write_cb(void *opaque, const uint8_t *buf, int buf_len)
++{
++    RISCVMachine *s = opaque;
++    if (s->common.console) {
++        s->common.console->write_data(s->common.console->opaque, buf, buf_len);
++    }
++}
++
+ static uint32_t clint_read(void *opaque, uint32_t offset, int size_log2)
+ {
+     RISCVMachine *m = opaque;
+@@ -696,6 +709,14 @@ static int riscv_build_fdt(RISCVMachine *m, uint8_t *dst,
+     fdt_prop_u32(s, "phandle", plic_phandle);
+ 
+     fdt_end_node(s); /* plic */
++
++    fdt_begin_node_num(s, "serial", UART_BASE_ADDR);
++    fdt_prop_str(s, "compatible", "ns16550a");
++    fdt_prop_tab_u64_2(s, "reg", UART_BASE_ADDR, UART_SIZE);
++    tab[0] = plic_phandle;
++    tab[1] = UART_IRQ;
++    fdt_prop_tab_u32(s, "interrupts-extended", tab, 2);
++    fdt_end_node(s); /* serial */
+     
+     for(i = 0; i < m->virtio_count; i++) {
+         fdt_begin_node_num(s, "virtio", VIRTIO_BASE_ADDR + i * VIRTIO_SIZE);
+@@ -739,7 +760,7 @@ static int riscv_build_fdt(RISCVMachine *m, uint8_t *dst,
+     fdt_end_node(s); /* / */
+ 
+     size = fdt_output(s, dst);
+-#if 0
++#if 1
+     {
+         FILE *f;
+         f = fopen("/tmp/riscvemu.dtb", "wb");
+@@ -881,6 +902,9 @@ static VirtMachine *riscv_machine_init(const VirtMachineParams *p)
+                         s, htif_read, htif_write, DEVIO_SIZE32);
+     s->common.console = p->console;
+ 
++    s->serial_state = serial_init(s->mem_map, UART_BASE_ADDR, &s->plic_irq[UART_IRQ],
++        serial_write_cb, s);
++
+     memset(vbus, 0, sizeof(*vbus));
+     vbus->mem_map = s->mem_map;
+     vbus->addr = VIRTIO_BASE_ADDR;
+diff --git a/sdl.c b/sdl.c
+index c2afeba..fba33aa 100644
+--- a/sdl.c
++++ b/sdl.c
+@@ -84,7 +84,7 @@ static void sdl_update(FBDevice *fb_dev, void *opaque,
+     SDL_UpdateRect(screen, r.x, r.y, r.w, r.h);
+ }
+ 
+-#if defined(_WIN32)
++#if defined(_WIN32) || defined(__HAIKU__)
+ 
+ static int sdl_get_keycode(const SDL_KeyboardEvent *ev)
+ {
+diff --git a/temu.c b/temu.c
+index 7c07f3b..f5372d8 100644
+--- a/temu.c
++++ b/temu.c
+@@ -36,8 +36,10 @@
+ #include <termios.h>
+ #include <sys/ioctl.h>
+ #include <net/if.h>
++#ifndef __HAIKU__
+ #include <linux/if_tun.h>
+ #endif
++#endif
+ #include <sys/stat.h>
+ #include <signal.h>
+ 
+@@ -346,7 +348,7 @@ static BlockDevice *block_device_init(const char *filename,
+     return bs;
+ }
+ 
+-#ifndef _WIN32
++#if !defined(_WIN32) && !defined(__HAIKU__)
+ 
+ typedef struct {
+     int fd;
+@@ -763,7 +765,7 @@ int main(int argc, char **argv)
+         } else
+ #endif
+         {
+-#ifdef _WIN32
++#if defined(_WIN32)
+             fprintf(stderr, "Filesystem access not supported yet\n");
+             exit(1);
+ #else
+@@ -788,7 +790,7 @@ int main(int argc, char **argv)
+                 exit(1);
+         } else
+ #endif
+-#ifndef _WIN32
++#if !defined(_WIN32) && !defined(__HAIKU__)
+         if (!strcmp(p->tab_eth[i].driver, "tap")) {
+             p->tab_eth[i].net = tun_open(p->tab_eth[i].ifname);
+             if (!p->tab_eth[i].net)
+@@ -805,16 +807,14 @@ int main(int argc, char **argv)
+ #ifdef CONFIG_SDL
+     if (p->display_device) {
+         sdl_init(p->width, p->height);
+-    } else
++    }
+ #endif
+-    {
+ #ifdef _WIN32
+-        fprintf(stderr, "Console not supported yet\n");
+-        exit(1);
++    fprintf(stderr, "Console not supported yet\n");
++    exit(1);
+ #else
+-        p->console = console_init(allow_ctrlc);
++    p->console = console_init(allow_ctrlc);
+ #endif
+-    }
+     p->rtc_real_time = TRUE;
+ 
+     s = virt_machine_init(p);
+diff --git a/uart.c b/uart.c
+new file mode 100644
+index 0000000..147160d
+--- /dev/null
++++ b/uart.c
+@@ -0,0 +1,228 @@
++#include "uart.h"
++#include <stdint.h>
++
++static void serial_write(void *opaque, uint32_t offset,
++                         uint32_t val, int size_log2);
++static uint32_t serial_read(void *opaque, uint32_t offset, int size_log2);
++
++SerialState *serial_init(PhysMemoryMap *port_map, int addr,
++                         IRQSignal *irq,
++                         void (*write_func)(void *opaque, const uint8_t *buf, int buf_len), void *opaque)
++{
++    SerialState *s;
++    s = mallocz(sizeof(*s));
++    
++    /* all 8 bit registers */
++    s->divider = 0; 
++    s->rbr = 0; /* receive register */
++    s->ier = 0;
++    s->iir = UART_IIR_NO_INT; /* read only */
++    s->lcr = 0;
++    s->mcr = 0;
++    s->lsr = UART_LSR_TEMT | UART_LSR_THRE; /* read only */
++    s->msr = 0;
++    s->scr = 0;
++    s->fcr = 0;
++
++    s->irq = irq;
++    s->write_func = write_func;
++    s->opaque = opaque;
++
++    cpu_register_device(port_map, addr, 8, s, serial_read, serial_write, 
++                        DEVIO_SIZE8);
++    return s;
++}
++
++static void serial_update_irq(SerialState *s)
++{
++    if ((s->lsr & UART_LSR_DR) && (s->ier & UART_IER_RDI)) {
++        s->iir = UART_IIR_RDI;
++    } else if ((s->lsr & UART_LSR_THRE) && (s->ier & UART_IER_THRI)) {
++        s->iir = UART_IIR_THRI;
++    } else {
++        s->iir = UART_IIR_NO_INT;
++    }
++    if (s->iir != UART_IIR_NO_INT) {
++        set_irq(s->irq, 1);
++    } else {
++        set_irq(s->irq, 0);
++    }
++}
++
++#if 0
++/* send remainining chars in fifo */
++Serial.prototype.write_tx_fifo = function()
++{
++    if (s->tx_fifo != "") {
++        s->write_func(s->tx_fifo);
++        s->tx_fifo = "";
++        
++        s->lsr |= UART_LSR_THRE;
++        s->lsr |= UART_LSR_TEMT;
++        s->update_irq();
++    }
++}
++#endif
++    
++static void serial_write(void *opaque, uint32_t offset,
++                         uint32_t val, int size_log2)
++{
++    SerialState *s = opaque;
++    int addr;
++
++    addr = offset & 7;
++    switch(addr) {
++    default:
++    case 0:
++        if (s->lcr & UART_LCR_DLAB) {
++            s->divider = (s->divider & 0xff00) | val;
++        } else {
++#if 0
++            if (s->fcr & UART_FCR_FE) {
++                s->tx_fifo += String.fromCharCode(val);
++                s->lsr &= ~UART_LSR_THRE;
++                serial_update_irq(s);
++                if (s->tx_fifo.length >= UART_FIFO_LENGTH) {
++                    /* write to the terminal */
++                    s->write_tx_fifo();
++                }
++            } else
++#endif
++            {
++                uint8_t ch;
++                s->lsr &= ~UART_LSR_THRE;
++                serial_update_irq(s);
++                
++                /* write to the terminal */
++                ch = val;
++                s->write_func(s->opaque, &ch, 1);
++                s->lsr |= UART_LSR_THRE;
++                s->lsr |= UART_LSR_TEMT;
++                serial_update_irq(s);
++            }
++        }
++        break;
++    case 1:
++        if (s->lcr & UART_LCR_DLAB) {
++            s->divider = (s->divider & 0x00ff) | (val << 8);
++        } else {
++            s->ier = val;
++            serial_update_irq(s);
++        }
++        break;
++    case 2:
++#if 0
++        if ((s->fcr ^ val) & UART_FCR_FE) {
++            /* clear fifos */
++            val |= UART_FCR_XFR | UART_FCR_RFR;
++        }
++        if (val & UART_FCR_XFR)
++            s->tx_fifo = "";
++        if (val & UART_FCR_RFR)
++            s->rx_fifo = "";
++        s->fcr = val & UART_FCR_FE;
++#endif
++        break;
++    case 3:
++        s->lcr = val;
++        break;
++    case 4:
++        s->mcr = val;
++        break;
++    case 5:
++        break;
++    case 6:
++        s->msr = val;
++        break;
++    case 7:
++        s->scr = val;
++        break;
++    }
++}
++
++static uint32_t serial_read(void *opaque, uint32_t offset, int size_log2)
++{
++    SerialState *s = opaque;
++    int ret, addr;
++
++    addr = offset & 7;
++    switch(addr) {
++    default:
++    case 0:
++        if (s->lcr & UART_LCR_DLAB) {
++            ret = s->divider & 0xff; 
++        } else {
++            ret = s->rbr;
++            s->lsr &= ~(UART_LSR_DR | UART_LSR_BI);
++            serial_update_irq(s);
++#if 0
++            /* try to receive next chars */
++            s->send_char_from_fifo();
++#endif
++        }
++        break;
++    case 1:
++        if (s->lcr & UART_LCR_DLAB) {
++            ret = (s->divider >> 8) & 0xff;
++        } else {
++            ret = s->ier;
++        }
++        break;
++    case 2:
++        ret = s->iir;
++        if (s->fcr & UART_FCR_FE)
++            ret |= UART_IIR_FE;
++        break;
++    case 3:
++        ret = s->lcr;
++        break;
++    case 4:
++        ret = s->mcr;
++        break;
++    case 5:
++        ret = s->lsr;
++        break;
++    case 6:
++        ret = s->msr;
++        break;
++    case 7:
++        ret = s->scr;
++        break;
++    }
++    return ret;
++}
++
++void serial_send_break(SerialState *s)
++{
++    s->rbr = 0;
++    s->lsr |= UART_LSR_BI | UART_LSR_DR;
++    serial_update_irq(s);
++}
++
++#if 0
++static void serial_send_char(SerialState *s, int ch)
++{
++    s->rbr = ch;
++    s->lsr |= UART_LSR_DR;
++    serial_update_irq(s);
++}
++
++Serial.prototype.send_char_from_fifo = function()
++{
++    var fifo;
++
++    fifo = s->rx_fifo;
++    if (fifo != "" && !(s->lsr & UART_LSR_DR)) {
++        s->send_char(fifo.charCodeAt(0));
++        s->rx_fifo = fifo.substr(1, fifo.length - 1);
++    }
++}
++
++/* queue the string in the UART receive fifo and send it ASAP */
++Serial.prototype.send_chars = function(str)
++{
++    s->rx_fifo += str;
++    s->send_char_from_fifo();
++}
++    
++#endif
+diff --git a/uart.h b/uart.h
+new file mode 100644
+index 0000000..12b92ec
+--- /dev/null
++++ b/uart.h
+@@ -0,0 +1,58 @@
++#ifndef _UART_H_
++#define _UART_H_
++
++#include <stddef.h>
++#include "cutils.h"
++#include "iomem.h"
++
++#define UART_LCR_DLAB	0x80	/* Divisor latch access bit */
++
++#define UART_IER_MSI	0x08	/* Enable Modem status interrupt */
++#define UART_IER_RLSI	0x04	/* Enable receiver line status interrupt */
++#define UART_IER_THRI	0x02	/* Enable Transmitter holding register int. */
++#define UART_IER_RDI	0x01	/* Enable receiver data interrupt */
++
++#define UART_IIR_NO_INT	0x01	/* No interrupts pending */
++#define UART_IIR_ID	0x06	/* Mask for the interrupt ID */
++
++#define UART_IIR_MSI	0x00	/* Modem status interrupt */
++#define UART_IIR_THRI	0x02	/* Transmitter holding register empty */
++#define UART_IIR_RDI	0x04	/* Receiver data interrupt */
++#define UART_IIR_RLSI	0x06	/* Receiver line status interrupt */
++#define UART_IIR_FE     0xC0    /* Fifo enabled */
++
++#define UART_LSR_TEMT	0x40	/* Transmitter empty */
++#define UART_LSR_THRE	0x20	/* Transmit-hold-register empty */
++#define UART_LSR_BI	0x10	/* Break interrupt indicator */
++#define UART_LSR_FE	0x08	/* Frame error indicator */
++#define UART_LSR_PE	0x04	/* Parity error indicator */
++#define UART_LSR_OE	0x02	/* Overrun error indicator */
++#define UART_LSR_DR	0x01	/* Receiver data ready */
++
++#define UART_FCR_XFR        0x04    /* XMIT Fifo Reset */
++#define UART_FCR_RFR        0x02    /* RCVR Fifo Reset */
++#define UART_FCR_FE         0x01    /* FIFO Enable */
++
++#define UART_FIFO_LENGTH    16      /* 16550A Fifo Length */
++
++typedef struct {
++    uint8_t divider; 
++    uint8_t rbr; /* receive register */
++    uint8_t ier;
++    uint8_t iir; /* read only */
++    uint8_t lcr;
++    uint8_t mcr;
++    uint8_t lsr; /* read only */
++    uint8_t msr;
++    uint8_t scr;
++    uint8_t fcr;
++    IRQSignal *irq;
++    void (*write_func)(void *opaque, const uint8_t *buf, int buf_len);
++    void *opaque;
++} SerialState;
++
++SerialState *serial_init(PhysMemoryMap *port_map, int addr,
++                         IRQSignal *irq,
++                         void (*write_func)(void *opaque, const uint8_t *buf, int buf_len), void *opaque);
++
++#endif	// _UART_H_
+diff --git a/x86_machine.c b/x86_machine.c
+index db8f6bb..8497a45 100644
+--- a/x86_machine.c
++++ b/x86_machine.c
+@@ -36,6 +36,7 @@
+ #include "cutils.h"
+ #include "iomem.h"
+ #include "virtio.h"
++#include "uart.h"
+ #include "x86_cpu.h"
+ #include "machine.h"
+ #include "pci.h"
+@@ -980,280 +981,6 @@ static int pit_update_irq(PITState *pit)
+         return delay / (PIT_FREQ / 1000);
+ }
+     
+-/***********************************************************/
+-/* serial port emulation */
+-
+-#define UART_LCR_DLAB	0x80	/* Divisor latch access bit */
+-
+-#define UART_IER_MSI	0x08	/* Enable Modem status interrupt */
+-#define UART_IER_RLSI	0x04	/* Enable receiver line status interrupt */
+-#define UART_IER_THRI	0x02	/* Enable Transmitter holding register int. */
+-#define UART_IER_RDI	0x01	/* Enable receiver data interrupt */
+-
+-#define UART_IIR_NO_INT	0x01	/* No interrupts pending */
+-#define UART_IIR_ID	0x06	/* Mask for the interrupt ID */
+-
+-#define UART_IIR_MSI	0x00	/* Modem status interrupt */
+-#define UART_IIR_THRI	0x02	/* Transmitter holding register empty */
+-#define UART_IIR_RDI	0x04	/* Receiver data interrupt */
+-#define UART_IIR_RLSI	0x06	/* Receiver line status interrupt */
+-#define UART_IIR_FE     0xC0    /* Fifo enabled */
+-
+-#define UART_LSR_TEMT	0x40	/* Transmitter empty */
+-#define UART_LSR_THRE	0x20	/* Transmit-hold-register empty */
+-#define UART_LSR_BI	0x10	/* Break interrupt indicator */
+-#define UART_LSR_FE	0x08	/* Frame error indicator */
+-#define UART_LSR_PE	0x04	/* Parity error indicator */
+-#define UART_LSR_OE	0x02	/* Overrun error indicator */
+-#define UART_LSR_DR	0x01	/* Receiver data ready */
+-
+-#define UART_FCR_XFR        0x04    /* XMIT Fifo Reset */
+-#define UART_FCR_RFR        0x02    /* RCVR Fifo Reset */
+-#define UART_FCR_FE         0x01    /* FIFO Enable */
+-
+-#define UART_FIFO_LENGTH    16      /* 16550A Fifo Length */
+-
+-typedef struct {
+-    uint8_t divider; 
+-    uint8_t rbr; /* receive register */
+-    uint8_t ier;
+-    uint8_t iir; /* read only */
+-    uint8_t lcr;
+-    uint8_t mcr;
+-    uint8_t lsr; /* read only */
+-    uint8_t msr;
+-    uint8_t scr;
+-    uint8_t fcr;
+-    IRQSignal *irq;
+-    void (*write_func)(void *opaque, const uint8_t *buf, int buf_len);
+-    void *opaque;
+-} SerialState;
+-
+-static void serial_write(void *opaque, uint32_t offset,
+-                         uint32_t val, int size_log2);
+-static uint32_t serial_read(void *opaque, uint32_t offset, int size_log2);
+-
+-SerialState *serial_init(PhysMemoryMap *port_map, int addr,
+-                         IRQSignal *irq,
+-                         void (*write_func)(void *opaque, const uint8_t *buf, int buf_len), void *opaque)
+-{
+-    SerialState *s;
+-    s = mallocz(sizeof(*s));
+-    
+-    /* all 8 bit registers */
+-    s->divider = 0; 
+-    s->rbr = 0; /* receive register */
+-    s->ier = 0;
+-    s->iir = UART_IIR_NO_INT; /* read only */
+-    s->lcr = 0;
+-    s->mcr = 0;
+-    s->lsr = UART_LSR_TEMT | UART_LSR_THRE; /* read only */
+-    s->msr = 0;
+-    s->scr = 0;
+-    s->fcr = 0;
+-
+-    s->irq = irq;
+-    s->write_func = write_func;
+-    s->opaque = opaque;
+-
+-    cpu_register_device(port_map, addr, 8, s, serial_read, serial_write, 
+-                        DEVIO_SIZE8);
+-    return s;
+-}
+-
+-static void serial_update_irq(SerialState *s)
+-{
+-    if ((s->lsr & UART_LSR_DR) && (s->ier & UART_IER_RDI)) {
+-        s->iir = UART_IIR_RDI;
+-    } else if ((s->lsr & UART_LSR_THRE) && (s->ier & UART_IER_THRI)) {
+-        s->iir = UART_IIR_THRI;
+-    } else {
+-        s->iir = UART_IIR_NO_INT;
+-    }
+-    if (s->iir != UART_IIR_NO_INT) {
+-        set_irq(s->irq, 1);
+-    } else {
+-        set_irq(s->irq, 0);
+-    }
+-}
+-
+-#if 0
+-/* send remainining chars in fifo */
+-Serial.prototype.write_tx_fifo = function()
+-{
+-    if (s->tx_fifo != "") {
+-        s->write_func(s->tx_fifo);
+-        s->tx_fifo = "";
+-        
+-        s->lsr |= UART_LSR_THRE;
+-        s->lsr |= UART_LSR_TEMT;
+-        s->update_irq();
+-    }
+-}
+-#endif
+-    
+-static void serial_write(void *opaque, uint32_t offset,
+-                         uint32_t val, int size_log2)
+-{
+-    SerialState *s = opaque;
+-    int addr;
+-
+-    addr = offset & 7;
+-    switch(addr) {
+-    default:
+-    case 0:
+-        if (s->lcr & UART_LCR_DLAB) {
+-            s->divider = (s->divider & 0xff00) | val;
+-        } else {
+-#if 0
+-            if (s->fcr & UART_FCR_FE) {
+-                s->tx_fifo += String.fromCharCode(val);
+-                s->lsr &= ~UART_LSR_THRE;
+-                serial_update_irq(s);
+-                if (s->tx_fifo.length >= UART_FIFO_LENGTH) {
+-                    /* write to the terminal */
+-                    s->write_tx_fifo();
+-                }
+-            } else
+-#endif
+-            {
+-                uint8_t ch;
+-                s->lsr &= ~UART_LSR_THRE;
+-                serial_update_irq(s);
+-                
+-                /* write to the terminal */
+-                ch = val;
+-                s->write_func(s->opaque, &ch, 1);
+-                s->lsr |= UART_LSR_THRE;
+-                s->lsr |= UART_LSR_TEMT;
+-                serial_update_irq(s);
+-            }
+-        }
+-        break;
+-    case 1:
+-        if (s->lcr & UART_LCR_DLAB) {
+-            s->divider = (s->divider & 0x00ff) | (val << 8);
+-        } else {
+-            s->ier = val;
+-            serial_update_irq(s);
+-        }
+-        break;
+-    case 2:
+-#if 0
+-        if ((s->fcr ^ val) & UART_FCR_FE) {
+-            /* clear fifos */
+-            val |= UART_FCR_XFR | UART_FCR_RFR;
+-        }
+-        if (val & UART_FCR_XFR)
+-            s->tx_fifo = "";
+-        if (val & UART_FCR_RFR)
+-            s->rx_fifo = "";
+-        s->fcr = val & UART_FCR_FE;
+-#endif
+-        break;
+-    case 3:
+-        s->lcr = val;
+-        break;
+-    case 4:
+-        s->mcr = val;
+-        break;
+-    case 5:
+-        break;
+-    case 6:
+-        s->msr = val;
+-        break;
+-    case 7:
+-        s->scr = val;
+-        break;
+-    }
+-}
+-
+-static uint32_t serial_read(void *opaque, uint32_t offset, int size_log2)
+-{
+-    SerialState *s = opaque;
+-    int ret, addr;
+-
+-    addr = offset & 7;
+-    switch(addr) {
+-    default:
+-    case 0:
+-        if (s->lcr & UART_LCR_DLAB) {
+-            ret = s->divider & 0xff; 
+-        } else {
+-            ret = s->rbr;
+-            s->lsr &= ~(UART_LSR_DR | UART_LSR_BI);
+-            serial_update_irq(s);
+-#if 0
+-            /* try to receive next chars */
+-            s->send_char_from_fifo();
+-#endif
+-        }
+-        break;
+-    case 1:
+-        if (s->lcr & UART_LCR_DLAB) {
+-            ret = (s->divider >> 8) & 0xff;
+-        } else {
+-            ret = s->ier;
+-        }
+-        break;
+-    case 2:
+-        ret = s->iir;
+-        if (s->fcr & UART_FCR_FE)
+-            ret |= UART_IIR_FE;
+-        break;
+-    case 3:
+-        ret = s->lcr;
+-        break;
+-    case 4:
+-        ret = s->mcr;
+-        break;
+-    case 5:
+-        ret = s->lsr;
+-        break;
+-    case 6:
+-        ret = s->msr;
+-        break;
+-    case 7:
+-        ret = s->scr;
+-        break;
+-    }
+-    return ret;
+-}
+-
+-void serial_send_break(SerialState *s)
+-{
+-    s->rbr = 0;
+-    s->lsr |= UART_LSR_BI | UART_LSR_DR;
+-    serial_update_irq(s);
+-}
+-
+-#if 0
+-static void serial_send_char(SerialState *s, int ch)
+-{
+-    s->rbr = ch;
+-    s->lsr |= UART_LSR_DR;
+-    serial_update_irq(s);
+-}
+-
+-Serial.prototype.send_char_from_fifo = function()
+-{
+-    var fifo;
+-
+-    fifo = s->rx_fifo;
+-    if (fifo != "" && !(s->lsr & UART_LSR_DR)) {
+-        s->send_char(fifo.charCodeAt(0));
+-        s->rx_fifo = fifo.substr(1, fifo.length - 1);
+-    }
+-}
+-
+-/* queue the string in the UART receive fifo and send it ASAP */
+-Serial.prototype.send_chars = function(str)
+-{
+-    s->rx_fifo += str;
+-    s->send_char_from_fifo();
+-}
+-    
+-#endif
+ 
+ #ifdef DEBUG_BIOS
+ static void bios_debug_write(void *opaque, uint32_t offset,
+-- 
+2.30.2
+

app-emulation/tinyemu/tinyemu-2019.12.21.recipe

@@ -0,0 +1,85 @@
+SUMMARY="A system emulator for the RISC-V architecture"
+DESCRIPTION="TinyEMU is a system emulator for the RISC-V architecture. \
+Its purpose is to be small and simple while being complete.
+
+Main features:
+
+RISC-V system emulator supporting the RV128IMAFDQC base ISA \
+(user level ISA version 2.2, priviledged architecture version 1.10) \
+including: 
+* 32/64/128 bit integer registers 
+* 32/64/128 bit floating point instructions (using the SoftFP Library) 
+* Compressed instructions 
+* Dynamic XLEN change 
+* VirtIO console, network, block device, input and 9P filesystem 
+* Graphical display with SDL 
+* JSON configuration file 
+* Remote HTTP block device and filesystem 
+* Small code, easy to modify, few external dependancies."
+HOMEPAGE="https://bellard.org/tinyemu/"
+COPYRIGHT="2017-2019 Fabrice Bellard"
+LICENSE="MIT"
+REVISION="2"
+SOURCE_URI="https://bellard.org/tinyemu/tinyemu-${portVersion//./-}.tar.gz"
+CHECKSUM_SHA256="be8351f2121819b3172fcedce5cb1826fa12c87da1b7ed98f269d3e802a05555"
+SOURCE_DIR="tinyemu-${portVersion//./-}"
+PATCHES="tinyemu-$portVersion.patchset"
+ADDITIONAL_FILES="tinyemu.rdef.in"
+
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	tinyemu$secondaryArchSuffix = $portVersion
+	cmd:temu$commandSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libcurl$secondaryArchSuffix
+	lib:libSDL_1.2$secondaryArchSuffix	
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libcrypto$secondaryArchSuffix
+	devel:libcurl$secondaryArchSuffix
+	devel:libSDL_1.2$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	"
+
+BUILD()
+{	
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir $commandBinDir
+	cp temu $commandBinDir
+
+	local APP_SIGNATURE="application/x-vnd.tinyemu"
+	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/tinyemu.rdef.in > tinyemu.rdef
+
+	addResourcesToBinaries tinyemu.rdef $commandBinDir/temu
+}

app-emulation/zesarux/additional-files/zesarux.rdef.in

@@ -0,0 +1,37 @@
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = 0,
+
+	variety = B_APPV_FINAL,
+	internal = 0,
+
+	short_info = "ZEsarUX",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource vector_icon {
+	$"6E6369660A04016C050002001602B419ADBCE3613CE361B419AD457AD74A1C2A"
+	$"00B2FFFF020016023A30623CD42EBCD42E3A30624BFEFF442E4900FFFF6D0200"
+	$"06023C31993A4851BA48513C31994C1D85C71A3D00ACACACFF000001035252FF"
+	$"0305FBFF0305D80503FCFF0003FF00000C0606FF073E5E3E5EC1135E4E5EC334"
+	$"5E54C8C860485AC5DB5CC268544458C1DFC4CCC4CC3E5EC1DFC83F3E5E5E0608"
+	$"FABF28332236224E22C29FB783C7303E5CBB3CC90BC19CC83F5248C443C59852"
+	$"3F522D523649B740372640B65133B639282E0604FE2236224E22C2DFB783C730"
+	$"3E5CBB3CC90B3EC6643E403EC443BC96BEFD0606FF0A29332933BA4D363E3ABB"
+	$"3C37C19CBBA1522DC443B9E849B740372640B651BA72B64A282E30300606FF07"
+	$"3E5C3E5CC19CC83F5248C443C598523F522D5236C443B9E83E3AC19CBBA13EC1"
+	$"DF3E5C3EC6643E5C5C0A162348294B29442F472F403543353C24342A302A2B47"
+	$"35473C42403B3E3B453543354A2F472F4E4258425F234F0A033C5A4256425D0A"
+	$"043758425042563C5A0A0437584250424A32550A0432552D534244424A0A043B"
+	$"3E413A473C42400A042A302B2B4735473C0C0A0001002020210A01010112401D"
+	$"890000000000004022F8420000C343AD01178400040A02010202401D89000000"
+	$"0000004022F8420000C343AD0A03010302401D890000000000004022F8420000"
+	$"C343AD0A04010402401D890000000000004022F8420000C343AD0A060106000A"
+	$"070107000A080108000A090109000A010105000A03010A000A02010B00"
+};

app-emulation/zesarux/patches/zesarux-9.1.patchset

@@ -0,0 +1,448 @@
+From fa1c585ba53a153e0fb5b202661be2e925d57dd8 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 28 Jan 2021 12:03:30 +1000
+Subject: Fix build for Haiku
+
+
+diff --git a/src/cpu.h b/src/cpu.h
+index 92766c4..b219527 100644
+--- a/src/cpu.h
++++ b/src/cpu.h
+@@ -182,7 +182,7 @@ extern z80_bit core_end_frame_check_zrcp_zeng_snap;
+ 
+ 
+ //Para haiku
+-#ifdef HAIKU_OS
++#ifdef __HAIKU__
+ //Para incluir PATH_MAX
+ #include <limits.h>
+ #endif
+diff --git a/src/m68kcpu.h b/src/m68kcpu.h
+index 4a6e9a7..70d92a9 100644
+--- a/src/m68kcpu.h
++++ b/src/m68kcpu.h
+@@ -75,7 +75,7 @@
+ 
+ 
+ //Para haiku
+-#ifdef HAIKU_OS
++#ifdef __HAIKU__
+ typedef unsigned int uint;
+ 
+ #else
+diff --git a/src/utils.h b/src/utils.h
+index 279592c..93eddff 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -22,7 +22,7 @@
+ #ifndef UTILS_H
+ #define UTILS_H
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__HAIKU__)
+ #include <limits.h>
+ #endif
+ 
+-- 
+2.30.0
+
+
+From fab50041925b13f1f1011191c2f77519e8d38a78 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 28 Jan 2021 12:18:48 +1000
+Subject: Enhanced SDL2 backend
+
+
+diff --git a/src/cursor.bmp b/src/cursor.bmp
+new file mode 100644
+index 0000000000000000000000000000000000000000..9841220b84366bb7024d3a0a18b4c6afca45290b
+GIT binary patch
+literal 1306
+zcmd7Qv8~-Y3;<9E$OTgTE?p)F(h|r3zt0-niG9Xl{}#v|%%SY}W{8X<(6lVklK=np
+z?RA~@^Ye9m7yZXqK3!i<{*V6mkDKH^I4$%^(F~VlkQB|Z1B0Y!hJ86mie}gegQRGN
+zT_i|~W{^Es>WgOBVuGY-hAl8iie}iNgQRGN{g5CjnqfaKNQ!2#fYtL{rEiAagdi!J
+zVK*j7ie}i&3X-B3b_0W?XolU?ASs%`MC#c}>RhcKcJqUzXofwIASs$*4=G5BX4r!Z
+zlA;;*FoUFM1}~^*cV#Q-bB%rvJxGdX*dHNCie}iKBS?y7*dHcHie}KMN1mb?JW$V`
+z(C*4sGUqZ_J@ORIU;_2XQ#6A~)gw>Q3>H$4JVi5D+!FE>&G4_c*WIq`30|-3?aj@d
+zc;b^d>HF!O-uUeaPrSFM37&TCn7du?WA6DsvS-D;J0;xX?`lr`6t?jb-Zi`z{*isJ
+M`T3xa?|Hrc0-Q97Gynhq
+
+literal 0
+HcmV?d00001
+
+diff --git a/src/scrsdl2.c b/src/scrsdl2.c
+index de2635d..403d997 100644
+--- a/src/scrsdl2.c
++++ b/src/scrsdl2.c
+@@ -65,10 +65,14 @@ int scrsdl_debe_redimensionar=0;
+ unsigned char *scrsdl_pixeles;
+ 
+ SDL_Texture *scrsdl_texture;
+-
++SDL_Texture *cursor_texture;
+ 
+ SDL_Renderer *renderer;
+ 
++float zoom_width = 1.0;
++float zoom_height = 1.0;
++Uint32 mouse_timer = 0;
++
+ //#define screen_get_window_size_width_zoom_border_en() screen_get_window_size_width_zoom_border_en()
+ #define SDL_ALTO_VENTANA screen_get_window_size_height_zoom_border_en()
+ 
+@@ -84,7 +88,7 @@ int scrsdl_crea_ventana(void)
+   flags=SDL_WINDOW_RESIZABLE;
+ 
+   if (ventana_fullscreen) {
+-	   flags |=SDL_WINDOW_FULLSCREEN;
++	   flags |=SDL_WINDOW_FULLSCREEN_DESKTOP;
+    }
+ 
+ 
+@@ -112,6 +116,7 @@ int scrsdl_crea_ventana(void)
+ 
+     SDL_SetWindowTitle(window,"ZEsarUX "EMULATOR_VERSION);
+ 
++	SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "1");
+ 
+     scrsdl_texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STATIC, ancho, SDL_ALTO_VENTANA);
+     //Uint32 *pixels = new Uint32[screen_get_window_size_width_zoom_border_en() * SDL_ALTO_VENTANA];
+@@ -122,7 +127,7 @@ int scrsdl_crea_ventana(void)
+ 
+                 scr_reallocate_layers_menu(ancho,alto);
+ 
+-	if (mouse_pointer_shown.v==0) SDL_ShowCursor(0);
++	SDL_ShowCursor(SDL_DISABLE);
+ 
+ 	modificado_border.v=1;
+ 
+@@ -130,7 +135,11 @@ int scrsdl_crea_ventana(void)
+ 
+ 	menu_init_footer();
+ 
+-
++	SDL_Surface *cursor = SDL_LoadBMP("share/zesaruz/cursor.bmp");
++	SDL_SetColorKey(cursor, SDL_TRUE, SDL_MapRGB(cursor->format, 0, 0, 255));
++	cursor_texture = SDL_CreateTextureFromSurface(renderer, cursor);
++	SDL_SetTextureBlendMode(cursor_texture, SDL_BLENDMODE_BLEND);
++	SDL_FreeSurface(cursor);
+ 
+   return 0;
+ 
+@@ -283,13 +292,39 @@ void scrsdl_refresca_border(void)
+ 
+ void scrsdl_refresca_pantalla_solo_driver(void)
+ {
++  int window_width, window_height;
++  int texture_width, texture_height;
++  SDL_Rect texture_frame;
+ 
+         int ancho=screen_get_window_size_width_zoom_border_en();
+         ancho +=screen_get_ext_desktop_width_zoom();
+ 
+   SDL_UpdateTexture(scrsdl_texture, NULL, scrsdl_pixeles, ancho * 4);
++  SDL_GetWindowSize(window, &window_width, &window_height);
++  SDL_QueryTexture(scrsdl_texture, NULL, NULL, &texture_width, &texture_height);
++
++  zoom_width = (float)window_width / (float)texture_width;
++  zoom_height = (float)window_height / (float)texture_height;
++
++  if (window_width >= window_height) {
++	texture_frame.w = (float)texture_width * zoom_height;
++	texture_frame.h = (float)texture_height * zoom_height;
++	texture_frame.x = (window_width - texture_frame.w) / 2;
++	texture_frame.y = 0;
++  } else {
++	texture_frame.w = (float)texture_width * zoom_width;
++	texture_frame.h = (float)texture_height * zoom_width;
++	texture_frame.x = 0;
++	texture_frame.y = (window_height - texture_frame.h) / 2;
++  }
+   SDL_RenderClear(renderer);
+-  SDL_RenderCopy(renderer, scrsdl_texture, NULL, NULL);
++  SDL_RenderCopy(renderer, scrsdl_texture, NULL, &texture_frame);
++  if (mouse_pointer_shown.v != 0) {
++	if (SDL_GetTicks() - mouse_timer < 2000) {
++		SDL_Rect mouse_rect = {mouse_x * zoom_width, mouse_y * zoom_height, 12, 19};
++		SDL_RenderCopy(renderer, cursor_texture, NULL, &mouse_rect);
++	}
++  }
+   SDL_RenderPresent(renderer);
+ }
+ 
+@@ -1437,23 +1472,11 @@ See the SDL documentation. Scancodes represent the physical position of the keys
+ 
+ 		}
+ 
+-
+-
+-		//resize
+-		//if (event.type==SDL_WINDOWEVENT_SIZE_CHANGED) {
+-    if (scrsdl_recibido_resize(&event)) {
+-
+-			        scrsdl_resize(event.window.data1, event.window.data2);
+-
+-		}
+-
+-
+ 		//mouse motion
+ 		if (event.type==SDL_MOUSEMOTION) {
+-                    mouse_x=event.motion.x;
+-                    mouse_y=event.motion.y;
+-
+-
++                    mouse_timer = SDL_GetTicks();
++                    mouse_x=(float)event.motion.x / zoom_width;
++                    mouse_y=(float)event.motion.y / zoom_height;
+ 
+                     kempston_mouse_x=mouse_x/zoom_x;
+                     kempston_mouse_y=255-mouse_y/zoom_y;
+@@ -1465,7 +1488,7 @@ See the SDL documentation. Scancodes represent the physical position of the keys
+ 
+ 		//mouse button
+ 		if (event.type==SDL_MOUSEBUTTONDOWN) {
+-
++			mouse_timer = SDL_GetTicks();
+ 			debug_printf (VERBOSE_DEBUG,"Mouse Button Press. x=%d y=%d", event.button.x, event.button.y);
+ 
+                         if ( event.button.button == SDL_BUTTON_LEFT ) {
+@@ -1490,6 +1513,7 @@ See the SDL documentation. Scancodes represent the physical position of the keys
+ 		}
+ 
+ 		if (event.type==SDL_MOUSEBUTTONUP) {
++			mouse_timer = SDL_GetTicks();
+                         debug_printf (VERBOSE_DEBUG,"Mouse Button release. x=%d y=%d", event.button.x, event.button.y);
+                         if ( event.button.button == SDL_BUTTON_LEFT ) {
+ 				//mouse_left=0;
+-- 
+2.30.0
+
+
+From 403b033b0726c2f24de53a44728dcd405a2a5419 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 28 Jan 2021 12:20:45 +1000
+Subject: Add cursor.bmp to install
+
+
+diff --git a/src/configure b/src/configure
+index 2e6ce64..2d6ecda 100755
+--- a/src/configure
++++ b/src/configure
+@@ -1625,7 +1625,7 @@ clean:
+ 	rm -f ZEsarUX-\$(EMULATOR_VERSION)-windows.zip
+ 	rm -f ZEsarUX-\$(EMULATOR_VERSION)-extras.zip
+ 
+-COMMONFILES=ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft zesarux.mp3 zesarux.xcf editionnamegame.tap editionnamegame.tap.config bin_sprite_to_c.sh keyboard_*.bmp
++COMMONFILES=ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft zesarux.mp3 zesarux.xcf editionnamegame.tap editionnamegame.tap.config bin_sprite_to_c.sh keyboard_*.bmp cursor.bmp
+ 
+ ONLYSOURCEFILES=macos *.c *.m *.h *.tpl DEVELOPMENT CHECKLIST configure generate_install_sh.sh join_tzx.sh testsound.sh txt_to_basic_lines.sh automatic_tests.sh zxuno_roms_bin_a_flash.sh *.asm benchmark_*.txt current_checklist.txt patches prism_change_boot.txt 
+ 
+-- 
+2.30.0
+
+
+From 293fb8794d8dc02b4790a41cd71c224523fe23d2 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 28 Jan 2021 12:57:37 +1000
+Subject: Add cursor.bmp to generate_install_sh script
+
+
+diff --git a/src/generate_install_sh.sh b/src/generate_install_sh.sh
+index b3ba1f5..a788bcd 100755
+--- a/src/generate_install_sh.sh
++++ b/src/generate_install_sh.sh
+@@ -13,7 +13,7 @@ mkdir -p $INSTALLPREFIX
+ mkdir -p $INSTALLPREFIX/bin
+ mkdir -p $INSTALLPREFIX/share/zesarux/
+ 
+-COMMONFILES="ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft zesarux.mp3 zesarux.xcf editionnamegame.tap editionnamegame.tap.config bin_sprite_to_c.sh keyboard_*.bmp"
++COMMONFILES="ACKNOWLEDGEMENTS LICENSE LICENSES_info licenses Changelog TODO* README HISTORY FEATURES INSTALL INSTALLWINDOWS ALTERNATEROMS INCLUDEDTAPES DONATE FAQ *.odt mantransfev3.bin *.rom zxuno.flash tbblue.mmc speech_filters my_soft zesarux.mp3 zesarux.xcf editionnamegame.tap editionnamegame.tap.config bin_sprite_to_c.sh keyboard_*.bmp cursor.bmp"
+ 
+ 
+ cp -a \$COMMONFILES $INSTALLPREFIX/share/zesarux/
+-- 
+2.30.0
+
+
+From f4c35f8aafd4ae1d19797cb992cfff0200f7f302 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 28 Jan 2021 14:42:09 +1000
+Subject: Use sdl by default
+
+
+diff --git a/src/cpu.c b/src/cpu.c
+index 4d4bee0..76c2c6e 100644
+--- a/src/cpu.c
++++ b/src/cpu.c
+@@ -260,8 +260,13 @@ driver_struct audio_driver_array[MAX_SCR_INIT];
+ int num_audio_driver_array=0;
+ 
+ //Los inicializamos a cadena vacia... No poner NULL, dado que hay varios strcmp que se comparan contra esto
++#ifdef __HAIKU__
++char *driver_screen="sdl";
++char *driver_audio="sdl";
++#else
+ char *driver_screen="";
+ char *driver_audio="";
++#endif
+ 
+ 
+ //porcentaje de velocidad de la cpu
+@@ -8905,4 +8910,4 @@ void end_emulator_saveornot_config(int saveconfig)
+ void end_emulator(void)
+ {
+ 	end_emulator_saveornot_config(1);
+-}
+\ No newline at end of file
++}
+-- 
+2.30.0
+
+
+From 31ca950871a543179d337403dbf254efaac76b7d Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 28 Jan 2021 14:44:43 +1000
+Subject: Relative path for cursor.bmp
+
+
+diff --git a/src/scrsdl2.c b/src/scrsdl2.c
+index 403d997..5602950 100644
+--- a/src/scrsdl2.c
++++ b/src/scrsdl2.c
+@@ -135,7 +135,7 @@ int scrsdl_crea_ventana(void)
+ 
+ 	menu_init_footer();
+ 
+-	SDL_Surface *cursor = SDL_LoadBMP("share/zesaruz/cursor.bmp");
++	SDL_Surface *cursor = SDL_LoadBMP("./share/zesarux/cursor.bmp");
+ 	SDL_SetColorKey(cursor, SDL_TRUE, SDL_MapRGB(cursor->format, 0, 0, 255));
+ 	cursor_texture = SDL_CreateTextureFromSurface(renderer, cursor);
+ 	SDL_SetTextureBlendMode(cursor_texture, SDL_BLENDMODE_BLEND);
+-- 
+2.30.0
+
+
+From 716ba7768b355ccaf45a39154eb1ea26f3686655 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 28 Jan 2021 14:45:09 +1000
+Subject: Move settings from home dir
+
+
+diff --git a/src/utils.h b/src/utils.h
+index 93eddff..f9395c0 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -608,7 +608,11 @@ extern void convert_numeros_letras_puerto_teclado_continue(z80_byte tecla,int pr
+ 
+ extern int util_tape_tap_get_info(z80_byte *tape,char *texto);
+ 
++#ifdef __HAIKU__
++#define DEFAULT_ZESARUX_CONFIG_FILE "config/settings/zesaruxrc"
++#else
+ #define DEFAULT_ZESARUX_CONFIG_FILE ".zesaruxrc"
++#endif
+ 
+ extern char *customconfigfile;
+ 
+-- 
+2.30.0
+
+
+From a7126ec66221997c38e69c943823f91c799a8302 Mon Sep 17 00:00:00 2001
+From: Gerasim Troeglazov <3dEyes@gmail.com>
+Date: Thu, 28 Jan 2021 17:06:58 +1000
+Subject: Move share data to appsDir/data folder
+
+
+diff --git a/src/menu.c b/src/menu.c
+index 1b13790..dfb9085 100644
+--- a/src/menu.c
++++ b/src/menu.c
+@@ -1359,7 +1359,11 @@ void menu_chdir_sharedfiles(void)
+ 	menu_filesel_chdir("../Resources");
+ 
+ 	char installshare[PATH_MAX];
++#ifdef __HAIKU__
++	sprintf (installshare,"%s/%s",INSTALL_PREFIX,"/data/");
++#else
+ 	sprintf (installshare,"%s/%s",INSTALL_PREFIX,"/share/zesarux/");
++#endif
+ 	debug_printf(VERBOSE_INFO,"Trying %s",installshare);
+ 	menu_filesel_chdir(installshare);
+ 
+diff --git a/src/scrsdl2.c b/src/scrsdl2.c
+index 5602950..00318a8 100644
+--- a/src/scrsdl2.c
++++ b/src/scrsdl2.c
+@@ -135,7 +135,11 @@ int scrsdl_crea_ventana(void)
+ 
+ 	menu_init_footer();
+ 
+-	SDL_Surface *cursor = SDL_LoadBMP("./share/zesarux/cursor.bmp");
++#ifdef __HAIKU__
++	SDL_Surface *cursor = SDL_LoadBMP(INSTALL_PREFIX "/data/cursor.bmp");
++#else
++	SDL_Surface *cursor = SDL_LoadBMP(INSTALL_PREFIX "/share/zesarux/cursor.bmp");
++#endif
+ 	SDL_SetColorKey(cursor, SDL_TRUE, SDL_MapRGB(cursor->format, 0, 0, 255));
+ 	cursor_texture = SDL_CreateTextureFromSurface(renderer, cursor);
+ 	SDL_SetTextureBlendMode(cursor_texture, SDL_BLENDMODE_BLEND);
+@@ -319,7 +323,7 @@ void scrsdl_refresca_pantalla_solo_driver(void)
+   }
+   SDL_RenderClear(renderer);
+   SDL_RenderCopy(renderer, scrsdl_texture, NULL, &texture_frame);
+-  if (mouse_pointer_shown.v != 0) {
++  if (mouse_pointer_shown.v != 0 && cursor_texture!=NULL) {
+ 	if (SDL_GetTicks() - mouse_timer < 2000) {
+ 		SDL_Rect mouse_rect = {mouse_x * zoom_width, mouse_y * zoom_height, 12, 19};
+ 		SDL_RenderCopy(renderer, cursor_texture, NULL, &mouse_rect);
+diff --git a/src/utils.c b/src/utils.c
+index da7c619..9873ba4 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -1189,7 +1189,11 @@ void old_open_sharedfile(char *archivo,FILE **f)
+ 
+                 //sino, en INSTALLPREFIX/share/zesarux
+                 if (!(*f)) {
++#ifdef __HAIKU__
++                        sprintf(buffer_nombre,"%s/%s/%s",INSTALL_PREFIX,"/data/",archivo);
++#else
+                         sprintf(buffer_nombre,"%s/%s/%s",INSTALL_PREFIX,"/share/zesarux/",archivo);
++#endif
+                         debug_printf(VERBOSE_INFO,"Looking for file %s",buffer_nombre);
+                         *f=fopen(buffer_nombre,"rb");
+                 }
+@@ -1224,7 +1228,11 @@ int find_sharedfile(char *archivo,char *ruta_final)
+ 
+                 //sino, en INSTALLPREFIX/share/zesarux
+                 if (!existe) {
++#ifdef __HAIKU__
++                        sprintf(buffer_nombre,"%s/%s/%s",INSTALL_PREFIX,"/data/",archivo);
++#else
+                         sprintf(buffer_nombre,"%s/%s/%s",INSTALL_PREFIX,"/share/zesarux/",archivo);
++#endif
+                         debug_printf(VERBOSE_INFO,"Looking for file %s",buffer_nombre);
+                         existe=si_existe_archivo(buffer_nombre);
+                 }
+@@ -1295,7 +1303,11 @@ void open_sharedfile_write(char *archivo,FILE **f)
+ 
+                 //sino, en INSTALLPREFIX/share/zesarux
+                 if (!(*f)) {
++#ifdef __HAIKU__
++                        sprintf(buffer_nombre,"%s/%s/%s",INSTALL_PREFIX,"/data/",archivo);
++#else
+                         sprintf(buffer_nombre,"%s/%s/%s",INSTALL_PREFIX,"/share/zesarux/",archivo);
++#endif
+                         debug_printf(VERBOSE_INFO,"Looking for file %s",buffer_nombre);
+                         open_sharedfile_write_open(buffer_nombre,f);
+                 }
+@@ -18994,4 +19006,4 @@ void util_write_long_value(z80_byte *destino,unsigned int valor)
+ unsigned int util_read_long_value(z80_byte *origen)
+ {
+     return (origen[0])|(origen[1]<<8)|(origen[2]<<16)|(origen[3]<<24);
+-}
+\ No newline at end of file
++}
+-- 
+2.30.0
+

app-emulation/zesarux/zesarux-9.1.recipe

@@ -0,0 +1,106 @@
+SUMMARY="ZX Second-Emulator And Released for UniX"
+DESCRIPTION="It's a ZX Machines Emulator for UNIX based operating systems (and Windows), \
+including all the Sinclair computers:
+* MK14
+* ZX80
+* ZX81
+* ZX Spectrum
+* QL
+* Z88
+
+And also:
+* Timex TS 2068
+* Sam Coupe
+* Pentagon
+* Chloe 140 SE, 280 SE
+* Chrome
+* Prism
+* ZX-Uno
+* ZX-Evolution BaseConf
+* ZX-Evolution TS-Conf
+* TBBlue/ZX Spectrum Next
+* Jupiter Ace
+* Amstrad CPC 464, CPC 4128
+* MSX1
+* Spectravideo 318/328
+* Colecovision
+* Sega SG1000."
+HOMEPAGE="https://github.com/chernandezba/zesarux"
+COPYRIGHT="Cesar Hernandez Bano"
+LICENSE="GNU GPL v2"
+REVISION="2"
+SOURCE_URI="https://github.com/chernandezba/zesarux/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="bc911f64bf6d7f3dfee771d796bf925d7ca3acb19ada6184ff13d6719b17f21b"
+SOURCE_DIR="zesarux-$portVersion"
+PATCHES="zesarux-$portVersion.patchset"
+
+ADDITIONAL_FILES="zesarux.rdef.in"
+
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	zesarux$secondaryArchSuffix = $portVersion
+	app:ZEsarUX
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	cmd:gunzip
+	cmd:sox$secondaryArchSuffix
+	cmd:tar
+	cmd:unrar
+	lib:libGL$secondaryArchSuffix
+	lib:libSDL2_2.0$secondaryArchSuffix
+	lib:libsndfile$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libpng16$secondaryArchSuffix
+	devel:libSDL2_2.0$secondaryArchSuffix
+	devel:libsndfile$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:bison
+	cmd:find
+	cmd:flex
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:which
+	cmd:xargs
+	"
+
+BUILD()
+{
+	cd src
+	LDFLAGS="-lnetwork" ./configure --prefix=$appsDir/ZEsarUX --enable-sdl2
+	make $jobArgs
+}
+
+INSTALL()
+{
+	cd src
+	make install
+	mv $appsDir/ZEsarUX/bin/zesarux $appsDir/ZEsarUX/ZEsarUX
+	mv $appsDir/ZEsarUX/share/zesarux $appsDir/ZEsarUX/data
+	rm -rf $appsDir/ZEsarUX/{bin,share}
+
+	local APP_SIGNATURE="application/x-vnd.zesarux"
+	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|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/zesarux.rdef.in > zesarux.rdef
+
+	addResourcesToBinaries zesarux.rdef $appsDir/ZEsarUX/ZEsarUX
+	addAppDeskbarSymlink $appsDir/ZEsarUX/ZEsarUX
+}

app-forensics/aflplusplus/additional-files/create-aflplusplus-directory.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+#create directory debug_server if not present
+if [ ! -d ~/config/settings/system/debug_server ]; then
+	mkdir -p ~/config/settings/system/debug_server
+fi

app-forensics/aflplusplus/aflplusplus-3.12c.recipe

@@ -0,0 +1,107 @@
+SUMMARY="American fuzzy lop, a security-oriented fuzzer"
+DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
+HOMEPAGE="https://aflplus.plus/"
+COPYRIGHT="2013-2016 Google Inc.
+	2013-2016 Michał Zalewski
+	2017-2021 Marc Heuse
+	2017-2021 Heiko Eißfeldt
+	2017-2021 Andrea Fioraldi
+	2017-2021 Dominik Maier"
+LICENSE="Apache v2"
+REVISION="4"
+SOURCE_URI="https://github.com/AFLplusplus/AFLplusplus/archive/refs/tags/$portVersion.tar.gz"
+CHECKSUM_SHA256="0240d34a2f99d157063e31d0c2d2801a68bc015e09187d9cc197637ec8fda635"
+SOURCE_FILENAME="aflplusplus-$portVersion.tar.gz"
+SOURCE_DIR="AFLplusplus-$portVersion"
+# Imported also Gentoo patches
+PATCHES="aflplusplus-$portVersion.patchset
+	aflplusplus-3.0c-CFLAGS.patch
+	aflplusplus-3.0c-LDFLAGS.patch"
+ADDITIONAL_FILES="create-aflplusplus-directory.sh"
+
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+POST_INSTALL_SCRIPTS="
+	$relativePostInstallDir/create-aflplusplus-directory.sh
+	"
+
+PROVIDES="
+	aflplusplus$secondaryArchSuffix = $portVersion
+	cmd:afl_analyze = $portVersion
+	cmd:afl_c++ = $portVersion
+	cmd:afl_cc = $portVersion
+	cmd:afl_clang++ = $portVersion
+	cmd:afl_clang = $portVersion
+	cmd:afl_cmin = $portVersion
+	cmd:afl_cmin.bash = $portVersion
+	cmd:afl_fuzz = $portVersion
+	cmd:afl_g++ = $portVersion
+	cmd:afl_gcc = $portVersion
+	cmd:afl_gotcpu = $portVersion
+	cmd:afl_plot = $portVersion
+	cmd:afl_showmap = $portVersion
+	cmd:afl_system_config = $portVersion
+	cmd:afl_tmin = $portVersion
+	cmd:afl_whatsup = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libgmp$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libpython3.7m$secondaryArchSuffix
+	lib:libLLVM_9$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	gcc${secondaryArchSuffix}_syslibs_devel
+	devel:libgmp$secondaryArchSuffix
+	devel:libLLVM_9$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gawk
+	cmd:clang >= 9.0.1
+	cmd:make
+	cmd:gcc$secondaryArchSuffix
+	"
+
+TEST_REQUIRES="
+	cmd:diff
+	devel:libcmocka$secondaryArchSuffix
+	"
+
+PATCH()
+{
+	# grabbed from Gentoo port
+	sed -i -e 's/-O3 -fno-unroll-loops//' GNUmakefile
+}
+
+makeAfl()
+{
+	make -f GNUmakefile \
+		PREFIX=$prefix \
+		BIN_PATH=$prefix/bin \
+		HELPER_PATH=$libDir/afl \
+		DOC_PATH=$docDir \
+		MISC_PATH=$dataDir/afl \
+		MAN_PATH=$manDir/man8 \
+		"$@" V=1
+}
+
+BUILD()
+{
+	makeAfl $jobArgs
+}
+
+INSTALL()
+{
+	makeAfl install
+	mkdir -p $postInstallDir
+	cp -f $portDir/additional-files/create-aflplusplus-directory.sh $postInstallDir
+}
+
+TEST()
+{
+	make tests
+}

app-forensics/aflplusplus/patches/aflplusplus-3.0c-CFLAGS.patch

@@ -0,0 +1,110 @@
+--- a/GNUmakefile.gcc_plugin
++++ b/GNUmakefile.gcc_plugin
+@@ -28,14 +28,14 @@ MAN_PATH    ?= $(PREFIX)/share/man/man8
+ 
+ VERSION     = $(shell grep '^$(HASH)define VERSION ' ./config.h | cut -d '"' -f2)
+ 
+-CFLAGS          ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
++CFLAGS          ?= -D_FORTIFY_SOURCE=2
+ CFLAGS_SAFE     := -Wall -Iinclude -Wno-pointer-sign \
+                    -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
+                    -DGCC_VERSION=\"$(GCCVER)\" -DGCC_BINDIR=\"$(GCCBINDIR)\" \
+                    -Wno-unused-function
+ override CFLAGS += $(CFLAGS_SAFE)
+ 
+-CXXFLAGS    ?= -O3 -g -funroll-loops -D_FORTIFY_SOURCE=2
++CXXFLAGS    ?= -D_FORTIFY_SOURCE=2
+ CXXEFLAGS   := $(CXXFLAGS) -Wall -std=c++11
+ 
+ CC          ?= gcc
+--- a/GNUmakefile.llvm
++++ b/GNUmakefile.llvm
+@@ -237,7 +237,7 @@ else
+         AFL_CLANG_DEBUG_PREFIX =
+ endif
+ 
+-CFLAGS          ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
++CFLAGS          ?= -fPIC -D_FORTIFY_SOURCE=2
+ CFLAGS_SAFE     := -Wall -g -Wno-cast-qual -Wno-variadic-macros -Wno-pointer-sign -I ./include/ -I ./instrumentation/ \
+                    -DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \
+                    -DLLVM_BINDIR=\"$(LLVM_BINDIR)\" -DVERSION=\"$(VERSION)\" \
+@@ -254,7 +254,7 @@ ifdef AFL_TRACE_PC
+   $(info Compile option AFL_TRACE_PC is deprecated, just set AFL_LLVM_INSTRUMENT=PCGUARD to activate when compiling targets )
+ endif
+ 
+-CXXFLAGS          ?= -O3 -funroll-loops -fPIC -D_FORTIFY_SOURCE=2
++CXXFLAGS          ?= -fPIC -D_FORTIFY_SOURCE=2
+ override CXXFLAGS += -Wall -g -I ./include/ \
+                      -DVERSION=\"$(VERSION)\" -Wno-variadic-macros \
+                      -DLLVM_MINOR=$(LLVM_MINOR) -DLLVM_MAJOR=$(LLVM_MAJOR)
+@@ -434,20 +434,20 @@ afl-llvm-dict2file.so:	instrumentation/afl-llvm-dict2file.so.cc instrumentation/
+ 
+ .PHONY: document
+ document:
+-	$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt.o
+-	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -m32 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-32.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
+-	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -O3 -Wno-unused-result -m64 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-64.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
++	$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt.o
++	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -m32 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-32.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
++	@$(CLANG_BIN) -D_AFL_DOCUMENT_MUTATIONS $(CFLAGS_SAFE) $(CPPFLAGS) $(CLANG_CFL) -Wno-unused-result -m64 -fPIC -c instrumentation/afl-compiler-rt.o.c -o ./afl-compiler-rt-64.o 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; else echo "failed (that's fine)"; fi
+ 
+ ./afl-compiler-rt.o: instrumentation/afl-compiler-rt.o.c
+-	$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -fPIC -c $< -o $@
++	$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -fPIC -c $< -o $@
+ 
+ ./afl-compiler-rt-32.o: instrumentation/afl-compiler-rt.o.c
+ 	@printf "[*] Building 32-bit variant of the runtime (-m32)... "
+-	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-32.o afl-llvm-rt-32.o; else echo "failed (that's fine)"; fi
++	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m32 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-32.o afl-llvm-rt-32.o; else echo "failed (that's fine)"; fi
+ 
+ ./afl-compiler-rt-64.o: instrumentation/afl-compiler-rt.o.c
+ 	@printf "[*] Building 64-bit variant of the runtime (-m64)... "
+-	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -O3 -Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-64.o afl-llvm-rt-64.o; else echo "failed (that's fine)"; fi
++	@$(CC) $(CLANG_CFL) $(CFLAGS_SAFE) $(CPPFLAGS) -Wno-unused-result -m64 -fPIC -c $< -o $@ 2>/dev/null; if [ "$$?" = "0" ]; then echo "success!"; ln -sf afl-compiler-rt-64.o afl-llvm-rt-64.o; else echo "failed (that's fine)"; fi
+ 
+ .PHONY: test_build
+ test_build: $(PROGS)
+--- a/unicorn_mode/samples/c/Makefile
++++ b/unicorn_mode/samples/c/Makefile
+@@ -35,7 +35,7 @@ clean:
+ 	rm -rf *.o harness harness-debug
+ 
+ harness.o: harness.c ../../unicornafl/include/unicorn/*.h
+-	${MYCC} ${CFLAGS} -O3 -c harness.c
++	${MYCC} ${CFLAGS} -c harness.c
+ 
+ harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
+ 	${MYCC} ${CFLAGS} -g -c harness.c -o $@
+--- a/unicorn_mode/samples/persistent/Makefile
++++ b/unicorn_mode/samples/persistent/Makefile
+@@ -35,7 +35,7 @@ clean:
+ 	rm -rf *.o harness harness-debug
+ 
+ harness.o: harness.c ../../unicornafl/include/unicorn/*.h
+-	${MYCC} ${CFLAGS} -O3 -c harness.c
++	${MYCC} ${CFLAGS} -c harness.c
+ 
+ harness-debug.o: harness.c ../../unicornafl/include/unicorn/*.h
+ 	${MYCC} ${CFLAGS} -DAFL_DEBUG=1 -g -c harness.c -o $@
+--- a/utils/afl_untracer/Makefile
++++ b/utils/afl_untracer/Makefile
+@@ -1,7 +1,7 @@
+ ifdef DEBUG
+   OPT=-O0
+ else
+-  OPT=-O3
++  OPT?=-O2
+ endif
+ 
+ all:	afl-untracer libtestinstr.so
+--- a/utils/custom_mutators/Makefile
++++ b/utils/custom_mutators/Makefile
+@@ -1,7 +1,7 @@
+ all: libexamplemutator.so
+ 
+ libexamplemutator.so:
+-	$(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -O3 -fPIC -shared -g -I ../../include example.c -o libexamplemutator.so
++	$(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -fPIC -shared -g -I ../../include example.c -o libexamplemutator.so
+ 
+ clean:
+ 	rm -rf libexamplemutator.so

app-forensics/aflplusplus/patches/aflplusplus-3.0c-LDFLAGS.patch

@@ -0,0 +1,11 @@
+--- a/GNUmakefile.gcc_plugin
++++ b/GNUmakefile.gcc_plugin
+@@ -129,7 +129,7 @@ afl-common.o: ./src/afl-common.c
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ $(LDFLAGS)
+ 
+ ./afl-gcc-pass.so: instrumentation/afl-gcc-pass.so.cc | test_deps
+-	$(CXX) $(CXXEFLAGS) $(PLUGIN_FLAGS) -shared $< -o $@
++	$(CXX) $(CXXEFLAGS) $(PLUGIN_FLAGS) -shared $< -o $@ $(LDFLAGS)
+ 	ln -sf afl-cc afl-gcc-fast
+ 	ln -sf afl-cc afl-g++-fast
+ 	ln -sf afl-cc.8 afl-gcc-fast.8

app-forensics/aflplusplus/patches/aflplusplus-3.12c.patchset

@@ -0,0 +1,137 @@
+From aeabdfbfa833807d4913e82c3316cf717140bf50 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 4 Apr 2021 13:49:51 +0000
+Subject: Fix missing defines for "#ifndef USEMMAP"
+
+Haiku doesn't provide <sys/syscall.h>
+
+Fix undefind reference to SYS_write
+
+Add -lnetwork to dependencies
+
+diff --git a/GNUmakefile b/GNUmakefile
+index ac8fe79..542097a 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -164,7 +164,7 @@ endif
+ ifeq "$(shell uname -s)" "Haiku"
+   SHMAT_OK=0
+   override CFLAGS  += -DUSEMMAP=1 -Wno-error=format -fPIC
+-  LDFLAGS += -Wno-deprecated-declarations -lgnu
++  LDFLAGS += -Wno-deprecated-declarations -lgnu -lnetwork
+   SPECIAL_PERFORMANCE += -DUSEMMAP=1
+ endif
+ 
+diff --git a/instrumentation/afl-compiler-rt.o.c b/instrumentation/afl-compiler-rt.o.c
+index f241447..a33b351 100644
+--- a/instrumentation/afl-compiler-rt.o.c
++++ b/instrumentation/afl-compiler-rt.o.c
+@@ -34,8 +34,10 @@
+ #include <errno.h>
+ 
+ #include <sys/mman.h>
+-#include <sys/syscall.h>
+ #ifndef __HAIKU__
++#include <sys/syscall.h>
++#endif
++#ifndef USEMMAP
+   #include <sys/shm.h>
+ #endif
+ #include <sys/wait.h>
+@@ -76,6 +78,10 @@
+   #define MAP_INITIAL_SIZE MAP_SIZE
+ #endif
+ 
++#if defined(__HAIKU__)
++  extern ssize_t _kern_write(int fd, off_t pos, const void *buffer,	size_t bufferSize);
++#endif // HAIKU
++
+ u8   __afl_area_initial[MAP_INITIAL_SIZE];
+ u8 * __afl_area_ptr_dummy = __afl_area_initial;
+ u8 * __afl_area_ptr = __afl_area_initial;
+@@ -1738,7 +1744,11 @@ static int area_is_valid(void *ptr, size_t len) {
+ 
+   if (unlikely(!ptr || __asan_region_is_poisoned(ptr, len))) { return 0; }
+ 
+-  long r = syscall(SYS_write, __afl_dummy_fd[1], ptr, len);
++  #ifndef __HAIKU__
++    long r = syscall(SYS_write, __afl_dummy_fd[1], ptr, len);
++  #else
++    long r = _kern_write(__afl_dummy_fd[1], -1, ptr, len);
++  #endif // HAIKU
+ 
+   if (r <= 0 || r > len) return 0;
+ 
+diff --git a/utils/afl_network_proxy/afl-network-server.c b/utils/afl_network_proxy/afl-network-server.c
+index 0dfae65..60f174e 100644
+--- a/utils/afl_network_proxy/afl-network-server.c
++++ b/utils/afl_network_proxy/afl-network-server.c
+@@ -45,7 +45,6 @@
+ 
+ #include <sys/wait.h>
+ #include <sys/time.h>
+-#include <sys/shm.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/resource.h>
+@@ -53,7 +52,9 @@
+ #include <netinet/ip6.h>
+ #include <arpa/inet.h>
+ #include <sys/mman.h>
+-#include <sys/shm.h>
++#ifndef USEMMAP
++  #include <sys/shm.h>
++#endif
+ #include <sys/socket.h>
+ #include <netdb.h>
+ 
+-- 
+2.30.2
+
+
+From d45b1bca8d0823aa10e9af24a1cd322ec3a01716 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Mon, 5 Apr 2021 08:52:46 +0000
+Subject: Remove crashing test
+
+
+diff --git a/test/test-all.sh b/test/test-all.sh
+index 8df4bef..5935b76 100755
+--- a/test/test-all.sh
++++ b/test/test-all.sh
+@@ -10,8 +10,6 @@
+ 
+ . ./test-gcc-plugin.sh
+ 
+-. ./test-libextensions.sh
+-
+ . ./test-qemu-mode.sh
+ 
+ . ./test-unicorn-mode.sh
+-- 
+2.30.2
+
+
+From 298a69e24f1a8ea738438ac7019edc1532ffc674 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Fri, 9 Apr 2021 17:27:53 +0200
+Subject: Fix build on x86_64
+
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 542097a..58278e6 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -166,6 +166,9 @@ ifeq "$(shell uname -s)" "Haiku"
+   override CFLAGS  += -DUSEMMAP=1 -Wno-error=format -fPIC
+   LDFLAGS += -Wno-deprecated-declarations -lgnu -lnetwork
+   SPECIAL_PERFORMANCE += -DUSEMMAP=1
++  ifeq "$(shell uname -m)" "x86_64"
++	AFL_NO_X86=1
++  endif
+ endif
+ 
+ AFL_FUZZ_FILES = $(wildcard src/afl-fuzz*.c)
+-- 
+2.30.2
+

app-i18n/uchardet/uchardet-0.0.7.recipe

@@ -9,9 +9,9 @@ charsets, and more reliably than the original implementation."
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/"
 COPYRIGHT="2015-2016 BYVoid, Jehan"
 LICENSE="MPL v1.1"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://www.freedesktop.org/software/uchardet/releases/uchardet-$portVersion.tar.xz"
-CHECKSUM_SHA256="8351328cdfbcb2432e63938721dd781eb8c11ebc56e3a89d0f84576b96002c61"
+CHECKSUM_SHA256="3fc79408ae1d84b406922fa9319ce005631c95ca0f34b205fad867e8b30e45b1"
 PATCHES="uchardet-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -19,7 +19,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	uchardet$secondaryArchSuffix = $portVersion
-	lib:libuchardet$secondaryArchSuffix = $portVersion
+	lib:libuchardet$secondaryArchSuffix = $portVersion compat >= 0
 	"
 if [ -z "$secondaryArchSuffix" ]; then
 	PROVIDES="$PROVIDES
@@ -33,7 +33,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	uchardet${secondaryArchSuffix}_devel = $portVersion
-	devel:libuchardet$secondaryArchSuffix = $portVersion
+	devel:libuchardet$secondaryArchSuffix = $portVersion compat >= 0
 	"
 REQUIRES_devel="
 	uchardet$secondaryArchSuffix == $portVersion base
@@ -65,6 +65,8 @@ INSTALL()
 {
 	make install
 
+	rm $libDir/libuchardet.a
+
 	prepareInstalledDevelLibs libuchardet
 	fixPkgconfig
 

app-misc/colordiff/colordiff-1.0.19.recipe

@@ -8,7 +8,7 @@ COPYRIGHT="2002-2012 Dave Ewart"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="http://www.colordiff.org/colordiff-$portVersion.tar.gz"
-CHECKSUM_SHA256="29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0"
+CHECKSUM_SHA256="46e8c14d87f6c4b77a273cdd97020fda88d5b2be42cf015d5d84aca3dfff3b19"
 PATCHES="colordiff-$portVersion.patchset"
 
 ARCHITECTURES="any"

app-misc/jdreplace/jdreplace-2.2.recipe

@@ -0,0 +1,39 @@
+SUMMARY="A mass replacement tool"
+DESCRIPTION="jdTextEdit allows replacing text in all files in a folder"
+HOMEPAGE="https://gitlab.com/JakobDev/jdReplace"
+COPYRIGHT="2019 JakobDev"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://gitlab.com/JakobDev/jdReplace/-/archive/$portVersion/jdReplace-$portVersion.tar.gz"
+CHECKSUM_SHA256="8a8df34b3dd4c80ac3561f109162fb3ef81008a50ebc3ce3915ef0a3139e16b5"
+SOURCE_DIR="jdReplace-$portVersion"
+
+ARCHITECTURES="any"
+
+PROVIDES="
+	jdreplace = $portVersion
+	app:jdReplace = $portVersion
+	"
+
+REQUIRES="
+	haiku
+	cmd:python3.8
+	pyqt5_python38
+	jdtranslationhelper_python38
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	setuptools_python38
+	"
+
+INSTALL()
+{
+	python3.8 setup.py install \
+		--root=/ --prefix=$prefix \
+		--install-data=$dataDir
+	mkdir -p $appsDir
+	mv $prefix/bin/jdReplace $appsDir/jdReplace
+	settype -t application/x-vnd.Be-elfexecutable $appsDir/jdReplace
+	addAppDeskbarSymlink $appsDir/jdReplace "jdReplace"
+}

app-misc/mc/mc-4.8.23.recipe

@@ -1,81 +0,0 @@
-SUMMARY="A powerful file manager"
-DESCRIPTION="GNU Midnight Commander is a text-mode full-screen file manager. \
-It uses a two panel interface and a subshell for command execution. It \
-includes an internal editor with syntax highlighting and an internal viewer \
-with support for binary files. Also included is Virtual Filesystem (VFS), \
-that allows files on remote systems (e.g. FTP, SSH servers) and files inside \
-archives to be manipulated like real files."
-HOMEPAGE="https://www.midnight-commander.org/"
-COPYRIGHT="1994-2019, Free Software Foundation"
-LICENSE="GNU GPL v2"
-REVISION="1"
-SOURCE_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz"
-CHECKSUM_SHA256="dd7f7ce74183307b0df25b5c3e60ad3293fd3d3d27d2f37dd7a10efce13dff1c"
-
-ARCHITECTURES="x86_gcc2 x86_64"
-
-GLOBAL_WRITABLE_FILES="settings/mc directory keep-old"
-
-PROVIDES="
-	mc = $portVersion
-	cmd:mc = $portVersion
-	cmd:mcdiff = $portVersion
-	cmd:mcedit = $portVersion
-	cmd:mcview = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libglib_2.0
-	lib:libiconv
-	lib:libintl
-	lib:libncursesw
-	lib:libssh2
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libglib_2.0 >= 0.38
-	devel:libiconv
-	devel:libintl
-	devel:libncursesw
-	devel:libssh2
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:awk
-	cmd:find
-	cmd:gcc
-	cmd:gettext
-	cmd:make
-	cmd:perl
-	cmd:pkg_config
-	cmd:tar
-	"
-
-PATCH()
-{
-	sed -i '1i #define REAL_UNIX_SYSTEM' lib/tty/tty-slang.h
-}
-
-BUILD()
-{
-	CFLAGS="-D_BSD_SOURCE" LIBS=-lnetwork runConfigure configure \
-		--datarootdir="$dataRootDir" \
-		--enable-vfs-smb \
-		--with-smb-configdir="$settingsDir/samba" \
-		--with-smb-codepagedir="$settingsDir/samba" \
-		--with-homedir="$settingsDir/mc" \
-		--with-screen=ncurses
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make $jobArgs install-strip
-}
-
-TEST()
-{
-	make check
-}

app-misc/mc/mc-4.8.26.recipe

@@ -0,0 +1,91 @@
+SUMMARY="A powerful file manager"
+DESCRIPTION="GNU Midnight Commander is a text-mode full-screen file manager. \
+It uses a two panel interface and a subshell for command execution. It \
+includes an internal editor with syntax highlighting and an internal viewer \
+with support for binary files. Also included is Virtual Filesystem (VFS), \
+that allows files on remote systems (e.g. FTP, SSH servers) and files inside \
+archives to be manipulated like real files."
+HOMEPAGE="https://www.midnight-commander.org/"
+COPYRIGHT="1994-2019, Free Software Foundation"
+LICENSE="GNU GPL v2"
+REVISION="4"
+SOURCE_URI="http://ftp.midnight-commander.org/mc-$portVersion.tar.xz"
+CHECKSUM_SHA256="c6deadc50595f2d9a22dc6c299a9f28b393e358346ebf6ca444a8469dc166c27"
+
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]
+then
+	commandBinDir=$prefix/bin
+	commandSuffix=
+fi
+
+GLOBAL_WRITABLE_FILES="settings/mc directory keep-old"
+
+PROVIDES="
+	mc$secondaryArchSuffix = $portVersion
+	cmd:mc$commandSuffix = $portVersion
+	cmd:mcdiff$commandSuffix = $portVersion
+	cmd:mcedit$commandSuffix = $portVersion
+	cmd:mcview$commandSuffix = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libncursesw$secondaryArchSuffix
+	lib:libssh2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libglib_2.0$secondaryArchSuffix >= 0.38
+	devel:libiconv$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libncursesw$secondaryArchSuffix
+	devel:libssh2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:find
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:perl
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:tar
+	"
+
+PATCH()
+{
+	sed -i '1i #define REAL_UNIX_SYSTEM' lib/tty/tty-slang.h
+}
+
+BUILD()
+{
+	CFLAGS="-D_BSD_SOURCE -D_XOPEN_SOURCE_EXTENDED" \
+		LIBS="-lnetwork -lbsd" runConfigure --omit-dirs binDir configure \
+		--bindir=$commandBinDir \
+		--datarootdir="$dataRootDir" \
+		--enable-vfs-smb \
+		--with-smb-configdir="$settingsDir/samba" \
+		--with-smb-codepagedir="$settingsDir/samba" \
+		--with-homedir="$settingsDir/mc" \
+		--with-screen=ncurses
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make $jobArgs install-strip
+}
+
+TEST()
+{
+	make check
+}

app-misc/neofetch/neofetch-7.1.0.recipe

@@ -8,7 +8,7 @@ COPYRIGHT="2016-2020 Dylan Araps"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://github.com/dylanaraps/$portName/archive/$portVersion/$portVersionedName.tar.gz"
-CHECKSUM_SHA256="8c6bd217cf6d34fc1f3dcbb0e8b1137655bc13fbb21165273dbb2a7bce0d3130"
+CHECKSUM_SHA256="58a95e6b714e41efc804eca389a223309169b2def35e57fa934482a6b47c27e7"
 
 ARCHITECTURES="any"
 

app-misc/nnn/nnn-4.0.recipe

@@ -12,11 +12,11 @@ Cygwin, WSL, Haiku and works seamlessly with DEs and GUI utilities.
 
 Visit the Wiki for concepts, program usage, how-tos and troubleshooting."
 HOMEPAGE="https://github.com/jarun/nnn"
-COPYRIGHT="2016-2020 Arun Prakash Jana"
+COPYRIGHT="2016-2021 Arun Prakash Jana"
 LICENSE="BSD (2-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/jarun/nnn/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="7803ae6e974aeb4008507d9d1afbcca8d084a435f36ff636b459ca50414930a1"
+CHECKSUM_SHA256="a219ec8fad3dd0512aadae5840176f3265188c4c22da3b17b133bac602b40754"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -44,14 +44,8 @@ BUILD_PREREQUIRES="
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:sed
 	"
 
-PATCH()
-{
-	sed -i 's+#+//+g' misc/haiku/nnn.rdef
-}
-
 BUILD()
 {
 	make -f misc/haiku/Makefile $jobArgs

app-misc/pfetch/pfetch-0.6.recipe

@@ -9,7 +9,7 @@ COPYRIGHT="2016-2019 Dylan Araps"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="$HOMEPAGE/archive/$portVersion/$portVersionedName.tar.gz"
-CHECKSUM_SHA256="0f42383ce099c7a3956fe93c803b4882c094e869d4dd09b22806e83b176abe2d"
+CHECKSUM_SHA256="c7d3514a49a08bcf5e57a0bb732b333f7618f4c7d818118ebea6c18310ae26cc"
 
 ARCHITECTURES="any"
 

app-misc/qmodmaster/additional-files/qmodmaster.rdef.in

@@ -0,0 +1,56 @@
+
+resource app_flags B_MULTIPLE_LAUNCH;
+
+resource app_version {
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
+
+	variety = B_APPV_BETA,
+	internal = 0,
+	short_info = "A ModBus master application",
+	long_info = "@LONG_INFO@"
+};
+
+resource app_signature "@APP_SIGNATURE@";
+
+resource file_types message {
+	"types" = "application/x-modmaster"
+};
+
+resource vector_icon {
+	$"6E6369660C010100006A030100000533020006023A5D7039F8F5B9F8F53A5D70"
+	$"48A7854A84E100747474FF3E3D3D020016023C40A33251EBB251EB3C40A34958"
+	$"0048C23D00B0FF830200160336A44A3657D5B6718436C1404C164D4863FE005A"
+	$"38DCFF7E0200160336A44A3657D5B6718436C1404BB3B7494AFF005A38DCFF7E"
+	$"0200160336A44A3657D5B6718436C1404B3AD54A18FF005A38DCFF7E02001603"
+	$"36A44A3657D5B6718436C1404AC1F34A8C7F005A38DCFF7E039ABE5203409461"
+	$"0345806B140A07C73644C8B844C97A46CBBD46CC7F44CAFD42CA9B330A07C431"
+	$"4AC5B44AC6744CC8B84CC97A4AC7F848C797390A07C12B52C2AE52C36F54C5B4"
+	$"54C67452C4F250C491410A07BE2758BFA958C06B5AC2AE5AC36F58C1EE56C18C"
+	$"470607AA3F422A22433C4E5A32512F512F50304B2F4D30492E492C482D492C0A"
+	$"0422493C563C4E22430A043C565A385A323C4E0A043C565A385A323C4E0A0422"
+	$"493C563C4E22430607AA3F422A3931513A5A32512F512F50304B2F4D30492E49"
+	$"2C482D492C0608FAFAC970BCA2C7EFBE13C8B1BE70C851BE41C911BE9DC970BF"
+	$"82C970BF1AC970C05CC9D0C150CA92C096CAF2BE12CAF2BEECCAF2BDA9CA32BD"
+	$"00CA92BD2DC9D1BCD00608FAFAC970BCA2C7EFBE13C8B1BE70C851BE41C911BE"
+	$"9DC970BF82C970BF1AC970C05CC9D0C150CA92C096CAF2BE12CAF2BEECCAF2BD"
+	$"A9CA32BD00CA92BD2DC9D1BCD00608FAFAC66EBF834DC0F3C5AEC150C54EC122"
+	$"C60EC17DC66EC262C66EC1F9C66EC33CC6CEC430C78FC376C7EF43C7EFC1CDC7"
+	$"EFC08AC730BFDFC78FC00DC6CFBFB20608FAFAC66EBF834DC0F3C5AEC150C54E"
+	$"C122C60EC17DC66EC262C66EC1F9C66EC33CC6CEC430C78FC376C7EF43C7EFC1"
+	$"CDC7EFC08AC730BFDFC78FC00DC6CFBFB20608FAFAC36CC264C1EBC3D4C2ABC4"
+	$"30C24BC402C30BC45DC36CC542C36CC4DAC36CC61EC3CCC710C48CC6574DC3D3"
+	$"4DC4AC4DC36AC42CC2BFC48CC2EEC3CDC2910608FAFAC36CC264C1EBC3D4C2AB"
+	$"C430C24BC402C30BC45DC36CC542C36CC4DAC36CC61EC3CCC710C48CC6574DC3"
+	$"D34DC4AC4DC36AC42CC2BFC48CC2EEC3CDC2910608FAFAC06AC543BEE7C6B5BF"
+	$"A8C710BF49C6E3C009C73EC06AC823C06AC7BAC06AC8FEC0C8C9F0C18BC937C1"
+	$"EBC6B4C1EBC78DC1EBC64BC129C5A0C18BC5CEC0C9C5710608FAFAC06AC543BE"
+	$"E7C6B5BFA8C710BF49C6E3C009C73EC06AC823C06AC7BAC06AC8FEC0C8C9F0C1"
+	$"8BC937C1EBC6B4C1EBC78DC1EBC64BC129C5A0C18BC5CEC0C9C5710A0422432E"
+	$"3A47443C4E0A042E3A3931513A4744120A000100000A000101000A000102000A"
+	$"000103000A01030405061001178422040A020107000A030108000A0B0109000A"
+	$"01010A1001178322040A05010B000A01010C1001178322040A06010D000A0101"
+	$"0E1001178322040A07010F000A0101101001178322040A080111000A09011200"
+	$"0A0A011300"
+};

app-misc/qmodmaster/patches/qmodmaster-0.5.2.patchset

@@ -0,0 +1,22 @@
+From 531f66945928b696f21f6c3fe8342d2b1359f0ba Mon Sep 17 00:00:00 2001
+From: mazbrili <mazbrili@yahoo.com>
+Date: Mon, 15 Mar 2021 10:37:18 +0700
+Subject: change  qModMaster.pro so it compileable on haiku
+
+
+diff --git a/qModMaster.pro b/qModMaster.pro
+index 3841d77..ab2f360 100644
+--- a/qModMaster.pro
++++ b/qModMaster.pro
+@@ -74,6 +74,8 @@ win32:DEFINES += _TTY_WIN_  WINVER=0x0501
+ 
+ win32:LIBS += -lsetupapi -lwsock32 -lws2_32
+ 
++haiku:LIBS += -lnetwork 
++
+ QMAKE_CXXFLAGS += -std=gnu++11
+ 
+ DEFINES += QS_LOG_LINE_NUMBERS     # automatically writes the file and line for each log message
+-- 
+2.30.0
+

app-misc/qmodmaster/qmodmaster-0.5.2.recipe

@@ -0,0 +1,82 @@
+SUMMARY="A ModBus master application"
+DESCRIPTION="A Qt-based graphical user interface that allows easy \
+communication with ModBus RTU and TCP slaves.
+
+Features:
+* ModBus RTU/TCP master
+* Monitor bus activity (raw data and PDU details)"
+COPYRIGHT="2012-2020 Elbar"
+HOMEPAGE="https://sourceforge.net/projects/qmodmaster/"
+LICENSE="GNU GPL v3"
+REVISION="1"
+SOURCE_URI="https://download.sourceforge.net/qmodmaster/qModMaster-code-$portVersion-3.zip"
+CHECKSUM_SHA256="1754581e3059f14c31c584aa7abe1f1a602d1814f293823272b1158bbc179b81"
+SOURCE_DIR="qModMaster-code-$portVersion-3"
+ADDITIONAL_FILES="qmodmaster.rdef.in"
+PATCHES=qmodmaster-$portVersion.patchset
+
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	SECONDARY_ARCHITECTURES="x86"
+fi
+
+PROVIDES="
+	qmodmaster$secondaryArchSuffix = $portVersion
+	app:QModMaster = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libGL$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5Xml$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
+	devel:libQt5Network$secondaryArchSuffix
+	devel:libQt5Xml$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix >= 5
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:qmake$secondaryArchSuffix >= 5
+	cmd:unzip
+	"
+
+BUILD()
+{
+	qmake
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/QModMaster
+	install -T ./qModMaster $appsDir/QModMaster/QModMaster
+	cp -rf Docs  $appsDir/QModMaster/
+	cp -rf ManModbus  $appsDir/QModMaster/
+	local APP_SIGNATURE="application/x-vnd.qmodmaster"
+	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/qmodmaster.rdef.in > qmodmaster.rdef
+
+	addResourcesToBinaries qmodmaster.rdef $appsDir/QModMaster/QModMaster
+	addAppDeskbarSymlink $appsDir/QModMaster/QModMaster
+}

app-misc/sl/licenses/Toyoda

@@ -0,0 +1,6 @@
+Copyright 1993,1998,2014 Toyoda Masashi (mtoyoda@acm.org)
+
+Everyone is permitted to do anything on this program including copying,
+modifying, and improving, unless you try to pretend that you wrote it.
+i.e., the above copyright notice has to appear in all copies.
+THE AUTHOR DISCLAIMS ANY RESPONSIBILITY WITH REGARD TO THIS SOFTWARE.

app-misc/sl/sl-5.02.recipe

@@ -0,0 +1,43 @@
+SUMMARY="Amusing graphic for mistyping habits"
+DESCRIPTION="SL (Steam Locomotive) runs across your terminal when you type \
+\"sl\" as you meant to type \"ls\". It's just a joke command, and not useful \
+at all."
+HOMEPAGE="https://github.com/mtoyoda/sl"
+COPYRIGHT="1993,1998,2014 Toyoda Masashi"
+LICENSE="Toyoda"
+REVISION="1"
+SOURCE_URI="https://github.com/mtoyoda/$portName/archive/$portVersion/$portVersionedName.tar.gz"
+CHECKSUM_SHA256="1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a"
+SOURCE_DIR="sl-$portVersion"
+
+ARCHITECTURES="x86_gcc2 x86_64"
+
+PROVIDES="
+	sl = $portVersion
+	cmd:sl = $portVersion
+	"
+REQUIRES="
+	haiku
+	lib:libncurses
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libncurses
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc
+	cmd:make
+	"
+
+BUILD()
+{
+	make $jobArgs
+}
+
+INSTALL()
+{
+	mkdir -p $binDir
+	cp sl $binDir
+}
+

app-misc/tmux/patches/tmux-3.1c.patchset

@@ -1,4 +1,4 @@
-From ebdeb6ca50c64027beed7f55a6a9ec0e71d3e5f1 Mon Sep 17 00:00:00 2001
+From 1f2ce2f48932145f0875d9a951242359de667eed Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 7 Jul 2017 16:23:59 +0300
 Subject: Add initial Haiku support based on hpux
@@ -98,10 +98,22 @@ index 0000000..6960ee4
 +	return (-1);
 +}
 diff --git a/configure.ac b/configure.ac
-index 2d9fad7..5cce1d9 100644
+index bb702f9..b4b61ce 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -621,6 +621,10 @@ case "$host_os" in
+@@ -291,9 +291,9 @@ AC_TRY_LINK(
+ if test "x$found_b64_ntop" = xno; then
+ 	AC_MSG_RESULT(no)
+ 
+-	AC_MSG_CHECKING(for b64_ntop with -lresolv)
++	AC_MSG_CHECKING(for b64_ntop with -lnetwork)
+ 	OLD_LIBS="$LIBS"
+-	LIBS="$LIBS -lresolv"
++	LIBS="$LIBS -lnetwork"
+ 	AC_TRY_LINK(
+ 		[
+ 			#include <sys/types.h>
+@@ -589,6 +589,10 @@ case "$host_os" in
  				;;
  		esac
  		;;
@@ -160,10 +172,10 @@ index 0000000..a6d75f9
 +	return (event_init());
 +}
 diff --git a/tty.c b/tty.c
-index 4d54353..34f1a23 100644
+index 8efe57b..8cecb8a 100644
 --- a/tty.c
 +++ b/tty.c
-@@ -281,7 +281,11 @@ tty_start_tty(struct tty *tty)
+@@ -307,7 +307,11 @@ tty_start_tty(struct tty *tty)
  		event_add(&tty->event_in, NULL);
  
  		memcpy(&tio, &tty->tio, sizeof tio);
@@ -176,44 +188,41 @@ index 4d54353..34f1a23 100644
  		tio.c_iflag |= IGNBRK;
  		tio.c_oflag &= ~(OPOST|ONLCR|OCRNL|ONLRET);
  		tio.c_lflag &= ~(IEXTEN|ICANON|ECHO|ECHOE|ECHONL|ECHOCTL|
-diff --git a/configure.ac b/configure.ac
-index 5cce1d9..32ec9c0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -284,9 +284,9 @@ AC_TRY_LINK(
- if test "x$found_b64_ntop" = xno; then
- 	AC_MSG_RESULT(no)
+-- 
+2.30.0
+
+
+From ac099e2b8976b9ef36f82f5e24ac0c3fcabfed9d Mon Sep 17 00:00:00 2001
+From: Zach Dykstra <dykstra.zachary@gmail.com>
+Date: Mon, 11 Jan 2021 18:56:17 -0600
+Subject: tmux: use preferred Haiku config path
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 082a467..a331d45 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,7 +13,7 @@ dist_EXTRA_tmux_SOURCES = compat/*.[ch]
+ # Preprocessor flags.
+ AM_CPPFLAGS += @XOPEN_DEFINES@ \
+ 	-DTMUX_VERSION="\"@VERSION@\"" \
+-	-DTMUX_CONF="\"$(sysconfdir)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\""
++	-DTMUX_CONF="\"$(sysconfdir)/tmux.conf:$(shell finddir B_USER_SETTINGS_DIRECTORY)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\""
  
--	AC_MSG_CHECKING(for b64_ntop with -lresolv)
-+	AC_MSG_CHECKING(for b64_ntop with -lnetwork)
- 	OLD_LIBS="$LIBS"
--	LIBS="$LIBS -lresolv"
-+	LIBS="$LIBS -lnetwork"
- 	AC_TRY_LINK(
- 		[
- 			#include <sys/types.h>
+ # Additional object files.
+ LDADD = $(LIBOBJS)
+@@ -198,8 +198,9 @@ endif
+ # Install tmux.1 in the right format.
+ install-exec-hook:
+ 	if test x@MANFORMAT@ = xmdoc; then \
+-		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1 \
+-			>$(srcdir)/tmux.1.mdoc; \
++		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" \
++		-e "s|~/\.|$(shell finddir B_USER_SETTINGS_DIRECTORY)/|g" \
++		$(srcdir)/tmux.1 > $(srcdir)/tmux.1.mdoc; \
+ 	else \
+ 		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
+ 			$(AWK) -f $(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
 -- 
-2.19.1
-
-
-From d9afd73806dcedf441ba42f36f42c383564919af Mon Sep 17 00:00:00 2001
-From: Kyle Ambroff-Kao <kyle@ambroffkao.com>
-Date: Sun, 22 Dec 2019 17:23:29 -0800
-Subject: Define _BSD_SOURCE to expose freebsd compat in libutil
-
-
-diff --git a/configure.ac b/configure.ac
-index 32ec9c0..a131f9b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -461,6 +461,7 @@ fi
- AC_SEARCH_LIBS(fparseln, util, found_fparseln=yes, found_fparseln=no)
- if test "x$found_fparseln" = xyes; then
- 	AC_DEFINE(HAVE_FPARSELN)
-+	AC_DEFINE(_BSD_SOURCE)
- else
- 	AC_LIBOBJ(fparseln)
- fi
--- 
-2.24.1
+2.30.0
 

app-misc/tmux/tmux-3.1c.recipe

@@ -6,9 +6,9 @@ such as GNU screen."
 HOMEPAGE="http://tmux.github.io/"
 COPYRIGHT="2015 tmux team"
 LICENSE="ISC"
-REVISION="3"
+REVISION="2"
 SOURCE_URI="https://github.com/tmux/tmux/releases/download/$portVersion/tmux-$portVersion.tar.gz"
-CHECKSUM_SHA256="7f6bf335634fafecff878d78de389562ea7f73a7367f268b66d37ea13617a2ba"
+CHECKSUM_SHA256="918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386"
 PATCHES="tmux-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"