erlang: Update to 23.2.4

pkgsrc changes:
---------------
  * Fix PLIST when the hive option is enabled.

upstream changes:
-----------------
Patch Package:           OTP 23.2.4
Git Tag:                 OTP-23.2.4
Date:                    2021-02-04
Trouble Report Id:       OTP-16239, OTP-17139, OTP-17161, OTP-17174
Seq num:                 ERIERL-597, ERL-1458
System:                  OTP
Release:                 23
Application:             snmp-5.7.3, ssl-10.2.2
Predecessor:             OTP 23.2.3

 Check out the git tag OTP-23.2.4, and build a full OTP system
 including documentation. Apply one or more applications from this
 build as patches to your installation using the 'otp_patch_apply'
 tool. For information on install requirements, see descriptions for
 each application version below.

 ---------------------------------------------------------------------
 --- snmp-5.7.3 ------------------------------------------------------
 ---------------------------------------------------------------------

 The snmp-5.7.3 application can be applied independently of other
 applications on a full OTP 23 installation.

 --- Fixed Bugs and Malfunctions ---

  OTP-17161    Application(s): snmp

               [manager] In a function handling snmp errors, an unused
               result (_Error) could result in matching issues and
               therefor case clause runtime errors (crash). Note that
               this would only happen in *very* unusual error cases.


 Full runtime dependencies of snmp-5.7.3: crypto-3.3, erts-6.0,
 kernel-3.0, mnesia-4.12, runtime_tools-1.8.14, stdlib-2.5


 ---------------------------------------------------------------------
 --- ssl-10.2.2 ------------------------------------------------------
 ---------------------------------------------------------------------

 The ssl-10.2.2 application can be applied independently of other
 applications on a full OTP 23 installation.

 --- Fixed Bugs and Malfunctions ---

  OTP-17139    Application(s): ssl
               Related Id(s): ERL-1458, OTP-16239

               Avoid that upgrade (from TCP to TLS) servers starts
               multiple session cache handlers for the same server.
               This applies to Erlang distribution over TLS servers.


  OTP-17174    Application(s): ssl
               Related Id(s): ERIERL-597

               Legacy cipher suites defined before TLS-1.2 (but still
               supported) should be possible to use in TLS-1.2. They
               where accidentally excluded for available cipher suites
               for TLS-1.2 in OTP-23.2.2.


 --- Improvements and New Features ---

  OTP-16239    Application(s): ssl
               Related Id(s): ERL-1458, OTP-17139

               Enable Erlang distribution over TLS to run TLS-1.3,
               although TLS-1.2 will still be default.


 Full runtime dependencies of ssl-10.2.2: crypto-4.2, erts-10.0,
 inets-5.10.7, kernel-6.0, public_key-1.8, stdlib-3.12


 ---------------------------------------------------------------------
 ---------------------------------------------------------------------
 ---------------------------------------------------------------------
Patch Package:           OTP 23.2.3
Git Tag:                 OTP-23.2.3
Date:                    2021-01-20
Trouble Report Id:       OTP-17097, OTP-17107, OTP-17108, OTP-17110
Seq num:                 ERIERL-586, ERL-1442
System:                  OTP
Release:                 23
Application:             crypto-4.8.3, erts-11.1.7, snmp-5.7.2,
                         ssh-4.10.7
