erlang: Update to 25.1

upstream changes:
-----------------
OTP 25.1 Release
  o https://www.erlang.org/news/158
OTP 25.0 Release
  o https://www.erlang.org/news/158
OTP 24.2 Release
  o https://www.erlang.org/news/152
OTP 24.1 Release
  o https://www.erlang.org/news/149
OTP 24.0 Release
  o https://www.erlang.org/news/148

8 files changed, 12 insertions, 58 deletions

diff --git a/lang/erlang/patches/patch-ab b/lang/erlang/patches/patch-ab
index 4973ec1e070..a45f1fd4108 100644
--- a/lang/erlang/patches/patch-ab
+++ b/lang/erlang/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.6 2013/06/08 06:48:24 asau Exp $
+$NetBSD: patch-ab,v 1.7 2022/10/15 18:04:10 triaxx Exp $
 
 Build all .java files.
 
 --- make/otp.mk.in.orig	2013-02-25 19:21:31.000000000 +0000
 +++ make/otp.mk.in
-@@ -179,7 +179,7 @@ endif
+@@ -195,7 +195,7 @@ endif
  
  
  $(JAVA_DEST_ROOT)$(JAVA_CLASS_SUBDIR)%.class: %.java
diff --git a/lang/erlang/patches/patch-ay b/lang/erlang/patches/patch-ay
index 0b70545cb52..f45acba92b4 100644
--- a/lang/erlang/patches/patch-ay
+++ b/lang/erlang/patches/patch-ay
@@ -1,10 +1,10 @@
-$NetBSD: patch-ay,v 1.2 2015/04/28 14:34:20 fhajny Exp $
+$NetBSD: patch-ay,v 1.3 2022/10/15 18:04:10 triaxx Exp $
 
 Pass in proper LDFLAGS. Fixes build with iodbc.
 
 --- lib/odbc/c_src/Makefile.in.orig	2010-02-19 20:07:30.000000000 +0200
 +++ lib/odbc/c_src/Makefile.in	2010-06-21 23:28:49.000000000 +0300
-@@ -81,7 +81,7 @@
+@@ -82,7 +82,7 @@
  CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@
  EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET)
  LD = @LD@
diff --git a/lang/erlang/patches/patch-erts_aclocal.m4 b/lang/erlang/patches/patch-erts_aclocal.m4
deleted file mode 100644
index a0160e5316d..00000000000
--- a/lang/erlang/patches/patch-erts_aclocal.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-erts_aclocal.m4,v 1.1 2019/08/08 11:42:23 jperkin Exp $
-
-SunOS needs -shared via the GCC driver, not -G.
-
---- erts/aclocal.m4.orig	2019-07-10 16:05:15.000000000 +0000
-+++ erts/aclocal.m4
-@@ -2983,7 +2983,7 @@ case $host_os in
- 		DED_LD_FLAG_RUNTIME_LIBRARY_PATH=
- 	;;
- 	solaris2*|sysv4*)
--		DED_LDFLAGS="-G"
-+		DED_LDFLAGS="-shared"
- 		if test X${enable_m64_build} = Xyes; then
- 			DED_LDFLAGS="-64 $DED_LDFLAGS"
- 		fi
diff --git a/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c b/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c
index 236341c8ba8..669bf782cc0 100644
--- a/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c
+++ b/lang/erlang/patches/patch-erts_emulator_drivers_common_inet__drv.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-erts_emulator_drivers_common_inet__drv.c,v 1.4 2018/11/09 17:16:01 nia Exp $
+$NetBSD: patch-erts_emulator_drivers_common_inet__drv.c,v 1.5 2022/10/15 18:04:10 triaxx Exp $
 
 Unbreak build due to differences in the NetBSD SCTP implementation.
 
 --- erts/emulator/drivers/common/inet_drv.c.orig	2018-09-24 10:32:43.000000000 +0100
 +++ erts/emulator/drivers/common/inet_drv.c	2018-11-09 09:34:01.671317341 +0000
-@@ -1182,7 +1182,11 @@
+@@ -1315,7 +1315,11 @@
      inet_emergency_close
  };
  
