diff --git a/.gitignore b/.gitignore
index b15196c..7ca5660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1 @@
 kBuild-0.1.5-p2-src.tar.gz
-/kBuild-r2537.tar.gz
-/kBuild-r2730.tar.gz
-/kBuild-r2784.tar.gz
-/kBuild-r2814.tar.gz
-/kBuild-r3050.tar.gz
-/kBuild-r3127.tar.gz
-/kBuild-r3129.tar.gz
-/kBuild-r3290.20190106.tar.gz
-/kBuild-r3296.20190122.tar.gz
-/kBuild-r3564.20220308.tar.gz
-/kBuild-r3572.20221024.tar.gz
-/kBuild-r3589.20230220.tar.gz
-/kBuild-r3605.20240424.tar.gz
-/kBuild-r3674.20250422.tar.gz
diff --git a/assert.patch b/assert.patch
deleted file mode 100644
index 9376b6d..0000000
--- a/assert.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Use assert ehen kHlpAssertBreakpoint is not available
-Author: Gianfranco Costamagna <locutusofborg@debian.org>
-Last-Update: 2020-11-10
-
-Index: kbuild/src/lib/kStuff/include/k/kHlpAssert.h
-===================================================================
---- kbuild.orig/src/lib/kStuff/include/k/kHlpAssert.h
-+++ kbuild/src/lib/kStuff/include/k/kHlpAssert.h
-@@ -60,7 +60,8 @@
- #elif defined(__GNUC__) && (K_ARCH == K_ARCH_SPARC_64)
- # define kHlpAssertBreakpoint() do { __asm__ __volatile__ ("illtrap 0"); } while (0) /*??*/
- #else
--# error "Port Me"
-+#include <assert.h> 
-+# define kHlpAssertBreakpoint(cond) assert(cond)
- #endif
- 
- /** @def K_FUNCTION
diff --git a/changeset_3572.diff b/changeset_3572.diff
deleted file mode 100644
index 2abf95f..0000000
--- a/changeset_3572.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: trunk/Config.kmk
-===================================================================
---- trunk/Config.kmk	(revision 3571)
-+++ trunk/Config.kmk	(revision 3572)
-@@ -124,4 +124,11 @@
-  TOOL_FLEX_LEX = gflex
- endif
-+# Not all compiler tools currently do the same quoting of DEFS, so here's a
-+# temporary workaround.
-+ifn1of ($(KBUILD_TARGET), win)
-+ TMP_QUOTE_SLASH :=
-+else
-+ TMP_QUOTE_SLASH := \$(NO_SUCH_VARIABLE)
-+endif
- 
- #
-@@ -183,6 +190,6 @@
- 
- DEFS += \
--	KBUILD_PATH=\"/$(patsubst %/,%,$(MY_INST_DATA))\" \
--	KBUILD_BIN_PATH=\"/$(patsubst %/,%,$(MY_INST_BIN))\"
-+	KBUILD_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_DATA))$(TMP_QUOTE_SLASH)" \
-+	KBUILD_BIN_PATH=$(TMP_QUOTE_SLASH)"/$(patsubst %/,%,$(MY_INST_BIN))$(TMP_QUOTE_SLASH)"
- endif
- 
-Index: trunk/src/kmk/Makefile.kmk
-===================================================================
---- trunk/src/kmk/Makefile.kmk	(revision 3571)
-+++ trunk/src/kmk/Makefile.kmk	(revision 3572)
-@@ -39,5 +39,5 @@
- 	$(TEMPLATE_BIN_DEFS) \
- 	KBUILD_SVN_REV=$(KBUILD_SVN_REV) \
--	KBUILD_TYPE=\"$(KBUILD_TYPE)\"
-+	KBUILD_TYPE=$(TMP_QUOTE_SLASH)"$(KBUILD_TYPE)$(TMP_QUOTE_SLASH)"
- TEMPLATE_BIN-KMK_DEPS = \
- 	$(kmk_0_OUTDIR)/config.h \
-@@ -235,7 +235,7 @@
- 	CONFIG_WITH_MEMORY_OPTIMIZATIONS \
- 	\
--	KBUILD_HOST=\"$(KBUILD_TARGET)\" \
--	KBUILD_HOST_ARCH=\"$(KBUILD_TARGET_ARCH)\" \
--	KBUILD_HOST_CPU=\"$(KBUILD_TARGET_CPU)\"
-+	KBUILD_HOST=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET)$(TMP_QUOTE_SLASH)" \
-+	KBUILD_HOST_ARCH=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_ARCH)$(TMP_QUOTE_SLASH)" \
-+	KBUILD_HOST_CPU=$(TMP_QUOTE_SLASH)"$(KBUILD_TARGET_CPU)$(TMP_QUOTE_SLASH)"
- # kmk_DEFS += CONFIG_WITH_COMPILER  # experimental, doesn't work 101% right it seems.
- kmk_DEFS.x86 = CONFIG_WITH_OPTIMIZATION_HACKS
diff --git a/changeset_trunk_3566.diff b/changeset_trunk_3566.diff
deleted file mode 100644
index d225862..0000000
--- a/changeset_trunk_3566.diff
+++ /dev/null
@@ -1,761 +0,0 @@
-Index: trunk/kBuild/header.kmk
-===================================================================
---- trunk/kBuild/header.kmk	(revision 3565)
-+++ trunk/kBuild/header.kmk	(revision 3566)
-@@ -1714,5 +1714,5 @@
- ##
- # An internal define used by subheader.kmk, subfooter.kmk, and
--# KB_FN_PASS_0_ON_TARGET.
-+# KB_FN_DO_PASS0_ON_TARGET.
- #
- # @param target    The target to process.
-Index: trunk/kBuild/tools/GCC.kmk
-===================================================================
---- trunk/kBuild/tools/GCC.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GCC.kmk	(revision 3566)
-@@ -106,5 +106,5 @@
- define TOOL_GCC_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
-@@ -132,5 +132,5 @@
- define TOOL_GCC_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC_CXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
-@@ -158,5 +158,5 @@
- define TOOL_GCC_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GCC3.kmk
-===================================================================
---- trunk/kBuild/tools/GCC3.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GCC3.kmk	(revision 3566)
-@@ -138,5 +138,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC3_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -152,5 +152,5 @@
- define TOOL_GCC3_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC3_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -182,5 +182,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC3_CXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -196,5 +196,5 @@
- define TOOL_GCC3_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC3_CXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -223,5 +223,5 @@
- define TOOL_GCC3_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC3_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GCC32.kmk
-===================================================================
---- trunk/kBuild/tools/GCC32.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GCC32.kmk	(revision 3566)
-@@ -138,5 +138,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC32_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -152,5 +152,5 @@
- define TOOL_GCC32_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC32_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -182,5 +182,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC32_CXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -197,5 +197,5 @@
- define TOOL_GCC32_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC32_CXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -224,5 +224,5 @@
- define TOOL_GCC32_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC32_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GCC3OMF.kmk
-===================================================================
---- trunk/kBuild/tools/GCC3OMF.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GCC3OMF.kmk	(revision 3566)
-@@ -122,5 +122,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC3OMF_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -136,5 +136,5 @@
- define TOOL_GCC3OMF_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC3OMF_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
- 		-o $(obj)\
-@@ -167,5 +167,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC3OMF_CXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -181,5 +181,5 @@
- define TOOL_GCC3OMF_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC3OMF_CXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
- 		-o $(obj)\
-@@ -208,5 +208,5 @@
- define TOOL_GCC3OMF_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC3OMF_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GCC3PLAIN.kmk
-===================================================================
---- trunk/kBuild/tools/GCC3PLAIN.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GCC3PLAIN.kmk	(revision 3566)
-@@ -123,5 +123,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC3PLAIN_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -137,5 +137,5 @@
- define TOOL_GCC3PLAIN_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC3PLAIN_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -167,5 +167,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC3PLAIN_CXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -181,5 +181,5 @@
- define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC3PLAIN_CXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -208,5 +208,5 @@
- define TOOL_GCC3PLAIN_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC3PLAIN_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GCC42MACHO.kmk
-===================================================================
---- trunk/kBuild/tools/GCC42MACHO.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GCC42MACHO.kmk	(revision 3566)
-@@ -165,5 +165,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC42MACHO_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -179,5 +179,5 @@
- define TOOL_GCC42MACHO_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -209,5 +209,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC42MACHO_CXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -223,5 +223,5 @@
- define TOOL_GCC42MACHO_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_CXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -253,5 +253,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC42MACHO_OBJC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -267,5 +267,5 @@
- define TOOL_GCC42MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_OBJC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -297,5 +297,5 @@
- 		--kObjCache-cpp $(outbase).mii\
- 		$(TOOL_GCC42MACHO_OBJCXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -311,5 +311,5 @@
- define TOOL_GCC42MACHO_COMPILE_OBJCXX_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_OBJCXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -338,5 +338,5 @@
- define TOOL_GCC42MACHO_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC42MACHO_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GCC4MACHO.kmk
-===================================================================
---- trunk/kBuild/tools/GCC4MACHO.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GCC4MACHO.kmk	(revision 3566)
-@@ -165,5 +165,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC4MACHO_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -179,5 +179,5 @@
- define TOOL_GCC4MACHO_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -209,5 +209,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC4MACHO_CXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -223,5 +223,5 @@
- define TOOL_GCC4MACHO_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_CXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -253,5 +253,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC4MACHO_OBJC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -267,5 +267,5 @@
- define TOOL_GCC4MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_OBJC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -297,5 +297,5 @@
- 		--kObjCache-cpp $(outbase).mii\
- 		$(TOOL_GCC4MACHO_OBJCXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -311,5 +311,5 @@
- define TOOL_GCC4MACHO_COMPILE_OBJCXX_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_OBJCXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -338,5 +338,5 @@
- define TOOL_GCC4MACHO_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC4MACHO_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GCC64.kmk
-===================================================================
---- trunk/kBuild/tools/GCC64.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GCC64.kmk	(revision 3566)
-@@ -137,5 +137,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GCC64_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -151,5 +151,5 @@
- define TOOL_GCC64_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GCC64_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -181,5 +181,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GCC64_CXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -195,5 +195,5 @@
- define TOOL_GCC64_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GCC64_CXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -222,5 +222,5 @@
- define TOOL_GCC64_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GCC64_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GXX.kmk
-===================================================================
---- trunk/kBuild/tools/GXX.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GXX.kmk	(revision 3566)
-@@ -121,5 +121,5 @@
- define TOOL_GXX_COMPILE_C_CMDS
- 	$(QUIET)$(TOOL_GXX_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
-@@ -147,5 +147,5 @@
- define TOOL_GXX_COMPILE_CXX_CMDS
- 	$(QUIET)$(TOOL_GXX_CXX) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-@@ -173,5 +173,5 @@
- define TOOL_GXX_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX_PCH) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -200,5 +200,5 @@
- define TOOL_GXX_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) \
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GXX3.kmk
-===================================================================
---- trunk/kBuild/tools/GXX3.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GXX3.kmk	(revision 3566)
-@@ -148,5 +148,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX3_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -158,5 +158,5 @@
- else
- 	$(QUIET)$(TOOL_GXX3_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -189,5 +189,5 @@
- 		$(TOOL_GXX3_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -199,5 +199,5 @@
- else
- 	$(QUIET)$(TOOL_GXX3_CXX) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-@@ -226,5 +226,5 @@
- define TOOL_GXX3_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX3_PCH) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -253,5 +253,5 @@
- define TOOL_GXX3_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX3_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GXX32.kmk
-===================================================================
---- trunk/kBuild/tools/GXX32.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GXX32.kmk	(revision 3566)
-@@ -145,5 +145,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX32_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -155,5 +155,5 @@
- else
- 	$(QUIET)$(TOOL_GXX32_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -186,5 +186,5 @@
- 		$(TOOL_GXX32_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -196,5 +196,5 @@
- else
- 	$(QUIET)$(TOOL_GXX32_CXX) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-@@ -223,5 +223,5 @@
- define TOOL_GXX32_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX32_PCH) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -250,5 +250,5 @@
- define TOOL_GXX32_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX32_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GXX3OMF.kmk
-===================================================================
---- trunk/kBuild/tools/GXX3OMF.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GXX3OMF.kmk	(revision 3566)
-@@ -134,5 +134,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX3OMF_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -144,5 +144,5 @@
- else
- 	$(QUIET)$(TOOL_GXX3OMF_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -175,5 +175,5 @@
- 		$(TOOL_GXX3OMF_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -185,5 +185,5 @@
- else
- 	$(QUIET)$(TOOL_GXX3OMF_CXX) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-@@ -212,5 +212,5 @@
- define TOOL_GXX3OMF_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX3OMF_PCH) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -239,5 +239,5 @@
- define TOOL_GXX3OMF_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX3OMF_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GXX3PLAIN.kmk
-===================================================================
---- trunk/kBuild/tools/GXX3PLAIN.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GXX3PLAIN.kmk	(revision 3566)
-@@ -131,5 +131,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX3PLAIN_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -141,5 +141,5 @@
- else
- 	$(QUIET)$(TOOL_GXX3PLAIN_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -172,5 +172,5 @@
- 		$(TOOL_GXX3PLAIN_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -182,5 +182,5 @@
- else
- 	$(QUIET)$(TOOL_GXX3PLAIN_CXX) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-@@ -209,5 +209,5 @@
- define TOOL_GXX3PLAIN_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX3PLAIN_PCH) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -236,5 +236,5 @@
- define TOOL_GXX3PLAIN_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX3PLAIN_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GXX42MACHO.kmk
-===================================================================
---- trunk/kBuild/tools/GXX42MACHO.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GXX42MACHO.kmk	(revision 3566)
-@@ -174,5 +174,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX42MACHO_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -184,5 +184,5 @@
- else
- 	$(QUIET)$(TOOL_GXX42MACHO_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -215,5 +215,5 @@
- 		$(TOOL_GXX42MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -225,5 +225,5 @@
- else
- 	$(QUIET)$(TOOL_GXX42MACHO_CXX) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-@@ -252,5 +252,5 @@
- define TOOL_GXX42MACHO_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX42MACHO_PCH) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -282,5 +282,5 @@
- 		--kObjCache-cpp $(outbase).ii\
- 		$(TOOL_GXX42MACHO_OBJC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -296,5 +296,5 @@
- define TOOL_GXX42MACHO_COMPILE_OBJC_CMDS
- 	$(QUIET)$(TOOL_GXX42MACHO_OBJC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -326,5 +326,5 @@
- 		--kObjCache-cpp $(outbase).mii\
- 		$(TOOL_GXX42MACHO_OBJCXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -340,5 +340,5 @@
- define TOOL_GXX42MACHO_COMPILE_OBJCXX_CMDS
- 	$(QUIET)$(TOOL_GXX42MACHO_OBJCXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -367,5 +367,5 @@
- define TOOL_GXX42MACHO_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX42MACHO_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GXX4MACHO.kmk
-===================================================================
---- trunk/kBuild/tools/GXX4MACHO.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GXX4MACHO.kmk	(revision 3566)
-@@ -174,5 +174,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX4MACHO_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -184,5 +184,5 @@
- else
- 	$(QUIET)$(TOOL_GXX4MACHO_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -215,5 +215,5 @@
- 		$(TOOL_GXX4MACHO_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -225,5 +225,5 @@
- else
- 	$(QUIET)$(TOOL_GXX4MACHO_CXX) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-@@ -252,5 +252,5 @@
- define TOOL_GXX4MACHO_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX4MACHO_PCH) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -282,5 +282,5 @@
- 		--kObjCache-cpp $(outbase).mii\
- 		$(TOOL_GXX4MACHO_OBJCXX) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -296,5 +296,5 @@
- define TOOL_GXX4MACHO_COMPILE_OBJCXX_CMDS
- 	$(QUIET)$(TOOL_GXX4MACHO_OBJCXX) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -323,5 +323,5 @@
- define TOOL_GXX4MACHO_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX4MACHO_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-Index: trunk/kBuild/tools/GXX64.kmk
-===================================================================
---- trunk/kBuild/tools/GXX64.kmk	(revision 3565)
-+++ trunk/kBuild/tools/GXX64.kmk	(revision 3566)
-@@ -145,5 +145,5 @@
- 		--kObjCache-cpp $(outbase).i\
- 		$(TOOL_GXX64_CC) -E -o -\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -155,5 +155,5 @@
- else
- 	$(QUIET)$(TOOL_GXX64_CC) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -186,5 +186,5 @@
- 		$(TOOL_GXX64_CXX) -E -o - $(if-expr defined($(target)_PCH_HDR)\
- 		,-fpch-preprocess -Winvalid-pch -I$($(target)_1_GCC_PCH_DIR) -include $(basename $($(target)_1_GCC_PCH_FILE)),)\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		$(abspath $(source))\
-@@ -196,5 +196,5 @@
- else
- 	$(QUIET)$(TOOL_GXX64_CXX) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj) $(if-expr defined($(target)_PCH_HDR) \
-@@ -223,5 +223,5 @@
- define TOOL_GXX64_COMPILE_PCH_CMDS
- 	$(QUIET)$(TOOL_GXX64_PCH) -c\
--		$(flags) $(addprefix -I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $($(target)_1_GCC_PCH_DIR) $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
-@@ -250,5 +250,5 @@
- define TOOL_GXX64_COMPILE_AS_CMDS
- 	$(QUIET)$(TOOL_GXX64_AS) -c\
--		$(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-+		$(flags) $(qaddprefix sh,-I, $(incs)) $(qaddprefix sh,-D, $(defs))\
- 		-Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
- 		-o $(obj)\
diff --git a/kBuild-0.1.5-dprintf.patch b/kBuild-0.1.5-dprintf.patch
new file mode 100644
index 0000000..58887f4
--- /dev/null
+++ b/kBuild-0.1.5-dprintf.patch
@@ -0,0 +1,38 @@
+This dprintf() collides with POSIX.1-2008 dprintf() and is not used at all
+anyways. (Whoa! what a stupid name! standardized before invention of grep!)
+
+Lubomir Rintel <lkundrak@v3.sk>
+
+diff -up kBuild-0.1.5/src/ash/output.c.gcc44 kBuild-0.1.5/src/ash/output.c
+--- kBuild-0.1.5/src/ash/output.c.gcc44	2009-04-13 01:20:33.857017054 +0200
++++ kBuild-0.1.5/src/ash/output.c	2009-04-13 01:20:57.570033297 +0200
+@@ -230,6 +230,7 @@ out1fmt(const char *fmt, ...)
+ 	va_end(ap);
+ }
+ 
++#if 0
+ void
+ dprintf(const char *fmt, ...)
+ {
+@@ -240,6 +241,7 @@ dprintf(const char *fmt, ...)
+ 	va_end(ap);
+ 	flushout(out2);
+ }
++#endif
+ 
+ void
+ fmtstr(char *outbuf, size_t length, const char *fmt, ...)
+diff -up kBuild-0.1.5/src/ash/output.h.gcc44 kBuild-0.1.5/src/ash/output.h
+--- kBuild-0.1.5/src/ash/output.h.gcc44	2009-04-13 01:20:37.724140366 +0200
++++ kBuild-0.1.5/src/ash/output.h	2009-04-13 01:20:47.933142098 +0200
+@@ -65,8 +65,10 @@ void outfmt(struct output *, const char 
+     __attribute__((__format__(__printf__,2,3)));
+ void out1fmt(const char *, ...)
+     __attribute__((__format__(__printf__,1,2)));
++#if 0
+ void dprintf(const char *, ...)
+     __attribute__((__format__(__printf__,1,2)));
++#endif
+ void fmtstr(char *, size_t, const char *, ...)
+     __attribute__((__format__(__printf__,3,4)));
+ void doformat(struct output *, const char *, va_list);
diff --git a/kBuild-0.1.5-pthread.patch b/kBuild-0.1.5-pthread.patch
new file mode 100644
index 0000000..01d6602
--- /dev/null
+++ b/kBuild-0.1.5-pthread.patch
@@ -0,0 +1,12 @@
+diff -up kBuild-0.1.5-p1/Config.kmk.pthreads kBuild-0.1.5-p1/Config.kmk
+--- kBuild-0.1.5-p1/Config.kmk.pthreads	2010-02-18 08:27:24.287688965 +0100
++++ kBuild-0.1.5-p1/Config.kmk	2010-02-18 08:28:07.505493345 +0100
+@@ -282,6 +282,8 @@ ifndef TEMPLATE_BIN_TOOL
+  endif
+  ifeq ($(KBUILD_TARGET),linux)
+   TEMPLATE_BIN_LIBS            += rt
++  TEMPLATE_BIN_LIBS            += pthread
++  TEMPLATE_BIN_LDFLAGS         += -Wl,--as-needed
+  endif
+   TEMPLATE_BIN_CFLAGS.x86      += -m32
+   TEMPLATE_BIN_CFLAGS.sparc32  += -m32
diff --git a/kBuild-0.1.9998-portme.patch b/kBuild-0.1.9998-portme.patch
deleted file mode 100644
index 9e490e3..0000000
--- a/kBuild-0.1.9998-portme.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# Only used on el6
-# Found the reason why compile fails in detection of powerpc64 in centos 6
-# kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN."
-# hack for gcc < 4.6 and ppc64 only
-# https://stackoverflow.com/a/40675229/778517
-
---- kBuild/src/lib/kStuff/include/k/kDefs.h.orig	2018-05-12 03:35:13.703342877 +0100
-+++ kBuild/src/lib/kStuff/include/k/kDefs.h	2018-05-12 04:24:52.034917011 +0100
-@@ -336,16 +336,19 @@
-   /* use K_ARCH if possible. */
- # if K_ARCH_ENDIAN != K_ENDIAN_BI
- #  define K_ENDIAN K_ARCH_ENDIAN
--# elif defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_BIG_ENDIAN__)
--#  if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-+# elif defined(__BYTE_ORDER__)
-+#  if defined(__ORDER_LITTLE_ENDIAN__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
- #  define K_ENDIAN K_ARCH_LITTLE
--#  elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+#  elif defined(__ORDER_BIG_ENDIAN__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- #  define K_ENDIAN K_ARCH_BIG
- #  else
- #   error "Port Me or define K_ENDIAN."
- #  endif
- # else
--#  error "Port Me or define K_ENDIAN."
-+  /* __BYTE_ORDER__ is only available since GCC 4.6 */
-+  /* el6 have GCC 4.4 + or - */
-+  /* use same value that was set in previous versions of kBuild */
-+# define K_ENDIAN K_ARCH_ENDIAN
- # endif
- #else
-   /* validate the user defined value. */
diff --git a/kBuild-c23.patch b/kBuild-c23.patch
deleted file mode 100644
index fde7a93..0000000
--- a/kBuild-c23.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nurp kBuild.orig/src/kmk/glob/fnmatch.c kBuild/src/kmk/glob/fnmatch.c
---- kBuild.orig/src/kmk/glob/fnmatch.c	2025-04-25 21:54:33.000000000 +0100
-+++ kBuild/src/kmk/glob/fnmatch.c	2025-04-25 23:20:55.477680324 +0100
-@@ -120,10 +120,6 @@ USA.  */
- /* Avoid depending on library functions or files
-    whose names are inconsistent.  */
- 
--# if !defined _LIBC && !defined getenv && !defined _MSC_VER
--extern char *getenv ();
--# endif
--
- # ifndef errno
- extern int errno;
- # endif
diff --git a/kBuild-pthread.patch b/kBuild-pthread.patch
deleted file mode 100644
index 253cd6e..0000000
--- a/kBuild-pthread.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: Config.kmk
-===================================================================
---- ./Config.kmk	(revision 3127)
-+++ ./Config.kmk	(working copy)
-@@ -340,7 +340,8 @@
-    TEMPLATE_BIN_INCS            += $(PATH_GNUMAKE_SRC)/glob /usr/local/include
-   endif
-   ifeq ($(KBUILD_TARGET),linux)
--   TEMPLATE_BIN_LIBS            += rt
-+   TEMPLATE_BIN_LIBS            += rt pthread
-+   TEMPLATE_BIN_LDFLAGS         += -Wl,--as-needed
-   endif
-  endif
- 
diff --git a/kBuild-snapshot.sh b/kBuild-snapshot.sh
deleted file mode 100755
index 96ca19b..0000000
--- a/kBuild-snapshot.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
-    set +e
-    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-curdir=$(pwd)
-
-cd "$tmp"
-svn co http://svn.netlabs.org/repos/kbuild/trunk/ kBuild
-revision=$(svnlastchange -R kBuild)
-svndate=$(svnlastchange -l kBuild | sed -n 2p | sed -r 's/.* ([[:digit:]]{4})-([[:digit:]]{2})-([[:digit:]]{2}) .*/\1\2\3/')
-tar zcf $curdir/kBuild-r$revision.$svndate.tar.gz --exclude=kBuild/bin --exclude=.svn kBuild
-echo %global svn_revision $revision
-echo %global svn_date $svndate
-cd - >/dev/null
diff --git a/kBuild.spec b/kBuild.spec
index b8c234f..2b607de 100644
--- a/kBuild.spec
+++ b/kBuild.spec
@@ -1,82 +1,48 @@
-%global svn_revision 3674
-%global svn_date 20250422
+%global patchlevel p2
 
 Name:           kBuild