Predecessor:             OTP 23.2.2

 Check out the git tag OTP-23.2.3, and build a full OTP system
 including documentation. Apply one or more applications from this
 build as patches to your installation using the 'otp_patch_apply'
 tool. For information on install requirements, see descriptions for
 each application version below.

 ---------------------------------------------------------------------
 --- crypto-4.8.3 ----------------------------------------------------
 ---------------------------------------------------------------------

 The crypto-4.8.3 application can be applied independently of other
 applications on a full OTP 23 installation.

 --- Fixed Bugs and Malfunctions ---

  OTP-17107    Application(s): crypto

               Adding missing flag in BN-calls in SRP.


 Full runtime dependencies of crypto-4.8.3: erts-9.0, kernel-5.3,
 stdlib-3.4


 ---------------------------------------------------------------------
 --- erts-11.1.7 -----------------------------------------------------
 ---------------------------------------------------------------------

 The erts-11.1.7 application can be applied independently of other
 applications on a full OTP 23 installation.

 --- Improvements and New Features ---

  OTP-17097    Application(s): erts

               Make windows installer remove write access rights for
               non admin users when installing to a non default
               directory. Reduces the risk for DLL sideloading, but
               the user should always be aware of the access rights
               for the installation.


 Full runtime dependencies of erts-11.1.7: kernel-7.0, sasl-3.3,
 stdlib-3.13


 ---------------------------------------------------------------------
 --- snmp-5.7.2 ------------------------------------------------------
 ---------------------------------------------------------------------

 The snmp-5.7.2 application can be applied independently of other
 applications on a full OTP 23 installation.

 --- Fixed Bugs and Malfunctions ---

  OTP-17110    Application(s): snmp
               Related Id(s): ERIERL-586

               [manager] Misspelled priv protocol (atom) made it
               impossible to update usm user 'priv_key' configuration
               for usmAesCfb128Protocol via function calls.


 Full runtime dependencies of snmp-5.7.2: crypto-3.3, erts-6.0,
 kernel-3.0, mnesia-4.12, runtime_tools-1.8.14, stdlib-2.5


 ---------------------------------------------------------------------
 --- ssh-4.10.7 ------------------------------------------------------
 ---------------------------------------------------------------------

 The ssh-4.10.7 application can be applied independently of other
 applications on a full OTP 23 installation.

 --- Fixed Bugs and Malfunctions ---

  OTP-17108    Application(s): ssh
               Related Id(s): ERL-1442

               The SSH daemon erroneously replaced LF with CRLF also
               when there was no pty requested from the server.


 Full runtime dependencies of ssh-4.10.7: crypto-4.6.4, erts-9.0,
 kernel-5.3, public_key-1.6.1, stdlib-3.4.1


 ---------------------------------------------------------------------
 ---------------------------------------------------------------------
 ---------------------------------------------------------------------

6 files changed, 118 insertions, 112 deletions

diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index 9cc7395609c..1f91a6758dc 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.versions,v 1.50 2021/01/15 13:40:13 nia Exp $
+# $NetBSD: Makefile.versions,v 1.51 2021/02/08 07:00:29 triaxx Exp $
 
 DIST_VERSION_MAJOR=		23
 DIST_VERSION_MINOR=		2
