Moved compiler libs from PLIST to PLIST.opt - they are only installed with

the native code compiler. In response to PR pkg/48466.

2 files changed, 98 insertions, 50 deletions

diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index c61b2565a45..0c3b5c708f4 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2013/11/01 10:47:50 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.26 2014/05/13 10:15:05 jaapb Exp $
 bin/camlp4
 bin/camlp4boot
 bin/camlp4o
@@ -157,11 +157,6 @@ lib/ocaml/char.cmi
 lib/ocaml/char.ml
 lib/ocaml/char.mli
 lib/ocaml/compiler-libs/annot.cmi
-lib/ocaml/compiler-libs/arch.cmi
-lib/ocaml/compiler-libs/asmgen.cmi
-lib/ocaml/compiler-libs/asmlibrarian.cmi
-lib/ocaml/compiler-libs/asmlink.cmi
-lib/ocaml/compiler-libs/asmpackager.cmi
 lib/ocaml/compiler-libs/ast_mapper.cmi
 lib/ocaml/compiler-libs/ast_mapper.cmi
 lib/ocaml/compiler-libs/asttypes.cmi
@@ -172,32 +167,21 @@ lib/ocaml/compiler-libs/bytelink.cmi
 lib/ocaml/compiler-libs/bytepackager.cmi
 lib/ocaml/compiler-libs/bytesections.cmi
 lib/ocaml/compiler-libs/ccomp.cmi
-lib/ocaml/compiler-libs/clambda.cmi
 lib/ocaml/compiler-libs/clflags.cmi
-lib/ocaml/compiler-libs/closure.cmi
 lib/ocaml/compiler-libs/cmi_format.cmi
-lib/ocaml/compiler-libs/cmm.cmi
-lib/ocaml/compiler-libs/cmmgen.cmi
 lib/ocaml/compiler-libs/cmo_format.cmi
 lib/ocaml/compiler-libs/cmt_format.cmi
-lib/ocaml/compiler-libs/cmx_format.cmi
-lib/ocaml/compiler-libs/coloring.cmi
 lib/ocaml/compiler-libs/compenv.cmi
-lib/ocaml/compiler-libs/comballoc.cmi
 lib/ocaml/compiler-libs/compenv.cmi
 lib/ocaml/compiler-libs/compmisc.cmi
 lib/ocaml/compiler-libs/compile.cmi
-lib/ocaml/compiler-libs/compilenv.cmi
 lib/ocaml/compiler-libs/compmisc.cmi
 lib/ocaml/compiler-libs/config.cmi
 lib/ocaml/compiler-libs/consistbl.cmi
 lib/ocaml/compiler-libs/ctype.cmi
 lib/ocaml/compiler-libs/datarepr.cmi
-lib/ocaml/compiler-libs/debuginfo.cmi
 lib/ocaml/compiler-libs/dll.cmi
-lib/ocaml/compiler-libs/emit.cmi
 lib/ocaml/compiler-libs/envaux.cmi
-lib/ocaml/compiler-libs/emitaux.cmi
 lib/ocaml/compiler-libs/emitcode.cmi
 lib/ocaml/compiler-libs/env.cmi
 lib/ocaml/compiler-libs/envaux.cmi
@@ -209,41 +193,23 @@ lib/ocaml/compiler-libs/includeclass.cmi
 lib/ocaml/compiler-libs/includecore.cmi
 lib/ocaml/compiler-libs/includemod.cmi
 lib/ocaml/compiler-libs/instruct.cmi
-lib/ocaml/compiler-libs/interf.cmi
 lib/ocaml/compiler-libs/lambda.cmi
 lib/ocaml/compiler-libs/lexer.cmi
-lib/ocaml/compiler-libs/linearize.cmi
-lib/ocaml/compiler-libs/liveness.cmi
 lib/ocaml/compiler-libs/location.cmi
 lib/ocaml/compiler-libs/longident.cmi
-lib/ocaml/compiler-libs/mach.cmi
 lib/ocaml/compiler-libs/main.cmi
 lib/ocaml/compiler-libs/main.cmo
-lib/ocaml/compiler-libs/main.cmx
-lib/ocaml/compiler-libs/main.o
 lib/ocaml/compiler-libs/main_args.cmi
 lib/ocaml/compiler-libs/matching.cmi
 lib/ocaml/compiler-libs/meta.cmi
 lib/ocaml/compiler-libs/misc.cmi
 lib/ocaml/compiler-libs/mtype.cmi
-lib/ocaml/compiler-libs/ocamlbytecomp.a
 lib/ocaml/compiler-libs/ocamlbytecomp.cma
-lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
-lib/ocaml/compiler-libs/ocamlcommon.a
 lib/ocaml/compiler-libs/ocamlcommon.cma