-Version:        0.1.9998%{?svn_revision:.r%{svn_revision}}
-Release:        2%{?svn_date:.%{svn_date}}%{?dist}
+Version:        0.1.5
+Release:        6%{?patchlevel:.%{patchlevel}}%{?dist}
 Summary:        A cross-platform build environment
 
-# Automatically converted from old format: BSD and GPLv2+ - review is highly recommended.
-License:        LicenseRef-Callaway-BSD AND GPL-2.0-or-later
+Group:          Development/Tools
+License:        BSD and GPLv2+
 # most tools are from NetBSD, some are from FreeBSD,
 # and make and sed are from GNU
 URL:            http://svn.netlabs.org/kbuild
-#Generated with kBuild-snapshot.sh
-Source0:        kBuild-r%{svn_revision}.%{svn_date}.tar.gz
+Source0:        ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz
 Patch0:         kBuild-0.1.3-escape.patch
-Patch1:         kBuild-pthread.patch
-Patch6:         kbuild-dummy_noreturn.diff
-Patch8:         kBuild-0.1.9998-portme.patch
-Patch10:        assert.patch
-Patch11:        relax_automake_version.patch
-Patch14:        changeset_3572.diff
-Patch15:        changeset_trunk_3566.diff
-Patch16:        kBuild-c23.patch
+Patch1:         kBuild-0.1.5-dprintf.patch
+Patch2:         kBuild-0.1.5-pthread.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  byacc libacl-devel flex 
+BuildRequires:  autoconf automake gettext-devel cvs
 
