2 files changed, 4 insertions, 175 deletions
diff --git a/devel/fungw/files/patch-MAKE b/devel/fungw/files/patch-MAKE
deleted file mode 100644
index 9b30d60287b5..000000000000
--- a/devel/fungw/files/patch-MAKE
+++ /dev/null
@@ -1,164 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig	2021-04-04 05:53:11 UTC
-+++ Makefile
-@@ -1,36 +1,36 @@ all:
- all:
--	cd libfungw && make all
--	cd libfungwbind && make all
--	cd regression && make all
--	cd doc && make all
-+	cd libfungw && $(MAKE) all
-+	cd libfungwbind && $(MAKE) all
-+	cd regression && $(MAKE) all
-+	cd doc && $(MAKE) all
- 
- clean:
--	cd libfungw && make clean
--	cd libfungwbind && make clean
--	cd regression && make clean
--	cd doc && make clean
--	-cd src_3rd/genht && make clean
-+	cd libfungw && $(MAKE) clean
-+	cd libfungwbind && $(MAKE) clean
-+	cd regression && $(MAKE) clean
-+	cd doc && $(MAKE) clean
-+	-cd src_3rd/genht && $(MAKE) clean
- 
- distclean:
--	cd regression && make distclean
--	cd libfungw && make distclean
--	cd libfungwbind && make distclean
--	cd doc && make distclean
--	cd scconfig && make distclean
--	-cd src_3rd/genht && make clean
-+	cd regression && $(MAKE) distclean
-+	cd libfungw && $(MAKE) distclean
-+	cd libfungwbind && $(MAKE) distclean
-+	cd doc && $(MAKE) distclean
-+	cd scconfig && $(MAKE) distclean
-+	-cd src_3rd/genht && $(MAKE) clean
- 
- install:
--	cd libfungw && make install
--	cd libfungwbind && make install
--	cd doc && make install
-+	cd libfungw && $(MAKE) install
-+	cd libfungwbind && $(MAKE) install
-+	cd doc && $(MAKE) install
- 
- 
- linstall:
--	cd libfungw && make linstall
--	cd libfungwbind && make linstall
--	cd doc && make linstall
-+	cd libfungw && $(MAKE) linstall
-+	cd libfungwbind && $(MAKE) linstall
-+	cd doc && $(MAKE) linstall
- 
- uninstall:
--	cd libfungw && make uninstall
--	cd libfungwbind && make uninstall
--	cd doc && make uninstall
-+	cd libfungw && $(MAKE) uninstall
-+	cd libfungwbind && $(MAKE) uninstall
-+	cd doc && $(MAKE) uninstall
---- doc/Makefile.in.orig	2022-01-01 09:41:21 UTC
-+++ doc/Makefile.in
-@@ -32,12 +32,12 @@ install:
- 	$(INST) -d $(DOCS) $(DOCDIR)
- 
- install:
--	make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
-+	$(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
- 
- linstall:
--	make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
-+	$(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
- 
- uninstall:
--	make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
-+	$(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
- 
- ~]
---- libfungw/Makefile.in.orig	2021-06-12 06:55:05 UTC
-+++ libfungw/Makefile.in
-@@ -96,16 +96,16 @@ install:
- 	$(SCCBOX) $(HOW) $(FUNGW_DYN_VER_XYZ) $(LIBDIR)/$(FUNGW_DYN_VER_XY)
- 
- install:
--	make install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
--	make install_link_ "HOW=ln -f"
-+	$(MAKE) install_ "INST=$(SCCBOX) install -i" "MKDR=$(SCCBOX) mkdir -p -i"
-+	$(MAKE) install_link_ "HOW=ln -f"
- 
- linstall:
--	make install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
--	make install_link_ "HOW=ln -f"
-+	$(MAKE) install_ "INST=$(SCCBOX) install -l -f -a" "MKDR=$(SCCBOX) mkdir -p -i"
-+	$(MAKE) install_link_ "HOW=ln -f"
- 
- uninstall:
--	make install_link_ "HOW=install -u"
--	make install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
-+	$(MAKE) install_link_ "HOW=install -u"
-+	$(MAKE) install_ "INST=$(SCCBOX) install -u -f" "MKDR=$(SCCBOX) mkdir -u"
- 
- dep:
- 	echo "### Generated file, do not edit, run make dep ###" > Makefile.dep
---- libfungwbind/Makefile.in.orig	2019-07-12 12:59:25 UTC
-+++ libfungwbind/Makefile.in
-@@ -2,7 +2,7 @@ foreach /local/fungw/task in {all clean install linsta
- foreach /local/fungw/task in {all clean install linstall uninstall}
- 	print [~~/local/fungw/task~:~] {\n}
- 	foreach /local/fungw/n in /local/fungw/bindings_all
--		print	[~	cd ~/local/fungw/n~ && make ~/local/fungw/task~~] {\n}
-+		print	[~	cd ~/local/fungw/n~ && $(MAKE) ~/local/fungw/task~~] {\n}
- 	end
- 	print {\n}
- end
-@@ -10,7 +10,7 @@ foreach /local/fungw/n in /local/fungw/bindings_all
- 
- print {distclean:\n}
- foreach /local/fungw/n in /local/fungw/bindings_all
--	print	[~	cd ~/local/fungw/n~ && make distclean~] {\n}
-+	print	[~	cd ~/local/fungw/n~ && $(MAKE) distclean~] {\n}
- end
- print {	rm libfungwbind.mak Makefile\n}
- 
---- libfungwbind/Plugin.tmpasm.orig	2021-06-12 06:55:05 UTC
-+++ libfungwbind/Plugin.tmpasm
-@@ -99,16 +99,16 @@ install:
- 	$(SCCBOX) install $(IOP) --relative $(LIBDIR)/lib$(LIBSO_XYZ) $(LIBDIR)/lib$(LIBSO_X)
- 
- install:
--	make install_ IOP="-i"
--	make install_link IOP="-l"
-+	$(MAKE) install_ IOP="-i"
-+	$(MAKE) install_link IOP="-l"
- 
- linstall:
--	make install_ IOP="-l"
--	make install_link IOP="-l"
-+	$(MAKE) install_ IOP="-l"
-+	$(MAKE) install_link IOP="-l"
- 
- uninstall:
--	make install_link IOP="-u"
--	make install_ IOP="-u"
-+	$(MAKE) install_link IOP="-u"
-+	$(MAKE) install_ IOP="-u"
- ~]
- 
- redir /local/fungw/mod_mak
---- regression/Makefile.in.orig	2021-06-12 06:55:05 UTC
-+++ regression/Makefile.in
-@@ -24,7 +24,7 @@ multicall: multicall.o $(LIB_FGW) $(ENGINES) $(LIBS)
- multicall: multicall.o $(LIB_FGW) $(ENGINES) $(LIBS)
- 
- ../src_3rd/genht/genht_std.a:
--	cd ../src_3rd/genht && make genht_std.a
-+	cd ../src_3rd/genht && $(MAKE) genht_std.a
- 
- test.o: test.c
- 
diff --git a/devel/fungw/files/patch-scconfig_src_scripts_find__python.c b/devel/fungw/files/patch-scconfig_src_scripts_find__python.c
index 64f3c5c27dd3..1bdd63926228 100644
--- a/devel/fungw/files/patch-scconfig_src_scripts_find__python.c
+++ b/devel/fungw/files/patch-scconfig_src_scripts_find__python.c
@@ -1,19 +1,12 @@
---- scconfig/src/scripts/find_python.c.orig	2019-01-09 06:46:09 UTC
+--- scconfig/src/scripts/find_python.c.orig	2025-09-17 16:31:52 UTC
 +++ scconfig/src/scripts/find_python.c
-@@ -43,13 +43,13 @@ static int find_script_python_(const char *name, int l
- 
- 	char *inc_py =
- 		NL "import distutils.sysconfig;"
--		NL "print '-I' + distutils.sysconfig.get_python_inc().replace('\\\\','/')"
-+		NL "print ('-I' + distutils.sysconfig.get_python_inc().replace('\\\\','/'))"
+@@ -47,7 +47,7 @@ static int find_script_python_(const char *name, int l
  		NL;
  	char *lib_py =
  		NL "import distutils.sysconfig;"
--		NL "print '-L' + distutils.sysconfig.PREFIX.replace('\\\\','/') + '/libs',;"
+-		NL "print ('-L' + distutils.sysconfig.PREFIX.replace('\\\\','/') + '/libs')"
 +		NL "print ('-L' + distutils.sysconfig.PREFIX.replace('\\\\','/') + '/lib')"
  		NL "import sys;"
--		NL "print '-lpython' + str(sys.version_info[0]) + str(sys.version_info[1])"
+-		NL "print ('-lpython' + str(sys.version_info[0]) + str(sys.version_info[1]))"
 +		NL "print ('-lpython' + str(sys.version_info[0]) + '.' + str(sys.version_info[1]))"
  		NL;
- 
-