-lib/ocaml/compiler-libs/ocamlcommon.cmxa
-lib/ocaml/compiler-libs/ocamloptcomp.a
 lib/ocaml/compiler-libs/ocamloptcomp.cma
-lib/ocaml/compiler-libs/ocamloptcomp.cmxa
 lib/ocaml/compiler-libs/ocamltoplevel.cma
 lib/ocaml/compiler-libs/opcodes.cmi
 lib/ocaml/compiler-libs/oprint.cmi
-lib/ocaml/compiler-libs/optcompile.cmi
-lib/ocaml/compiler-libs/opterrors.cmi
-lib/ocaml/compiler-libs/optmain.cmi
-lib/ocaml/compiler-libs/optmain.cmo
-lib/ocaml/compiler-libs/optmain.cmx
-lib/ocaml/compiler-libs/optmain.o
 lib/ocaml/compiler-libs/outcometree.cmi
 lib/ocaml/compiler-libs/parmatch.cmi
 lib/ocaml/compiler-libs/parse.cmi
@@ -256,26 +222,12 @@ lib/ocaml/compiler-libs/pprintast.cmi
 lib/ocaml/compiler-libs/predef.cmi
 lib/ocaml/compiler-libs/primitive.cmi
 lib/ocaml/compiler-libs/printast.cmi
-lib/ocaml/compiler-libs/printclambda.cmi
-lib/ocaml/compiler-libs/printcmm.cmi
 lib/ocaml/compiler-libs/printinstr.cmi
 lib/ocaml/compiler-libs/printlambda.cmi
-lib/ocaml/compiler-libs/printlinear.cmi
-lib/ocaml/compiler-libs/printmach.cmi
 lib/ocaml/compiler-libs/printtyp.cmi
 lib/ocaml/compiler-libs/printtyped.cmi
-lib/ocaml/compiler-libs/proc.cmi
-lib/ocaml/compiler-libs/reg.cmi
-lib/ocaml/compiler-libs/reload.cmi
-lib/ocaml/compiler-libs/reloadgen.cmi
 lib/ocaml/compiler-libs/runtimedef.cmi
-lib/ocaml/compiler-libs/schedgen.cmi
-lib/ocaml/compiler-libs/scheduling.cmi
-lib/ocaml/compiler-libs/selectgen.cmi
-lib/ocaml/compiler-libs/selection.cmi
 lib/ocaml/compiler-libs/simplif.cmi
-lib/ocaml/compiler-libs/spill.cmi
-lib/ocaml/compiler-libs/split.cmi
 lib/ocaml/compiler-libs/stypes.cmi
 lib/ocaml/compiler-libs/subst.cmi
 lib/ocaml/compiler-libs/switch.cmi
diff --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt
index cdef88aa36b..1adefb13194 100644
--- a/lang/ocaml/PLIST.opt
+++ b/lang/ocaml/PLIST.opt
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.20 2013/11/01 10:47:50 jaapb Exp $
+@comment $NetBSD: PLIST.opt,v 1.21 2014/05/13 10:15:05 jaapb Exp $
 bin/camlp4o.opt
 bin/camlp4of.opt
 bin/camlp4oof.opt
@@ -97,6 +97,102 @@ lib/ocaml/camlp4/camlp4prof.cmx
 lib/ocaml/camlp4/camlp4prof.o
 lib/ocaml/char.cmx
 lib/ocaml/complex.cmx