-BuildRequires:  make
-BuildRequires:  gcc
-BuildRequires:  automake
-BuildRequires:  bison
-BuildRequires:  gettext-devel
-BuildRequires:  libtool
-BuildRequires:  flex
-BuildRequires:  libacl-devel
-BuildRequires:  texinfo
-BuildRequires:  byacc
 
 %description
 This is a GNU make fork with a set of scripts to simplify
 complex tasks and portable versions of various UNIX tools to
 ensure cross-platform portability.
 
-It is used mainly to build VirtualBox packages for RPM Fusion
+It is used mainly to build VirtualBox OSE packages for RPM Fusion
 repository.
 
 
 %prep
-%dnl %setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
-%setup -q -n %{name}
-%patch -P0 -p1 -b .escape
-%patch -P1 -p1 -b .pthreads
-%patch -P6 -p1 -b .dummy_noreturn
-%ifarch ppc64
-%if 0%{?rhel} && 0%{?rhel} < 7
-# Found the reason why compile fails in detection of powerpc64 in centos 6
-# kBuild/src/lib/kStuff/include/k/kDefs.h:356:4: error: #error "Port Me or define K_ENDIAN."
-# hack for gcc < 4.6 and ppc64 only
-# https://stackoverflow.com/a/40675229/778517
-%patch -P8 -p1 -b .portme
-%endif
-%endif
-%patch -P10 -p1 -b .portme3
-%if 0%{?rhel} && 0%{?rhel} <= 7
-%patch -P11 -p1
-%endif
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# we need revert this 2 commits to build VBox 6 on el7
-%patch -P14 -p1 -R -b .revert
-%patch -P15 -p1 -R -b .revert2
-%endif
-%patch -P16 -p1
+%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}}
+%patch0 -p1 -b .escape
+%patch1 -p1 -b .dprintf
+%patch2 -p1 -b .pthreads
+
+# Remove prebuilt stuff
+rm -rf kBuild/bin/*
+
 
 %build
-echo KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk  >  SvnInfo.kmk
-echo KBUILD_SVN_REV := %{svn_revision} >>  SvnInfo.kmk
-
 %define bootstrap_mflags %{_smp_mflags} \\\
         CFLAGS="%{optflags}"            \\\
-        KBUILD_VERBOSE=2                \\\
-        KBUILD_VERSION_PATCH=9998
+        KBUILD_VERBOSE=2
 
 %define mflags %{bootstrap_mflags}      \\\
         NIX_INSTALL_DIR=%{_prefix}      \\\
@@ -89,218 +55,31 @@ echo KBUILD_SVN_REV := %{svn_revision} >>  SvnInfo.kmk
 # kmk versions, so with this we are on a safer side
 find -name config.log -delete
 kBuild/env.sh --full make -f bootstrap.gmk %{bootstrap_mflags}
+
 kBuild/env.sh kmk %{mflags} rebuild
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 export KBUILD_VERBOSE=2
-kBuild/env.sh kmk %{mflags} PATH_INS=%{buildroot} install
+kBuild/env.sh kmk %{mflags} PATH_INS=$RPM_BUILD_ROOT install
 # These are included later in files section
-rm -r %{buildroot}%{_docdir}
-mkdir -p %{buildroot}/%{_mandir}/man1
-pod2man -c 'kBuild for Fedora/EPEL GNU/Linux' \
-  -r kBuild-%{version} ./dist/debian/kmk.pod > %{buildroot}/%{_mandir}/man1/kmk.1
+rm -r $RPM_BUILD_ROOT%{_docdir}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%doc ChangeLog kBuild/doc/QuickReference*
-%license COPYING kBuild/doc/COPYING-FDL-1.3
+%defattr(-,root,root,-)
 %{_bindir}/*
-%{_datadir}/kBuild
-%{_mandir}/man1/*
+%{_datadir}/*
+%doc COPYING ChangeLog
+%doc kBuild/doc/COPYING-FDL-1.3 kBuild/doc/QuickReference*
 
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3674-2.20250422
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Apr 25 2025 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3674-1.20250422
-- Update to Revision 3674
-- (rhbz#2340684) Fix FTBFS
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-4.20240424
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 0.1.9998.r3605-3.20240424
-- convert license to SPDX
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3605-2.20240424
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Jun 04 2024 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3605-1.20240424
-- Update to Revision 3605
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-5.20230220
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-4.20230220
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Dec 20 2023 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3589-3.20230220
-- Fix another C compatibility issue (#2154544)
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3589-2.20230220
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Mar 09 2023 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3589-1.20230220
-- new version
-- revert changeset 3572 and 3566 to build VBox 6 on el7
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3572-3.20221024
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Dec 17 2022 Florian Weimer <fweimer@redhat.com> - 0.1.9998.r3572-2.20221024
-- C99 compatibility fixes (#2154544)
-
-* Mon Oct 24 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3572-1.20221024
-- Update to r3572.20221024
-- Allow build with automake 1.13.4 on epel7
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3564-2.20220308
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Apr 08 2022 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3564-1.20220308
-- Update kBuild to r3564.20220308
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-9.20190122
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-8.20190122
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-7.20190122
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-6.20190122
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 23 2020 Jeff Law <law@redhat.com> - 0.1.9998.r3296-5.20190122
-- Use strsignal, not sys_siglist
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-4.20190122
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3296-3.20190122
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Feb 12 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3296-2.20190122
-- Trust in the upstream that has the correct support for aarch64 and ppc64le
-
-* Mon Feb 11 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3296-1.20190122
-- Update to 0.1.9998.r3296-1.20190122
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3290-2.20190106
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 07 2019 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3290-1.20190106
-- Update to 0.1.9998.r3290-1.20190106
-- Add manpage (copied from Debian IIRC)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3129-4.20180106
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sat May 12 2018 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3129-3.20180106
-- Fix build on el6
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998.r3129-2.20180106
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 16 2018 Sérgio Basto <sergio@serjux.com> - 0.1.9998.r3129-1.20180106
-- Update kBuild to svn rev 3129
-- New versioning, we need define svn version that we may need
-
-* Sun Dec 03 2017 Sérgio Basto <sergio@serjux.com> - 0.1.9998-16.r3127
-- Fix one implicit-function-declaration
-
-* Sat Dec 02 2017 Sérgio Basto <sergio@serjux.com> - 0.1.9998-15.r3127
-- Update kBuild to svn rev 3127
-- arm and kbuild-wrong-memset patches fixed in upstream way
-        deleted:    kBuild-0.1.98-arm.patch
-        deleted:    kbuild-wrong-memset.patch
-- Rebased aarch64 not sure if needed, ppc64le much more simple
-        modified:   kBuild-0.1.9998-aarch64.patch
-        modified:   kBuild-0.1.9998-ppc64le.patch
-        modified:   kBuild-pthread.patch
-- kbuild-glob.patch fixes build in rawhide (F28)
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998-14.r3050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998-13.r3050
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jun 14 2017 Sérgio Basto <sergio@serjux.com> - 0.1.9998-12.r3025
-- Update kBuild to revison 3025
-- Upstream already fixed these 2:
-  deleted:    kBuild-0.1.9998-glob.patch
-  deleted:    kbuild-PKMKCCEVALPROG.patch
-- Rebased:
-  modified:   kBuild-0.1.98-arm.patch
-  modified:   kBuild-0.1.9998-aarch64.patch
-  modified:   kBuild-0.1.9998-ppc64le.patch
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998-11.r2814
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Tue Sep 06 2016 Sérgio Basto <sergio@serjux.com> - 0.1.9998-10.r2814
-- Fix el6 build
-
-* Tue Jul 26 2016 Sérgio Basto <sergio@serjux.com> - 0.1.9998-9.r2814
-- add BR:bison
-
-* Fri Apr 29 2016 Sérgio Basto <sergio@serjux.com> - 0.1.9998-8.r2814
-- Update kBuild to svn rev 2814
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.9998-7.r2784
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Dec 21 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 0.1.9998-6.r2784
-- Add support for aarch64 (#1291091).
-
-* Mon Jun 22 2015 Sérgio Basto <sergio@serjux.com> - 0.1.9998-5.r2784
-- Update to trunk HEAD version.
-- Rework patch for glob issue.
-- Add kBuild-0.1.9998-ppc64le.patch to add support for ppc64le.
-- Add kbuild-wrong-memset.patch, fix one warning.
-- Fix License macro.
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.9998-4.r2730
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.9998-3.r2730
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.9998-2.r2730
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun May 18 2014 Sérgio Basto <sergio@serjux.com> - 0.1.9998-1.r2730
-- Update to trunk HEAD version, have a fix for gcc >= 4.7 (http://trac.netlabs.org/kbuild/ticket/112)
-- Drop kBuild-0.1.5-dprintf.patch patch, upstream source also have a fix in their own way.
-- add kBuild-0.1.9998-gl_.patch to fix a regression on compiling in Linux
-  (http://trac.netlabs.org/kbuild/ticket/117), partially reverses changeset 2702 . 
-
-* Thu Oct 24 2013 Lubomir Rintel <lkundrak@v3.sk> - 0.1.98-6.r1
-- Bulk sad and useless attempt at consistent SPEC file formatting
-- Fix ARM build
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.98-5.r1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.98-4.r1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.98-3.r1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.98-2.r1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Sep 20 2011 Lubomir Rintel <lkundrak@v3.sk> - 0.1.98-1.r1
-- Later patchset
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.5-7.p2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
 * Wed Feb 17 2010 Lubomir Rintel <lkundrak@v3.sk> - 0.1.5-6.p2
 - Fix build
 - Update to later patch level
diff --git a/kbuild-dummy_noreturn.diff b/kbuild-dummy_noreturn.diff
deleted file mode 100644
index bf03e86..0000000
--- a/kbuild-dummy_noreturn.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/kmk/kmkbuiltin/expr.c
-===================================================================
---- ./src/kmk/kmkbuiltin/expr.c.orig
-+++ ./src/kmk/kmkbuiltin/expr.c
-@@ -317,6 +317,8 @@ eval6(PEXPRINSTANCE pThis)
- 		return v;
- 	} else {
- 		error(pThis);
-+        /* dummy return in order to make the build checks happy (this will never be reached) */
-+        return NULL;
- 	}
- 	/* NOTREACHED */
- }
diff --git a/relax_automake_version.patch b/relax_automake_version.patch
deleted file mode 100644
index 8e6fc2f..0000000
--- a/relax_automake_version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# Only for epel <= 7
---- kBuild/src/kmk/configure.ac.orig	2022-10-30 19:36:49.966336934 +0000
-+++ kBuild/src/kmk/configure.ac	2022-10-30 19:37:07.936270597 +0000
-@@ -30,7 +30,7 @@ AC_CONFIG_HEADERS([config.h])
- # We cannot enable -Werror because gettext 0.18.1 has invalid content
- # When we update gettext to 0.18.3 or better we can add it again.
- # bird: Added subdir-objects
--AM_INIT_AUTOMAKE([1.15 foreign -Werror -Wall subdir-objects])
-+AM_INIT_AUTOMAKE([1.13.4 foreign -Werror -Wall subdir-objects])
- 
- # Checks for programs.
- AC_USE_SYSTEM_EXTENSIONS
diff --git a/sources b/sources
index 7b1bdf3..7e06b26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kBuild-r3674.20250422.tar.gz) = dfb52548f896281ac7473a2ebed93e939ae65e6b22101f16a27d36367a90304a3b0aa67f5470d50af1a37333865f570cc447ac7537250fc0fe57746d6c6ba219
+5e4e2193aa6cb3f095af2f99bf90d01d  kBuild-0.1.5-p2-src.tar.gz