diff --git a/lang/erlang/patches/patch-erts_emulator_nifs_common_prim__net__nif.c b/lang/erlang/patches/patch-erts_emulator_nifs_common_prim__net__nif.c
deleted file mode 100644
index 3939c019ebf..00000000000
--- a/lang/erlang/patches/patch-erts_emulator_nifs_common_prim__net__nif.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-erts_emulator_nifs_common_prim__net__nif.c,v 1.1 2019/11/18 20:46:02 nia Exp $
-
-Using bool as a variable name isn't a good idea since it conflicts with
-the keyword. For now, just undefine the keyword.
-
---- erts/emulator/nifs/common/prim_net_nif.c.orig	2019-11-08 11:19:37.000000000 +0000
-+++ erts/emulator/nifs/common/prim_net_nif.c
-@@ -209,6 +209,8 @@
- #  define SOCKLEN_T size_t
- #endif
- 
-+#undef bool
-+
- /* Debug stuff... */
- #define NET_NIF_DEBUG_DEFAULT FALSE
- 
diff --git a/lang/erlang/patches/patch-erts_lib__src_common_erl__printf.c b/lang/erlang/patches/patch-erts_lib__src_common_erl__printf.c
index 1cdccad0f43..886b4bd4851 100644
--- a/lang/erlang/patches/patch-erts_lib__src_common_erl__printf.c
+++ b/lang/erlang/patches/patch-erts_lib__src_common_erl__printf.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-erts_lib__src_common_erl__printf.c,v 1.4 2019/08/01 11:43:00 nia Exp $
+$NetBSD: patch-erts_lib__src_common_erl__printf.c,v 1.5 2022/10/15 18:04:10 triaxx Exp $
 
 Set _XOPEN_SOURCE correctly on SunOS.
 
 --- erts/lib_src/common/erl_printf.c.orig	2019-07-10 16:05:15.000000000 +0000
 +++ erts/lib_src/common/erl_printf.c
-@@ -32,6 +32,14 @@
+@@ -27,6 +27,14 @@
      #define __EXTENSIONS__
  #endif
  
diff --git a/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in b/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in
index 1f4a83a2044..7b8eb949bdb 100644
--- a/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in
+++ b/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.1 2017/10/04 16:20:51 jperkin Exp $
+$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.2 2022/10/15 18:04:10 triaxx Exp $
 
 Compile via CC wrapper to ensure correct flags.
 
---- lib/crypto/c_src/Makefile.in.orig	2017-06-20 18:56:09.000000000 +0000
+--- lib/crypto/c_src/Makefile.in.orig	2022-09-20 10:30:35.000000000 +0000
 +++ lib/crypto/c_src/Makefile.in
-@@ -156,7 +156,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRY
- ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
+@@ -232,7 +232,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRY
+ ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
  $(LIBDIR)/crypto_callback$(TYPEMARKER).so: $(CALLBACK_OBJS)
  	$(INSTALL_DIR) $(LIBDIR)
 -	$(LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
diff --git a/lang/erlang/patches/patch-lib_tools_c__src_Makefile.in b/lang/erlang/patches/patch-lib_tools_c__src_Makefile.in
deleted file mode 100644
index 56ae152d0e1..00000000000
--- a/lang/erlang/patches/patch-lib_tools_c__src_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_tools_c__src_Makefile.in,v 1.1 2020/03/17 16:02:23 nia Exp $
-
-Portability.
-
---- lib/tools/c_src/Makefile.in.orig	2020-02-17 08:47:07.000000000 +0000
-+++ lib/tools/c_src/Makefile.in
-@@ -222,7 +222,7 @@ SED_DEPEND=sed '$(SED_REPL_OBJ_DIR);$(SE
- DEPEND_MK=depend.mk
- 
- dep depend:
--	[ $(v_p) == 0 ] && echo " GEN	"$(DEPEND_MK)
-+	[ $(v_p) = 0 ] && echo " GEN	"$(DEPEND_MK)
- 	$(V_colon)@echo "Generating dependency file $(DEPEND_MK)..."
- 	@echo "# Generated dependency rules." > $(DEPEND_MK);
- 	@echo "# Do *not* edit this file; instead, run 'make depend'." \