erlang: Update to version OTP-21.2.3. Should fix non-hipe builds...

 ---------------------------------------------------------------------
 --- compiler-7.3.1 --------------------------------------------------
 ---------------------------------------------------------------------

 The compiler-7.3.1 application can be applied independently of other
 applications on a full OTP 21 installation.

 --- Fixed Bugs and Malfunctions ---

  OTP-15501    Application(s): compiler
               Related Id(s): ERL-514, ERL-807, OTP-14808

               An optimization that avoided allocation of a stack
               frame for some case expressions was introduced in OTP
               21. (ERL-504/OTP-14808) It turns out that in rare
               circumstances, this optimization is not safe.
               Therefore, this optimization has been disabled.

               A similar optimization will be included in OTP 22 in a
               safe way.


 Full runtime dependencies of compiler-7.3.1: crypto-3.6, erts-9.0,
 hipe-3.12, kernel-4.0, stdlib-2.5


 ---------------------------------------------------------------------
 --- erts-10.2.2 -----------------------------------------------------
 ---------------------------------------------------------------------

 Note! The erts-10.2.2 application can *not* be applied independently
       of other applications on an arbitrary OTP 21 installation.

       On a full OTP 21 installation, also the following runtime
       dependencies have to be satisfied:
       -- kernel-6.1 (first satisfied in OTP 21.1)
       -- sasl-3.3 (first satisfied in OTP 21.2)


 --- Fixed Bugs and Malfunctions ---

  OTP-15495    Application(s): erts
               Related Id(s): ERL-821

               Fixed a crash when dangling files were closed after
               init:restart/0.


  OTP-15509    Application(s): erts
               Related Id(s): PR-2027, PR-2093

               A bug that could cause dirty schedulers to become
               unresponsive has been fixed.


 Full runtime dependencies of erts-10.2.2: kernel-6.1, sasl-3.3,
 stdlib-3.5


 ---------------------------------------------------------------------
 --- ssl-9.1.2 -------------------------------------------------------
 ---------------------------------------------------------------------

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

 --- Fixed Bugs and Malfunctions ---

  OTP-15477    Application(s): ssl
               Related Id(s): ERL-790

               Fix encoding of the SRP extension length field in ssl.
               The old encoding of the SRP extension length could
               cause interoperability problems with third party SSL
               implementations when SRP was used.


  OTP-15504    Application(s): ssl
               Related Id(s): ERL-371

               Guarantee active once data delivery, handling TCP
               stream properly.


  OTP-15505    Application(s): ssl

               Correct gen_statem returns for some error cases


 Full runtime dependencies of ssl-9.1.2: crypto-4.2, erts-10.0,
 inets-5.10.7, kernel-6.0, public_key-1.5, stdlib-3.5


 ---------------------------------------------------------------------
 --- xmerl-1.3.19 ----------------------------------------------------
 ---------------------------------------------------------------------

 The xmerl-1.3.19 application can be applied independently of other
 applications on a full OTP 21 installation.

 --- Fixed Bugs and Malfunctions ---

  OTP-15492    Application(s): xmerl
               Related Id(s): ERIERL-283

               The charset detection parsing crash in some cases when
               the XML directive is not syntactic correct.


 Full runtime dependencies of xmerl-1.3.19: erts-6.0, kernel-3.0,
 stdlib-2.5


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

5 files changed, 109 insertions, 109 deletions

diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index 76491f023f8..812965b631e 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.versions,v 1.38 2019/01/04 00:03:21 nia Exp $
+# $NetBSD: Makefile.versions,v 1.39 2019/01/22 00:07:35 nia Exp $
 
 DIST_VERSION_MAJOR=		21
 DIST_VERSION_MINOR=		2
 # Only set when sources for patch level releases are published on erlang.org
-DIST_VERSION_PATCH=		2
+DIST_VERSION_PATCH=		3
 
 .include "versions.mk"
 
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index 5efcf2d47b3..353321c1efa 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2019/01/11 11:19:46 nia Exp $
+@comment $NetBSD: PLIST,v 1.36 2019/01/22 00:07:35 nia Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -980,6 +980,104 @@ 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
diff --git a/lang/erlang/PLIST.hipe b/lang/erlang/PLIST.hipe
index 7250dd79ae4..649d8702101 100644
--- a/lang/erlang/PLIST.hipe
+++ b/lang/erlang/PLIST.hipe
@@ -1,28 +1,5 @@
-@comment $NetBSD: PLIST.hipe,v 1.7 2019/01/11 11:19:46 nia 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
+@comment $NetBSD: PLIST.hipe,v 1.8 2019/01/22 00:07:35 nia Exp $
 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