-DIST_VERSION_PATCH=		2
+DIST_VERSION_PATCH=		4
 
 .include "versions.mk"
 
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index 6855f62edfc..2224f677460 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2021/01/15 13:47:45 nia Exp $
+@comment $NetBSD: PLIST,v 1.44 2021/02/08 07:00:29 triaxx Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -1009,104 +1009,6 @@ lib/erlang/lib/ftp-${VERSION.ftp}/src/ftp_app.erl
 lib/erlang/lib/ftp-${VERSION.ftp}/src/ftp_progress.erl
 lib/erlang/lib/ftp-${VERSION.ftp}/src/ftp_response.erl
 lib/erlang/lib/ftp-${VERSION.ftp}/src/ftp_sup.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_cconv.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_closurean.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_hipe_primops.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_hipeify.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_lib.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_pmatch.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_prettypr.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_to_icode.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_typean.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/erl_bif_types.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/cerl/erl_types.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_cconv.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_closurean.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_hipeify.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_lib.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_pmatch.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_prettypr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_to_icode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_typean.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_bif_types.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_types.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.app
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.appup
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_bb.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_beam_to_icode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_consttab.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_digraph.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dominators.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dot.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dsets.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gen_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gensym.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_bincomp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_call_elim.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_callgraph.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_coordinator.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ebb.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_exceptions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_inline_bifs.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_instruction_counter.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_mulret.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_primops.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_range.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_split_arith.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_const_prop.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_copy_prop.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_struct_reuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_type.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_timing.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/flow/cfg.inc
-lib/erlang/lib/hipe-${VERSION.hipe}/flow/ebb.inc
-lib/erlang/lib/hipe-${VERSION.hipe}/flow/hipe_bb.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/flow/hipe_dominators.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/flow/hipe_gen_cfg.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/flow/liveness.inc
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_beam_to_icode.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_bincomp.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_call_elim.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_callgraph.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_cfg.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_coordinator.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ebb.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_exceptions.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_fp.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_inline_bifs.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_instruction_counter.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_liveness.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_mulret.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_pp.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_primops.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_primops.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_range.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_split_arith.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_const_prop.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_copy_prop.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_struct_reuse.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe_main.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_consttab.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_gensym.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_sdi.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_digraph.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_dot.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_dsets.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_timing.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/vsn.mk
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_chunk.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_request.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_response.beam
@@ -2664,11 +2566,14 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session_cache.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session_cache_api.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_srp_primes.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_upgrade_server_session_cache_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_bloom_filter.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_client_ticket_store.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection_1_3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_dist_server_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_dist_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_dtls_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_gen_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_handshake.beam
@@ -2751,12 +2656,15 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_session_cache_api.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_srp.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_srp_primes.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_upgrade_server_session_cache_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_bloom_filter.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_client_ticket_store.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection_1_3.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_dist_server_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_dist_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_dtls_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_gen_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_handshake.erl
diff --git a/lang/erlang/PLIST.hipe b/lang/erlang/PLIST.hipe
index 649d8702101..cc894dd429d 100644
--- a/lang/erlang/PLIST.hipe
+++ b/lang/erlang/PLIST.hipe
@@ -1,5 +1,28 @@
-@comment $NetBSD: PLIST.hipe,v 1.8 2019/01/22 00:07:35 nia Exp $
+@comment $NetBSD: PLIST.hipe,v 1.9 2021/02/08 07:00:29 triaxx Exp $
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_cconv.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_closurean.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_hipe_primops.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_hipeify.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_lib.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_pmatch.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_prettypr.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_to_icode.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/cerl_typean.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/erl_bif_types.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/cerl/erl_types.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_cconv.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_closurean.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_hipeify.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_lib.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_pmatch.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_prettypr.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_to_icode.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_typean.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/elf_format.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_bif_types.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_types.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.app
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.appup
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_adj_list.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_assemble.beam
@@ -41,12 +64,43 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_postconditions.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_registers.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_specific.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_subst.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_bb.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_bb_weights.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_beam_to_icode.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_coalescing_regalloc.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_consttab.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_data_pp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_digraph.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dominators.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dot.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dsets.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gen_cfg.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gensym.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_graph_coloring_regalloc.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode2rtl.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_bincomp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_call_elim.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_callgraph.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_cfg.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_coordinator.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ebb.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_exceptions.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_fp.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_heap_test.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_inline_bifs.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_instruction_counter.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_liveness.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_mulret.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_pp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_primops.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_range.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_split_arith.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_const_prop.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_copy_prop.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_struct_reuse.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_type.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig_moves.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_jit.beam
@@ -55,6 +109,7 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_liveness.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_main.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_merge.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ls_regalloc.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_main.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_moves.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_node_sets.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_optimistic_regalloc.beam
@@ -144,6 +199,7 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_color.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_scan.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_tagscheme.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_temp_map.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_timing.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_vectors.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_assemble.beam
@@ -166,7 +222,39 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_specific_x87.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_spill_restore.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_subst.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_x87.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/flow/cfg.inc
+lib/erlang/lib/hipe-${VERSION.hipe}/flow/ebb.inc
+lib/erlang/lib/hipe-${VERSION.hipe}/flow/hipe_bb.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/flow/hipe_dominators.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/flow/hipe_gen_cfg.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/flow/liveness.inc
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_beam_to_icode.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_bincomp.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_call_elim.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_callgraph.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_cfg.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_coordinator.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ebb.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_exceptions.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_fp.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_heap_test.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_inline_bifs.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_instruction_counter.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_liveness.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_mulret.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_pp.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_primops.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_primops.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_range.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_split_arith.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_const_prop.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_copy_prop.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_struct_reuse.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.hrl
 lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf32_format.hrl
 lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf64_format.hrl
 lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.erl
@@ -178,9 +266,14 @@ lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_main.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_merge.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_rtl_to_llvm.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe_main.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_consttab.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_data_pp.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_gensym.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_pack_constants.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_sdi.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_sdi.hrl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_segment_trees.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_icode2rtl.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_literals.hrl
@@ -206,4 +299,9 @@ lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_symbolic.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_varmap.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_verify_gcsafe.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_tagscheme.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_digraph.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_dot.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_dsets.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_timing.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_vectors.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/vsn.mk
diff --git a/lang/erlang/buildlink3.mk b/lang/erlang/buildlink3.mk
index 1a0873779a5..a2408c9fc5c 100644
--- a/lang/erlang/buildlink3.mk
+++ b/lang/erlang/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2015/07/18 08:55:16 fhajny Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2021/02/08 07:00:29 triaxx Exp $
 
 BUILDLINK_TREE+=	erlang
 