+lib/ocaml/compiler-libs/arch.cmi
+lib/ocaml/compiler-libs/asmgen.cmi
+lib/ocaml/compiler-libs/asmlibrarian.cmi
+lib/ocaml/compiler-libs/asmlink.cmi
+lib/ocaml/compiler-libs/asmpackager.cmi
+lib/ocaml/compiler-libs/clambda.cmi
+lib/ocaml/compiler-libs/closure.cmi
+lib/ocaml/compiler-libs/cmm.cmi
+lib/ocaml/compiler-libs/cmmgen.cmi
+lib/ocaml/compiler-libs/cmx_format.cmi
+lib/ocaml/compiler-libs/coloring.cmi
+lib/ocaml/compiler-libs/comballoc.cmi
+lib/ocaml/compiler-libs/compilenv.cmi
+lib/ocaml/compiler-libs/debuginfo.cmi
+lib/ocaml/compiler-libs/emit.cmi
+lib/ocaml/compiler-libs/emitaux.cmi
+lib/ocaml/compiler-libs/interf.cmi
+lib/ocaml/compiler-libs/linearize.cmi
+lib/ocaml/compiler-libs/liveness.cmi
+lib/ocaml/compiler-libs/mach.cmi
+lib/ocaml/compiler-libs/main.cmx
+lib/ocaml/compiler-libs/main.o
+lib/ocaml/compiler-libs/ocamlbytecomp.a
+lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
+lib/ocaml/compiler-libs/ocamlcommon.a
+lib/ocaml/compiler-libs/ocamlcommon.cmxa
+lib/ocaml/compiler-libs/ocamloptcomp.a
+lib/ocaml/compiler-libs/ocamloptcomp.cmxa
+lib/ocaml/compiler-libs/optcompile.cmi
+lib/ocaml/compiler-libs/opterrors.cmi
+lib/ocaml/compiler-libs/optmain.cmi
+lib/ocaml/compiler-libs/optmain.cmo
+lib/ocaml/compiler-libs/optmain.cmx
+lib/ocaml/compiler-libs/optmain.o
+lib/ocaml/compiler-libs/printclambda.cmi
+lib/ocaml/compiler-libs/printcmm.cmi
+lib/ocaml/compiler-libs/printlinear.cmi
+lib/ocaml/compiler-libs/printmach.cmi
+lib/ocaml/compiler-libs/proc.cmi
+lib/ocaml/compiler-libs/reg.cmi
+lib/ocaml/compiler-libs/reload.cmi
+lib/ocaml/compiler-libs/reloadgen.cmi
+lib/ocaml/compiler-libs/schedgen.cmi
+lib/ocaml/compiler-libs/scheduling.cmi
+lib/ocaml/compiler-libs/selectgen.cmi
+lib/ocaml/compiler-libs/selection.cmi
+lib/ocaml/compiler-libs/spill.cmi
+lib/ocaml/compiler-libs/split.cmi
+lib/ocaml/compiler-libs/arch.cmi
+lib/ocaml/compiler-libs/asmgen.cmi
+lib/ocaml/compiler-libs/asmlibrarian.cmi
+lib/ocaml/compiler-libs/asmlink.cmi
+lib/ocaml/compiler-libs/asmpackager.cmi
+lib/ocaml/compiler-libs/clambda.cmi
+lib/ocaml/compiler-libs/closure.cmi
+lib/ocaml/compiler-libs/cmm.cmi
+lib/ocaml/compiler-libs/cmmgen.cmi
+lib/ocaml/compiler-libs/cmx_format.cmi
+lib/ocaml/compiler-libs/coloring.cmi
+lib/ocaml/compiler-libs/comballoc.cmi
+lib/ocaml/compiler-libs/compilenv.cmi
+lib/ocaml/compiler-libs/debuginfo.cmi
+lib/ocaml/compiler-libs/emit.cmi
+lib/ocaml/compiler-libs/emitaux.cmi
+lib/ocaml/compiler-libs/interf.cmi
+lib/ocaml/compiler-libs/linearize.cmi
+lib/ocaml/compiler-libs/liveness.cmi
+lib/ocaml/compiler-libs/mach.cmi
+lib/ocaml/compiler-libs/main.cmx
+lib/ocaml/compiler-libs/main.o
+lib/ocaml/compiler-libs/ocamlbytecomp.a
+lib/ocaml/compiler-libs/ocamlbytecomp.cmxa
+lib/ocaml/compiler-libs/ocamlcommon.a
+lib/ocaml/compiler-libs/ocamlcommon.cmxa
+lib/ocaml/compiler-libs/ocamloptcomp.a
+lib/ocaml/compiler-libs/ocamloptcomp.cmxa
+lib/ocaml/compiler-libs/optcompile.cmi
+lib/ocaml/compiler-libs/opterrors.cmi
+lib/ocaml/compiler-libs/optmain.cmi
+lib/ocaml/compiler-libs/optmain.cmo
+lib/ocaml/compiler-libs/optmain.cmx
+lib/ocaml/compiler-libs/optmain.o
+lib/ocaml/compiler-libs/printclambda.cmi
+lib/ocaml/compiler-libs/printcmm.cmi
+lib/ocaml/compiler-libs/printlinear.cmi
+lib/ocaml/compiler-libs/printmach.cmi
+lib/ocaml/compiler-libs/proc.cmi
+lib/ocaml/compiler-libs/reg.cmi
+lib/ocaml/compiler-libs/reload.cmi
+lib/ocaml/compiler-libs/reloadgen.cmi
+lib/ocaml/compiler-libs/schedgen.cmi
+lib/ocaml/compiler-libs/scheduling.cmi
+lib/ocaml/compiler-libs/selectgen.cmi
+lib/ocaml/compiler-libs/selection.cmi
+lib/ocaml/compiler-libs/spill.cmi
+lib/ocaml/compiler-libs/split.cmi
 lib/ocaml/digest.cmx
 lib/ocaml/filename.cmx
 lib/ocaml/format.cmx