@@ -64,43 +41,12 @@ 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
@@ -109,7 +55,6 @@ 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
@@ -199,7 +144,6 @@ 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
@@ -222,39 +166,7 @@ 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
@@ -266,14 +178,9 @@ 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
@@ -299,9 +206,4 @@ 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/distinfo b/lang/erlang/distinfo
index 7775387f3c9..796885585aa 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.68 2019/01/04 00:03:21 nia Exp $
+$NetBSD: distinfo,v 1.69 2019/01/22 00:07:35 nia Exp $
 
-SHA1 (erlang/OTP-21.2.2.tar.gz) = b8839934ae05401bb0412310fc77bf8ba5bad95d
-RMD160 (erlang/OTP-21.2.2.tar.gz) = 930a7e79325f7bf6145d79581f3ffc34881a7221
-SHA512 (erlang/OTP-21.2.2.tar.gz) = 0efd1df4d7f8ebc7202869b301472ad289aad7d9df53a656175dd87434eb669618eaf3647f29d41326f8c8dea25b88a124e90fae1def0de6a398fe7a03642a8a
-Size (erlang/OTP-21.2.2.tar.gz) = 53946708 bytes
+SHA1 (erlang/OTP-21.2.3.tar.gz) = 64adcc4339c4e0f94ccf51d33b5e06a06f22256b
+RMD160 (erlang/OTP-21.2.3.tar.gz) = fc59b368109a819f8482c73571bbaf3a304c8694
+SHA512 (erlang/OTP-21.2.3.tar.gz) = bdf6322098c4f89b54d572b6843ba8f314c70395a39ae6fdd9996bd68c7b95fc3906bcc08a3aeb8f5d3270fda41733a359e2f2efa47a8d31cdb3967a49b17faf
+Size (erlang/OTP-21.2.3.tar.gz) = 53956308 bytes
 SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3
 SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd
 SHA1 (patch-erts_configure.in) = 2154871858bab389509e908b38ae479a55709b97
diff --git a/lang/erlang/versions.mk b/lang/erlang/versions.mk
index 4ac6e760c31..beb64e03261 100644
--- a/lang/erlang/versions.mk
+++ b/lang/erlang/versions.mk
@@ -1,4 +1,4 @@
-# $NetBSD: versions.mk,v 1.7 2019/01/04 00:03:21 nia Exp $
+# $NetBSD: versions.mk,v 1.8 2019/01/22 00:07:35 nia Exp $
 # Do not edit, regenerate using 'make versions'
 _VERSIONS= \
- ssh 4.7.3 asn1 5.0.8 common_test 1.16.1 compiler 7.3 crypto 4.4 debugger 4.2.6 dialyzer 3.3.1 diameter 2.1.6 edoc 0.9.4 eldap 1.2.6 erl_docgen 0.8.1 erl_interface 3.10.4 erts 10.2.1 et 1.6.4 eunit 2.3.7 ftp 1.0.1 hipe 3.18.2 inets 7.0.3 jinterface 1.9.1 kernel 6.2 megaco 3.18.4 mnesia 4.15.5 observer 2.8.2 odbc 2.12.2 os_mon 2.4.7 otp_mibs 1.2.1 parsetools 2.1.8 public_key 1.6.4 reltool 0.7.8 runtime_tools 1.13.1 sasl 3.3 snmp 5.2.12 ssl 9.1.1 stdlib 3.7 syntax_tools 2.1.6 tftp 1.0.1 tools 3.0.2 wx 1.8.6 xmerl 1.3.18 
+ compiler 7.3.1 erts 10.2.2 ssl 9.1.2 xmerl 1.3.19 asn1 5.0.8 common_test 1.16.1 crypto 4.4 debugger 4.2.6 dialyzer 3.3.1 diameter 2.1.6 edoc 0.9.4 eldap 1.2.6 erl_docgen 0.8.1 erl_interface 3.10.4 et 1.6.4 eunit 2.3.7 ftp 1.0.1 hipe 3.18.2 inets 7.0.3 jinterface 1.9.1 kernel 6.2 megaco 3.18.4 mnesia 4.15.5 observer 2.8.2 odbc 2.12.2 os_mon 2.4.7 otp_mibs 1.2.1 parsetools 2.1.8 public_key 1.6.4 reltool 0.7.8 runtime_tools 1.13.1 sasl 3.3 snmp 5.2.12 ssh 4.7.3 stdlib 3.7 syntax_tools 2.1.6 tftp 1.0.1 tools 3.0.2 wx 1.8.6