diff --git a/app-emulation/comcom64/comcom64-0.3~1.recipe b/app-emulation/comcom64/comcom64-0.3~1.recipe
index 18e2184fc..d8152ee36 100644
--- a/app-emulation/comcom64/comcom64-0.3~1.recipe
+++ b/app-emulation/comcom64/comcom64-0.3~1.recipe
@@ -7,10 +7,10 @@ LICENSE="GNU GPL v3"
 SOURCE_URI="https://github.com/dosemu2/comcom64/archive/1cebce6b65b27303855e5d73deb90e92495f98e3.tar.gz"
 SOURCE_DIR="comcom64-1cebce6b65b27303855e5d73deb90e92495f98e3"
 CHECKSUM_SHA256="90e9f08c275d632a0758eb21a83cc90a187d8f405025e670f8f4d87344b8a0d5"
-REVISION="1"
+REVISION="2"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	comcom64$secondaryArchSuffix = $portVersion
@@ -24,10 +24,11 @@ BUILD_REQUIRES="
 	dj64$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:clang
 	cmd:djlink
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:llvm_objdump$secondaryArchSuffix
+	cmd:llvm_objdump
 	cmd:pkg_config
 	cmd:thunk_gen
 	cmd:which
diff --git a/app-emulation/dosemu/dosemu-2.0~pre9.2.1.recipe b/app-emulation/dosemu/dosemu-2.0~pre9.2.1.recipe
index d3bb5abf6..358a39f33 100644
--- a/app-emulation/dosemu/dosemu-2.0~pre9.2.1.recipe
+++ b/app-emulation/dosemu/dosemu-2.0~pre9.2.1.recipe
@@ -7,8 +7,8 @@ LICENSE="GNU GPL v2"
 SOURCE_URI="https://github.com/dosemu2/dosemu2/archive/851953056a3b5efa1ebda72b712aec76c91dc0a5.tar.gz"
 SOURCE_DIR="dosemu2-851953056a3b5efa1ebda72b712aec76c91dc0a5"
 CHECKSUM_SHA256="78a48b0fc332f74ff9fbc07643d24a7370a237f8ecd776847771e82df82e5eb4"
-PATCHES="$portVersionedName.patchset"
-REVISION="8"
+PATCHES="dosemu-$portVersion.patchset"
+REVISION="9"
 ADDITIONAL_FILES="dosemu.rdef.in"
 
 ARCHITECTURES="all !x86_gcc2"
diff --git a/app-emulation/fdpp/fdpp-1.9.recipe b/app-emulation/fdpp/fdpp-1.9.recipe
index f06235501..1c4423765 100644
--- a/app-emulation/fdpp/fdpp-1.9.recipe
+++ b/app-emulation/fdpp/fdpp-1.9.recipe
@@ -4,10 +4,10 @@ HOMEPAGE="https://github.com/dosemu2/fdpp"
 COPYRIGHT="2024 Stas Sergeev"
 LICENSE="GNU GPL v3"
 SOURCE_URI="https://github.com/dosemu2/fdpp/archive/refs/tags/1.9.tar.gz"
-SOURCE_DIR="$portVersionedName"
+SOURCE_DIR="fdpp-$portVersion"
 CHECKSUM_SHA256="65fdf0819d490c8ba32fc706309f483f0c6547ff65c860efbb4323e4138896ed"
-REVISION="1"
-PATCHES="$portVersionedName.patchset"
+REVISION="2"
+PATCHES="fdpp-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
@@ -38,7 +38,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:autom4te
-	cmd:clang$secondaryArchSuffix
+	cmd:clang
 	cmd:cpp$secondaryArchSuffix
 	cmd:git
 	cmd:make
@@ -62,12 +62,14 @@ INSTALL()
 	meson install -C build
 
 	echo "FIXUPS"
-	mkdir -p $developDir
-	mv $prefix/include $includeDir
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir
+	rmdir $prefix/include
 
 	fixPkgconfig fdpp
 