@@ -12,11 +12,11 @@ BUILDLINK_PKGSRCDIR.erlang?=	../../lang/erlang
 pkgbase := erlang
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.erlang:Miodbc)
+.if ${PKG_BUILD_OPTIONS.erlang:Miodbc}
 .  include "../../databases/iodbc/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.erlang:Munixodbc)
+.if ${PKG_BUILD_OPTIONS.erlang:Munixodbc}
 .  include "../../databases/unixodbc/buildlink3.mk"
 .endif
 
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 87de51a653b..e7f85bddb8d 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.83 2021/01/15 13:40:14 nia Exp $
+$NetBSD: distinfo,v 1.84 2021/02/08 07:00:29 triaxx Exp $
 
-SHA1 (erlang-23.2.2.tar.gz) = 01d84b9930b4290ff2fcba0ce2df49a71ce20a6f
-RMD160 (erlang-23.2.2.tar.gz) = 0da7840934b25d7e8bd3febffc99f63d0474f657
-SHA512 (erlang-23.2.2.tar.gz) = 26743a7a4b2e31e63c0940ed6fdad64427c22e0f08fc063e1b8639bea6fa89c6b24e9c87ca572475d3ce39a18857ef6143676653cdf97b374656ae49f5892633
-Size (erlang-23.2.2.tar.gz) = 56594755 bytes
+SHA1 (erlang-23.2.4.tar.gz) = 01bf2e5bcb437b116597b6fd4a2596a8e173e551
+RMD160 (erlang-23.2.4.tar.gz) = 2c384e6cfc2eeb2f88da1aeede4a60aa2f40d322
+SHA512 (erlang-23.2.4.tar.gz) = 12d10d0f2522a6df0007ee662335055dee3e2dad2be2a877e42c6fb7c3ca6ff613437a92523845a5e41c2b18ee2221de96c3d4a33acf5c3c5e4e3a1d093c2cac
+Size (erlang-23.2.4.tar.gz) = 56590253 bytes
 SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3
 SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd
 SHA1 (patch-erts_aclocal.m4) = 3812a0feda06eb7c6ff02b5ac7125284ad5df2cb
diff --git a/lang/erlang/versions.mk b/lang/erlang/versions.mk
index 83a413f2d8c..69dd93e77e5 100644
--- a/lang/erlang/versions.mk
+++ b/lang/erlang/versions.mk
@@ -1,3 +1,3 @@
-# $NetBSD: versions.mk,v 1.19 2021/01/15 13:40:14 nia Exp $
+# $NetBSD: versions.mk,v 1.20 2021/02/08 07:00:29 triaxx Exp $
 # Do not edit, regenerate using 'make versions'
-_VERSIONS=	crypto 4.8.2 erl_interface 4.0.2 erts 11.1.6 megaco 3.19.5 odbc 2.13.2 snmp 5.7.1 ssl 10.2.1 asn1 5.0.14 common_test 1.19.1 compiler 7.6.6 debugger 5.0 dialyzer 4.3 diameter 2.2.3 edoc 0.12 eldap 1.2.8 erl_docgen 1.0.2 et 1.6.4 eunit 2.6 ftp 1.0.5 hipe 4.0.1 inets 7.3.1 jinterface 1.11 kernel 7.2 mnesia 4.18.1 observer 2.9.5 os_mon 2.6.1 parsetools 2.2 public_key 1.9.2 reltool 0.8 runtime_tools 1.15.1 sasl 4.0.1 ssh 4.10.6 stdlib 3.14 syntax_tools 2.4 tftp 1.0.2 tools 3.4.2 wx 1.9.2 xmerl 1.3.26
+_VERSIONS=	snmp 5.7.3 ssl 10.2.2 asn1 5.0.14 common_test 1.19.1 compiler 7.6.6 crypto 4.8.3 debugger 5.0 dialyzer 4.3 diameter 2.2.3 edoc 0.12 eldap 1.2.8 erl_docgen 1.0.2 erl_interface 4.0.2 erts 11.1.7 et 1.6.4 eunit 2.6 ftp 1.0.5 hipe 4.0.1 inets 7.3.1 jinterface 1.11 kernel 7.2 megaco 3.19.5 mnesia 4.18.1 observer 2.9.5 odbc 2.13.2 os_mon 2.6.1 parsetools 2.2 public_key 1.9.2 reltool 0.8 runtime_tools 1.15.1 sasl 4.0.1 ssh 4.10.7 stdlib 3.14 syntax_tools 2.4 tftp 1.0.2 tools 3.4.2 wx 1.9.2 xmerl 1.3.26