erlang: fix non-hipe builds

Restore some PLIST content state from prior to the 23.2.4 update,
which mistakenly moved some hipe-related files that get built
universally to the PLIST.hipe list. The "--disable-hipe" option does
not impact everything. Build tested with the hipe option both enabled
and disabled. This should fix build breakages, e.g., NetBSD/aarch64.

(Separately, it's kind of unfortunate that this package uses both PLIST
variables and separate PLIST files to segment content driven by options.
It should really use one approach or the other consistently, but I
haven't touched that here.)

4 files changed, 105 insertions, 102 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index b0959769512..0cdd5d19e24 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.102 2021/01/15 13:40:13 nia Exp $
+# $NetBSD: Makefile,v 1.103 2021/02/20 01:02:29 gutteridge Exp $
 
 DISTNAME=	erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
 PKGNAME=	${DISTNAME:S/OTP-/erlang-/}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=erlang/}
 GITHUB_PROJECT=	otp
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index 2224f677460..eb20a9a926d 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.44 2021/02/08 07:00:29 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.45 2021/02/20 01:02:29 gutteridge Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -1009,6 +1009,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 cc894dd429d..ba4f10e357d 100644
--- a/lang/erlang/PLIST.hipe
+++ b/lang/erlang/PLIST.hipe
@@ -1,28 +1,5 @@
-@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
+@comment $NetBSD: PLIST.hipe,v 1.10 2021/02/20 01:02:29 gutteridge 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/options.mk b/lang/erlang/options.mk
index 2091e750716..694c28f6f9d 100644
--- a/lang/erlang/options.mk
+++ b/lang/erlang/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2021/02/19 12:50:13 jperkin Exp $
+# $NetBSD: options.mk,v 1.13 2021/02/20 01:02:29 gutteridge Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.erlang
 PKG_SUPPORTED_OPTIONS=		java erlang-hipe
@@ -35,6 +35,8 @@ PLIST_SRC+=		PLIST.java
 CONFIGURE_ARGS+=	--without-javac
 .endif
 
+# Some hipe-related files are still installed even when --disable-hipe
+# is supplied, and these should remain in the general PLIST.
 .if !empty(PKG_OPTIONS:Merlang-hipe)
 CONFIGURE_ARGS+=	--enable-hipe
 PLIST_SRC+=		PLIST.hipe