-	mv $libDir/fdpp/* $libDir
+	mkdir -p $libDir
+	mv $prefix/lib/fdpp/* $libDir
 
 	prepareInstalledDevelLibs \
 		libfdpp libfdldr
diff --git a/dev-util/dj64/dj64-0.3.0~0.recipe b/dev-util/dj64/dj64-0.3.0~0.recipe
index 3b85ba61d..53529346c 100644
--- a/dev-util/dj64/dj64-0.3.0~0.recipe
+++ b/dev-util/dj64/dj64-0.3.0~0.recipe
@@ -18,11 +18,11 @@ LICENSE="GNU GPL v3"
 SOURCE_URI="https://github.com/stsp/dj64dev/archive/1033bdad7d8df3224052be966970a916575f2db2.tar.gz"
 SOURCE_DIR="dj64dev-1033bdad7d8df3224052be966970a916575f2db2"
 CHECKSUM_SHA256="68180cef48aef749119070068b8cf5ddbaf83ad893a6888536c42de0e94b1857"
-REVISION="2"
-PATCHES="$portVersionedName.patchset"
+REVISION="3"
+PATCHES="dj64-$portVersion.patchset"
 
-ARCHITECTURES="all"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	dj64$secondaryArchSuffix = $portVersion
@@ -44,12 +44,14 @@ BUILD_PREREQUIRES="
 	cmd:autoconf
 	cmd:autoreconf
 	cmd:ctags
+	cmd:readtags
 	cmd:djlink
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:smlrcc
-	cmd:thunk_gen >= 1.5
+	cmd:thunk_gen >= 1.6
+	libtool
 	"
 
 targetArch="i386-pc-dj64"
diff --git a/dev-util/dj64/patches/dj64-0.3.0~0.patchset b/dev-util/dj64/patches/dj64-0.3.0~0.patchset
index ca36bf208..7e8bb7b86 100644
--- a/dev-util/dj64/patches/dj64-0.3.0~0.patchset
+++ b/dev-util/dj64/patches/dj64-0.3.0~0.patchset
@@ -1,4 +1,4 @@
-From 3ebc789256379a1ed261f57b5fbee0f1f92e8065 Mon Sep 17 00:00:00 2001
+From 2580362bee94cc7049d4c3e7a871e4a035aca46a Mon Sep 17 00:00:00 2001
 From: PulkoMandy <pulkomandy@pulkomandy.tk>
 Date: Sat, 12 Jul 2025 13:17:03 +0200
 Subject: Reapply patch from previous version
@@ -55,3 +55,26 @@ index 18da1df..cc36e87 100755
 -- 
 2.48.1
 
+
+From a73b34d5fdc89ba2e0d79382e4a78765bf487554 Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Sun, 13 Jul 2025 19:04:03 +0200
+Subject: Fix incompatible architecture name on 32 bit
+
+
+diff --git a/makefile b/makefile
+index a488ec9..e7fa648 100644
+--- a/makefile
++++ b/makefile
+@@ -141,7 +141,7 @@ $(NC_BUILD)/Makefile: dj64.pc | $(NC_BUILD) $(DJ64DEVL)
+ 	  CFLAGS="$(CFLAGS) $(L_CFLAGS)" \
+ 	  LIBS="$(L_LIBS)" \
+ 	  LDFLAGS="$(L_LDFLAGS)" \
+-  ../configure --host=$(shell uname -m)-pc-linux-gnu \
++  ../configure --host=$(shell uname -m|sed -e s/BePC/i586/)-pc-linux-gnu \
+     --prefix=$(R_PREFIX) \
+     --libdir=$(R_LIBDIR) \
+     --without-manpages \
+-- 
+2.48.1
+
diff --git a/dev-util/thunk_gen/thunk_gen-1.6.recipe b/dev-util/thunk_gen/thunk_gen-1.6.recipe
index 103705724..3c437290c 100644
--- a/dev-util/thunk_gen/thunk_gen-1.6.recipe
+++ b/dev-util/thunk_gen/thunk_gen-1.6.recipe
@@ -9,14 +9,14 @@ LICENSE="GNU GPL v3"
 SOURCE_URI="https://github.com/stsp/thunk_gen/archive/refs/tags/$portVersion.tar.gz"
 SOURCE_DIR="thunk_gen-$portVersion"
 CHECKSUM_SHA256="d9252429b9998d8ccc68eaafa3d6504d4a9f47dc8068a841c4084658d0f2c9cf"
-REVISION="1"
+REVISION="2"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	thunk_gen$secondaryArchSuffix = $portVersion
-	cmd:thunk_gen$secondaryArchSuffix = $portVersion
+	cmd:thunk_gen = $portVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix