Sort PLIST files.

Unsorted entries in PLIST files have generated a pkglint warning for at
least 12 years. Somewhat more recently, pkglint has learned to sort
PLIST files automatically. Since pkglint 5.4.23, the sorting is only
done in obvious, simple cases. These have been applied by running:

  pkglint -Cnone,PLIST -Wnone,plist-sort -r -F

11 files changed, 137 insertions, 140 deletions

diff --git a/lang/camlp5/PLIST b/lang/camlp5/PLIST
index 1a59cafe719..d66d5aee23c 100644
--- a/lang/camlp5/PLIST
+++ b/lang/camlp5/PLIST
@@ -1,29 +1,43 @@
-@comment $NetBSD: PLIST,v 1.8 2015/12/29 06:20:30 dholland Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/01/01 22:29:39 rillig Exp $
 bin/camlp5
 bin/camlp5o
+${PLIST.ocaml-opt}bin/camlp5o.opt
 bin/camlp5r
+${PLIST.ocaml-opt}bin/camlp5r.opt
 bin/camlp5sch
 bin/mkcamlp5
+${PLIST.ocaml-opt}bin/mkcamlp5.opt
 bin/ocpp5
+${PLIST.ocaml-opt}lib/ocaml/camlp5/camlp5.a
 lib/ocaml/camlp5/camlp5.cma
+${PLIST.ocaml-opt}lib/ocaml/camlp5/camlp5.cmxa
 lib/ocaml/camlp5/camlp5_top.cma
 lib/ocaml/camlp5/camlp5o.cma
 lib/ocaml/camlp5/camlp5r.cma
 lib/ocaml/camlp5/camlp5sch.cma
 lib/ocaml/camlp5/diff.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/diff.cmx
 lib/ocaml/camlp5/diff.mli
 lib/ocaml/camlp5/eprinter.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/eprinter.cmx
 lib/ocaml/camlp5/eprinter.mli
 lib/ocaml/camlp5/extfold.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/extfold.cmx
 lib/ocaml/camlp5/extfold.mli
 lib/ocaml/camlp5/extfun.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/extfun.cmx
 lib/ocaml/camlp5/extfun.mli
 lib/ocaml/camlp5/fstream.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/fstream.cmx
 lib/ocaml/camlp5/fstream.mli
 lib/ocaml/camlp5/gramext.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/gramext.cmx
 lib/ocaml/camlp5/gramext.mli
+${PLIST.ocaml-opt}lib/ocaml/camlp5/gramlib.a
 lib/ocaml/camlp5/gramlib.cma
+${PLIST.ocaml-opt}lib/ocaml/camlp5/gramlib.cmxa
 lib/ocaml/camlp5/grammar.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/grammar.cmx
 lib/ocaml/camlp5/grammar.mli
 lib/ocaml/camlp5/lib.sml
 lib/ocaml/camlp5/mLast.cmi
@@ -32,110 +46,158 @@ lib/ocaml/camlp5/ocpp.cmo
 lib/ocaml/camlp5/odyl.a
 lib/ocaml/camlp5/odyl.cma
 lib/ocaml/camlp5/odyl.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.cmx
+${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.cmxa
 lib/ocaml/camlp5/odyl.o
 lib/ocaml/camlp5/pa_extend.cmi
 lib/ocaml/camlp5/pa_extend.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extend.cmx
 lib/ocaml/camlp5/pa_extend.o
 lib/ocaml/camlp5/pa_extend_m.cmo
 lib/ocaml/camlp5/pa_extend_m.cmx
 lib/ocaml/camlp5/pa_extend_m.o
 lib/ocaml/camlp5/pa_extfold.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfold.cmx
 lib/ocaml/camlp5/pa_extfold.o
 lib/ocaml/camlp5/pa_extfun.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfun.cmx
 lib/ocaml/camlp5/pa_extfun.o
 lib/ocaml/camlp5/pa_extprint.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extprint.cmx
 lib/ocaml/camlp5/pa_extprint.o
 lib/ocaml/camlp5/pa_fstream.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_fstream.cmx
 lib/ocaml/camlp5/pa_fstream.o
 lib/ocaml/camlp5/pa_lefteval.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lefteval.cmx
 lib/ocaml/camlp5/pa_lefteval.o
 lib/ocaml/camlp5/pa_lexer.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lexer.cmx
 lib/ocaml/camlp5/pa_lexer.o
 lib/ocaml/camlp5/pa_lisp.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lisp.cmx
 lib/ocaml/camlp5/pa_lisp.o
 lib/ocaml/camlp5/pa_macro.cmi
 lib/ocaml/camlp5/pa_macro.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro.cmx
 lib/ocaml/camlp5/pa_macro.o
 lib/ocaml/camlp5/pa_mkast.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mkast.cmx
 lib/ocaml/camlp5/pa_mkast.o
 lib/ocaml/camlp5/pa_mktest.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mktest.cmx
 lib/ocaml/camlp5/pa_mktest.o
 lib/ocaml/camlp5/pa_o.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o.cmx
 lib/ocaml/camlp5/pa_o.o
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o_fast.cmx
 lib/ocaml/camlp5/pa_o_fast.o
 lib/ocaml/camlp5/pa_oop.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_oop.cmx
 lib/ocaml/camlp5/pa_oop.o
 lib/ocaml/camlp5/pa_op.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_op.cmx
 lib/ocaml/camlp5/pa_op.o
 lib/ocaml/camlp5/pa_pprintf.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pprintf.cmx
 lib/ocaml/camlp5/pa_pprintf.o
 lib/ocaml/camlp5/pa_pragma.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pragma.cmx
 lib/ocaml/camlp5/pa_pragma.o
 lib/ocaml/camlp5/pa_r.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_r.cmx
 lib/ocaml/camlp5/pa_r.o
 lib/ocaml/camlp5/pa_reloc.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_reloc.cmx
 lib/ocaml/camlp5/pa_reloc.o
 lib/ocaml/camlp5/pa_rp.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_rp.cmx
 lib/ocaml/camlp5/pa_rp.o
 lib/ocaml/camlp5/pa_scheme.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_scheme.cmx
 lib/ocaml/camlp5/pa_scheme.o
 lib/ocaml/camlp5/pa_sml.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_sml.cmx
 lib/ocaml/camlp5/pa_sml.o
 lib/ocaml/camlp5/pcaml.cmi
 lib/ocaml/camlp5/pcaml.mli
 lib/ocaml/camlp5/plexer.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/plexer.cmx
 lib/ocaml/camlp5/plexer.mli
 lib/ocaml/camlp5/plexing.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/plexing.cmx
 lib/ocaml/camlp5/plexing.mli
 lib/ocaml/camlp5/ploc.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/ploc.cmx
 lib/ocaml/camlp5/ploc.mli
 lib/ocaml/camlp5/pprintf.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pprintf.cmx
 lib/ocaml/camlp5/pprintf.mli
 lib/ocaml/camlp5/pr_depend.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_depend.cmx
 lib/ocaml/camlp5/pr_depend.o
 lib/ocaml/camlp5/pr_dump.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_dump.cmx
 lib/ocaml/camlp5/pr_dump.o
 lib/ocaml/camlp5/pr_extend.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extend.cmx
 lib/ocaml/camlp5/pr_extend.o
 lib/ocaml/camlp5/pr_extfun.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extfun.cmx
 lib/ocaml/camlp5/pr_extfun.o
 lib/ocaml/camlp5/pr_extprint.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extprint.cmx
 lib/ocaml/camlp5/pr_extprint.o
 lib/ocaml/camlp5/pr_null.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_null.cmx
 lib/ocaml/camlp5/pr_null.o
 lib/ocaml/camlp5/pr_o.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_o.cmx
 lib/ocaml/camlp5/pr_o.o
 lib/ocaml/camlp5/pr_op.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_op.cmx
 lib/ocaml/camlp5/pr_op.o
 lib/ocaml/camlp5/pr_r.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_r.cmx
 lib/ocaml/camlp5/pr_r.o
 lib/ocaml/camlp5/pr_ro.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_ro.cmx
 lib/ocaml/camlp5/pr_ro.o
 lib/ocaml/camlp5/pr_rp.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_rp.cmx
 lib/ocaml/camlp5/pr_rp.o
 lib/ocaml/camlp5/pr_scheme.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_scheme.cmx
 lib/ocaml/camlp5/pr_scheme.o
 lib/ocaml/camlp5/pr_schemep.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_schemep.cmx
 lib/ocaml/camlp5/pr_schemep.o
 lib/ocaml/camlp5/pretty.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/pretty.cmx
 lib/ocaml/camlp5/pretty.mli
 lib/ocaml/camlp5/prtools.cmi
 lib/ocaml/camlp5/prtools.mli
 lib/ocaml/camlp5/q_MLast.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/q_MLast.cmx
 lib/ocaml/camlp5/q_MLast.o
 lib/ocaml/camlp5/q_ast.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/q_ast.cmx
 lib/ocaml/camlp5/q_ast.o
 lib/ocaml/camlp5/q_phony.cmo
+${PLIST.ocaml-opt}lib/ocaml/camlp5/q_phony.cmx
 lib/ocaml/camlp5/q_phony.o
 lib/ocaml/camlp5/quotation.cmi
 lib/ocaml/camlp5/quotation.mli
 lib/ocaml/camlp5/reloc.cmi
 lib/ocaml/camlp5/reloc.mli
 lib/ocaml/camlp5/stdpp.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/stdpp.cmx
 lib/ocaml/camlp5/stdpp.mli
 lib/ocaml/camlp5/token.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/token.cmx
 lib/ocaml/camlp5/token.mli
 lib/ocaml/camlp5/versdep.cmi
+${PLIST.ocaml-opt}lib/ocaml/camlp5/versdep.cmx
 lib/ocaml/site-lib/camlp5/META
 man/man1/camlp5.1
 man/man1/camlp5o.1
@@ -146,65 +208,3 @@ man/man1/camlp5sch.1
 man/man1/mkcamlp5.1
 man/man1/mkcamlp5.opt.1
 man/man1/ocpp5.1
-${PLIST.ocaml-opt}bin/camlp5o.opt
-${PLIST.ocaml-opt}bin/camlp5r.opt
-${PLIST.ocaml-opt}bin/mkcamlp5.opt
-${PLIST.ocaml-opt}lib/ocaml/camlp5/camlp5.a
-${PLIST.ocaml-opt}lib/ocaml/camlp5/camlp5.cmxa
-${PLIST.ocaml-opt}lib/ocaml/camlp5/diff.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/eprinter.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/extfold.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/extfun.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/fstream.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/gramext.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/gramlib.a
-${PLIST.ocaml-opt}lib/ocaml/camlp5/gramlib.cmxa
-${PLIST.ocaml-opt}lib/ocaml/camlp5/grammar.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/odyl.cmxa
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extend.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfold.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extfun.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_extprint.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_fstream.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lefteval.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lexer.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_lisp.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_macro.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mkast.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_mktest.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_reloc.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_o_fast.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_oop.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_op.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pprintf.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_pragma.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_r.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_rp.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_scheme.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pa_sml.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/plexer.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/plexing.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/ploc.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pprintf.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_depend.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_dump.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extend.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extfun.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_extprint.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_null.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_o.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_op.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_r.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_ro.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_rp.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_scheme.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pr_schemep.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/pretty.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/q_MLast.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/q_ast.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/q_phony.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/stdpp.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/token.cmx
-${PLIST.ocaml-opt}lib/ocaml/camlp5/versdep.cmx
diff --git a/lang/coq/PLIST b/lang/coq/PLIST
index 5c781039226..b351d895549 100644
--- a/lang/coq/PLIST
+++ b/lang/coq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2017/11/03 11:20:28 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.23 2018/01/01 22:29:39 rillig Exp $
 bin/coq-tex
 bin/coq_makefile
 bin/coqc
@@ -27,7 +27,6 @@ lib/coq/engine/proofview_monad.cmi
 lib/coq/engine/termops.cmi
 lib/coq/engine/uState.cmi
 lib/coq/engine/universes.cmi
-lib/coq/config/coq_config.cmi
 lib/coq/grammar/grammar.cma
 lib/coq/grammar/q_util.cmi
 ${PLIST.coqide}lib/coq/ide/config_lexer.cmi
@@ -442,14 +441,14 @@ lib/coq/plugins/fourier/Fourier_util.v
 lib/coq/plugins/fourier/Fourier_util.vo
 lib/coq/plugins/fourier/fourier_plugin.cmi
 ${PLIST.natdynlink}lib/coq/plugins/fourier/fourier_plugin.cmxs
-${PLIST.native}lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmi
-${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmx
-${PLIST.native}${PLIST.natdynlink}lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmxs
-${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.o
 ${PLIST.native}lib/coq/plugins/funind/.coq-native/NCoq_funind_FunInd.cmi
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/funind/.coq-native/NCoq_funind_FunInd.cmx
 ${PLIST.native}${PLIST.natdynlink}lib/coq/plugins/funind/.coq-native/NCoq_funind_FunInd.cmxs
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/funind/.coq-native/NCoq_funind_FunInd.o
+${PLIST.native}lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmi
+${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmx
+${PLIST.native}${PLIST.natdynlink}lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.cmxs
+${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/funind/.coq-native/NCoq_funind_Recdef.o
 lib/coq/plugins/funind/FunInd.glob
 lib/coq/plugins/funind/FunInd.v
 lib/coq/plugins/funind/FunInd.vo
@@ -465,12 +464,6 @@ lib/coq/plugins/funind/indfun_common.cmi
 lib/coq/plugins/funind/recdef.cmi
 lib/coq/plugins/funind/recdef_plugin.cmi
 ${PLIST.natdynlink}lib/coq/plugins/funind/recdef_plugin.cmxs
-${PLIST.native}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmi
-${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmx
-${PLIST.native}${PLIST.natdynlink}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmxs
-${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.o
-lib/coq/plugins/ltac/ltac_plugin.cmi
-${PLIST.natdynlink}lib/coq/plugins/ltac/ltac_plugin.cmxs
 ${PLIST.native}lib/coq/plugins/ltac/.coq-native/NCoq_ltac_Ltac.cmi
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/ltac/.coq-native/NCoq_ltac_Ltac.cmx
 ${PLIST.native}${PLIST.natdynlink}lib/coq/plugins/ltac/.coq-native/NCoq_ltac_Ltac.cmxs
@@ -481,6 +474,8 @@ lib/coq/plugins/ltac/Ltac.vo
 lib/coq/plugins/ltac/evar_tactics.cmi
 lib/coq/plugins/ltac/extraargs.cmi
 lib/coq/plugins/ltac/extratactics.cmi
+lib/coq/plugins/ltac/ltac_plugin.cmi
+${PLIST.natdynlink}lib/coq/plugins/ltac/ltac_plugin.cmxs
 lib/coq/plugins/ltac/pltac.cmi
 lib/coq/plugins/ltac/pptactic.cmi
 lib/coq/plugins/ltac/profile_ltac.cmi
@@ -499,6 +494,10 @@ lib/coq/plugins/ltac/tactic_option.cmi
 lib/coq/plugins/ltac/tauto.cmi
 lib/coq/plugins/ltac/tauto_plugin.cmi
 ${PLIST.natdynlink}lib/coq/plugins/ltac/tauto_plugin.cmxs
+${PLIST.native}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmi
+${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmx
+${PLIST.native}${PLIST.natdynlink}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.cmxs
+${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_Env.o
 ${PLIST.native}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_EnvRing.cmi
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_EnvRing.cmx
 ${PLIST.native}${PLIST.natdynlink}lib/coq/plugins/micromega/.coq-native/NCoq_micromega_EnvRing.cmxs
@@ -998,11 +997,11 @@ lib/coq/proofs/tacmach.cmi
 lib/coq/stm/asyncTaskQueue.cmi
 lib/coq/stm/coqworkmgrApi.cmi
 lib/coq/stm/dag.cmi
+lib/coq/stm/proofBlockDelimiter.cmi
 lib/coq/stm/spawned.cmi
 ${PLIST.ocaml-opt}lib/coq/stm/stm.a
 lib/coq/stm/stm.cmi
 ${PLIST.ocaml-opt}lib/coq/stm/stm.cmxa
-lib/coq/stm/proofBlockDelimiter.cmi
 lib/coq/stm/tQueue.cmi
 lib/coq/stm/vcs.cmi
 lib/coq/stm/vernac_classifier.cmi
@@ -1340,7 +1339,6 @@ lib/coq/theories/Classes/SetoidDec.vo
 lib/coq/theories/Classes/SetoidTactics.glob
 lib/coq/theories/Classes/SetoidTactics.v
 lib/coq/theories/Classes/SetoidTactics.vo
-${PLIST.native}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.cmi
 ${PLIST.native}lib/coq/theories/Compat/.coq-native/NCoq_Compat_AdmitAxiom.cmi
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/theories/Compat/.coq-native/NCoq_Compat_AdmitAxiom.cmx
 ${PLIST.native}${PLIST.natdynlink}lib/coq/theories/Compat/.coq-native/NCoq_Compat_AdmitAxiom.cmxs
@@ -1349,13 +1347,12 @@ ${PLIST.native}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.cmi
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.cmx
 ${PLIST.native}${PLIST.natdynlink}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.cmxs
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq85.o
+${PLIST.native}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.cmi
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.cmx
 ${PLIST.native}${PLIST.natdynlink}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.cmxs
 ${PLIST.native}${PLIST.ocaml-opt}lib/coq/theories/Compat/.coq-native/NCoq_Compat_Coq86.o
 lib/coq/theories/Compat/AdmitAxiom.glob
 lib/coq/theories/Compat/AdmitAxiom.v
-lib/coq/theories/Compat/AdmitAxiom.glob
-lib/coq/theories/Compat/AdmitAxiom.v
 lib/coq/theories/Compat/AdmitAxiom.vo
 lib/coq/theories/Compat/Coq85.glob
 lib/coq/theories/Compat/Coq85.v
@@ -2212,12 +2209,12 @@ lib/coq/theories/Numbers/Integer/Abstract/ZDivTrunc.vo
 lib/coq/theories/Numbers/Integer/Abstract/ZGcd.glob
 lib/coq/theories/Numbers/Integer/Abstract/ZGcd.v
 lib/coq/theories/Numbers/Integer/Abstract/ZGcd.vo
-lib/coq/theories/Numbers/Integer/Abstract/ZLt.glob
-lib/coq/theories/Numbers/Integer/Abstract/ZLt.v
-lib/coq/theories/Numbers/Integer/Abstract/ZLt.vo
 lib/coq/theories/Numbers/Integer/Abstract/ZLcm.glob
 lib/coq/theories/Numbers/Integer/Abstract/ZLcm.v
 lib/coq/theories/Numbers/Integer/Abstract/ZLcm.vo
+lib/coq/theories/Numbers/Integer/Abstract/ZLt.glob
+lib/coq/theories/Numbers/Integer/Abstract/ZLt.v
+lib/coq/theories/Numbers/Integer/Abstract/ZLt.vo
 lib/coq/theories/Numbers/Integer/Abstract/ZMaxMin.glob
 lib/coq/theories/Numbers/Integer/Abstract/ZMaxMin.v
 lib/coq/theories/Numbers/Integer/Abstract/ZMaxMin.vo
@@ -2992,12 +2989,12 @@ lib/coq/theories/Reals/Exp_prop.vo
 lib/coq/theories/Reals/Integration.glob
 lib/coq/theories/Reals/Integration.v
 lib/coq/theories/Reals/Integration.vo
-lib/coq/theories/Reals/Machin.glob
-lib/coq/theories/Reals/Machin.v
-lib/coq/theories/Reals/Machin.vo
 lib/coq/theories/Reals/MVT.glob
 lib/coq/theories/Reals/MVT.v
 lib/coq/theories/Reals/MVT.vo
+lib/coq/theories/Reals/Machin.glob
+lib/coq/theories/Reals/Machin.v
+lib/coq/theories/Reals/Machin.vo
 lib/coq/theories/Reals/NewtonInt.glob
 lib/coq/theories/Reals/NewtonInt.v
 lib/coq/theories/Reals/NewtonInt.vo
@@ -3855,6 +3852,10 @@ ${PLIST.ocaml-opt}lib/coq/toplevel/toplevel.a
 ${PLIST.ocaml-opt}lib/coq/toplevel/toplevel.cmxa
 lib/coq/toplevel/usage.cmi
 lib/coq/toplevel/vernac.cmi
+${PLIST.natdynlink}${PLIST.coqide}lib/coq/toploop/coqidetop.cmxs
+${PLIST.natdynlink}lib/coq/toploop/proofworkertop.cmxs
+${PLIST.natdynlink}lib/coq/toploop/queryworkertop.cmxs
+${PLIST.natdynlink}lib/coq/toploop/tacworkertop.cmxs
 lib/coq/vernac/assumptions.cmi
 lib/coq/vernac/auto_ind_decl.cmi
 lib/coq/vernac/class.cmi
@@ -3878,10 +3879,6 @@ ${PLIST.ocaml-opt}lib/coq/vernac/vernac.cmxa
 lib/coq/vernac/vernacentries.cmi
 lib/coq/vernac/vernacinterp.cmi
 lib/coq/vernac/vernacprop.cmi
-${PLIST.natdynlink}${PLIST.coqide}lib/coq/toploop/coqidetop.cmxs
-${PLIST.natdynlink}lib/coq/toploop/proofworkertop.cmxs
-${PLIST.natdynlink}lib/coq/toploop/queryworkertop.cmxs
-${PLIST.natdynlink}lib/coq/toploop/tacworkertop.cmxs
 man/man1/coq-tex.1
 man/man1/coq_makefile.1
 man/man1/coqc.1
diff --git a/lang/ecl/PLIST.threads b/lang/ecl/PLIST.threads
index 48b3cd25189..53f1e04b0e8 100644
--- a/lang/ecl/PLIST.threads
+++ b/lang/ecl/PLIST.threads
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.threads,v 1.2 2012/12/08 13:29:45 asau Exp $
+@comment $NetBSD: PLIST.threads,v 1.3 2018/01/01 22:29:39 rillig Exp $
 include/ecl/atomic_ops.h
 include/ecl/atomic_ops/generalize-small.h
 include/ecl/atomic_ops/generalize.h
@@ -8,18 +8,22 @@ include/ecl/atomic_ops/sysdeps/all_acquire_release_volatile.h
 include/ecl/atomic_ops/sysdeps/all_aligned_atomic_load_store.h
 include/ecl/atomic_ops/sysdeps/all_atomic_load_store.h
 include/ecl/atomic_ops/sysdeps/ao_t_is_int.h
+include/ecl/atomic_ops/sysdeps/armcc/arm_v6.h
 include/ecl/atomic_ops/sysdeps/atomic_load_store.h
 include/ecl/atomic_ops/sysdeps/char_acquire_release_volatile.h
 include/ecl/atomic_ops/sysdeps/char_atomic_load_store.h
 include/ecl/atomic_ops/sysdeps/emul_cas.h
 include/ecl/atomic_ops/sysdeps/gcc/alpha.h
 include/ecl/atomic_ops/sysdeps/gcc/arm.h
+include/ecl/atomic_ops/sysdeps/gcc/avr32.h
 include/ecl/atomic_ops/sysdeps/gcc/cris.h
 include/ecl/atomic_ops/sysdeps/gcc/hppa.h
 include/ecl/atomic_ops/sysdeps/gcc/ia64.h
 include/ecl/atomic_ops/sysdeps/gcc/m68k.h
+include/ecl/atomic_ops/sysdeps/gcc/mips.h
 include/ecl/atomic_ops/sysdeps/gcc/powerpc.h
 include/ecl/atomic_ops/sysdeps/gcc/s390.h
+include/ecl/atomic_ops/sysdeps/gcc/sh.h
 include/ecl/atomic_ops/sysdeps/gcc/sparc.h
 include/ecl/atomic_ops/sysdeps/gcc/x86.h
 include/ecl/atomic_ops/sysdeps/gcc/x86_64.h
@@ -31,6 +35,8 @@ include/ecl/atomic_ops/sysdeps/icc/ia64.h
 include/ecl/atomic_ops/sysdeps/int_acquire_release_volatile.h
 include/ecl/atomic_ops/sysdeps/int_aligned_atomic_load_store.h
 include/ecl/atomic_ops/sysdeps/int_atomic_load_store.h
+include/ecl/atomic_ops/sysdeps/msftc/arm.h
+include/ecl/atomic_ops/sysdeps/msftc/common32_defs.h
 include/ecl/atomic_ops/sysdeps/msftc/x86.h
 include/ecl/atomic_ops/sysdeps/msftc/x86_64.h
 include/ecl/atomic_ops/sysdeps/ordered.h
@@ -41,13 +47,7 @@ include/ecl/atomic_ops/sysdeps/short_aligned_atomic_load_store.h
 include/ecl/atomic_ops/sysdeps/short_atomic_load_store.h
 include/ecl/atomic_ops/sysdeps/standard_ao_double_t.h
 include/ecl/atomic_ops/sysdeps/sunc/sparc.h
-include/ecl/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h
-include/ecl/atomic_ops/sysdeps/test_and_set_t_is_char.h
-include/ecl/atomic_ops/sysdeps/armcc/arm_v6.h
-include/ecl/atomic_ops/sysdeps/gcc/avr32.h
-include/ecl/atomic_ops/sysdeps/gcc/mips.h
-include/ecl/atomic_ops/sysdeps/gcc/sh.h
-include/ecl/atomic_ops/sysdeps/msftc/arm.h
-include/ecl/atomic_ops/sysdeps/msftc/common32_defs.h
 include/ecl/atomic_ops/sysdeps/sunc/x86.h
 include/ecl/atomic_ops/sysdeps/sunc/x86_64.h
+include/ecl/atomic_ops/sysdeps/test_and_set_t_is_ao_t.h
+include/ecl/atomic_ops/sysdeps/test_and_set_t_is_char.h
diff --git a/lang/elk/PLIST b/lang/elk/PLIST
index 5f96a0dff55..3c82b708224 100644
--- a/lang/elk/PLIST
+++ b/lang/elk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/04/13 05:43:26 dholland Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/01/01 22:29:39 rillig Exp $
 bin/elk
 bin/scheme-elk
 include/elk/compat.h
@@ -24,17 +24,17 @@ lib/elk/debug.la
 lib/elk/elk-eval.la
 lib/elk/gdbm.la
 lib/elk/hack.la
+${PLIST.motif}lib/elk/motif.la
 lib/elk/newhandler.la
 lib/elk/record.la
 lib/elk/regexp.la
 lib/elk/struct.la
 lib/elk/unix.la
-${PLIST.motif}lib/elk/motif.la
 ${PLIST.xaw}lib/elk/xaw.la
 ${PLIST.x11}lib/elk/xlib.la
-lib/libelk.la
 ${PLIST.x11}lib/libelk-xlib.la
 ${PLIST.x11}lib/libelk-xt.la
+lib/libelk.la
 man/man1/elk.1
 man/man1/scheme-elk.1
 share/doc/elk/examples/c++/class.cpp
@@ -125,6 +125,7 @@ share/elk/debug.scm
 share/elk/describe.scm
 share/elk/gdbmtest.scm
 share/elk/initscheme.scm
+${PLIST.motif}share/elk/motif.scm
 share/elk/oops.scm
 share/elk/parse.scm
 share/elk/pp.scm
@@ -142,4 +143,3 @@ share/elk/unix.scm
 ${PLIST.xaw}share/elk/xaw.scm
 ${PLIST.x11}share/elk/xlib.scm
 ${PLIST.x11}share/elk/xwidgets.scm
-${PLIST.motif}share/elk/motif.scm
diff --git a/lang/joos/PLIST b/lang/joos/PLIST
index 7afe1430426..648bf3958aa 100644
--- a/lang/joos/PLIST
+++ b/lang/joos/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:35 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/01 22:29:39 rillig Exp $
 joos/A+/Makefile
 joos/A+/code.c
 joos/A+/code.h
@@ -61,9 +61,9 @@ joos/Bin/jjava
 joos/Bin/jjavac
 joos/Bin/jjavap
 joos/Bin/jjoosc
+joos/Bin/joos
 joos/Bin/joos.a+
 joos/Bin/joos.a-
-joos/Bin/joos
 joos/Bin/joosc
 joos/D-Java/Makefile
 joos/D-Java/clconst.h
diff --git a/lang/oracle-jre8/PLIST.linux-i386 b/lang/oracle-jre8/PLIST.linux-i386
index e7da5e2a5ef..4b2bd43270f 100644
--- a/lang/oracle-jre8/PLIST.linux-i386
+++ b/lang/oracle-jre8/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.7 2017/11/28 05:15:27 ryoon Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.8 2018/01/01 22:29:39 rillig Exp $
 bin/oracle8-java
 bin/oracle8-javaws
 bin/oracle8-keytool
@@ -30,15 +30,6 @@ java/oracle-8/bin/rmiregistry
 java/oracle-8/bin/servertool
 java/oracle-8/bin/tnameserv
 java/oracle-8/bin/unpack200
-${PLIST.native}java/oracle-8/lib/i386/jli/libX11.so.6
-${PLIST.native}java/oracle-8/lib/i386/libasound.so.2
-${PLIST.native}java/oracle-8/lib/i386/libodbcinst.so
-${PLIST.native}java/oracle-8/lib/i386/libodbc.so
-${PLIST.native}java/oracle-8/lib/i386/libX11.so.6
-${PLIST.native}java/oracle-8/lib/i386/libXext.so.6
-${PLIST.native}java/oracle-8/lib/i386/libXi.so.6
-${PLIST.native}java/oracle-8/lib/i386/libXt.so.6
-${PLIST.native}java/oracle-8/lib/i386/libXtst.so.6
 java/oracle-8/lib/calendars.properties.default
 java/oracle-8/lib/charsets.jar
 java/oracle-8/lib/classlist
@@ -162,8 +153,15 @@ java/oracle-8/lib/hijrah-config-umalqura.properties.default
 java/oracle-8/lib/i386/client/Xusage.txt
 java/oracle-8/lib/i386/client/libjsig.so
 java/oracle-8/lib/i386/client/libjvm.so
+${PLIST.native}java/oracle-8/lib/i386/jli/libX11.so.6
 java/oracle-8/lib/i386/jli/libjli.so
 java/oracle-8/lib/i386/jvm.cfg.default
+${PLIST.native}java/oracle-8/lib/i386/libX11.so.6
+${PLIST.native}java/oracle-8/lib/i386/libXext.so.6
+${PLIST.native}java/oracle-8/lib/i386/libXi.so.6
+${PLIST.native}java/oracle-8/lib/i386/libXt.so.6
+${PLIST.native}java/oracle-8/lib/i386/libXtst.so.6
+${PLIST.native}java/oracle-8/lib/i386/libasound.so.2
 java/oracle-8/lib/i386/libavplugin-53.so
 java/oracle-8/lib/i386/libavplugin-54.so
 java/oracle-8/lib/i386/libavplugin-55.so
@@ -212,6 +210,8 @@ java/oracle-8/lib/i386/libnet.so
 java/oracle-8/lib/i386/libnio.so
 java/oracle-8/lib/i386/libnpjp2.so
 java/oracle-8/lib/i386/libnpt.so
+${PLIST.native}java/oracle-8/lib/i386/libodbc.so
+${PLIST.native}java/oracle-8/lib/i386/libodbcinst.so
 java/oracle-8/lib/i386/libprism_common.so
 java/oracle-8/lib/i386/libprism_es2.so
 java/oracle-8/lib/i386/libprism_sw.so
@@ -289,10 +289,10 @@ java/oracle-8/lib/security/java.policy
 java/oracle-8/lib/security/java.security.default
 java/oracle-8/lib/security/javaws.policy
 ${PLIST.jce}java/oracle-8/lib/security/local_policy.jar
-java/oracle-8/lib/security/policy/limited/local_policy.jar
 java/oracle-8/lib/security/policy/limited/US_export_policy.jar
-java/oracle-8/lib/security/policy/unlimited/local_policy.jar
+java/oracle-8/lib/security/policy/limited/local_policy.jar
 java/oracle-8/lib/security/policy/unlimited/US_export_policy.jar
+java/oracle-8/lib/security/policy/unlimited/local_policy.jar
 java/oracle-8/lib/security/trusted.libraries
 java/oracle-8/lib/sound.properties.default
 java/oracle-8/lib/tzdb.dat
diff --git a/lang/oracle-jre8/PLIST.linux-x86_64 b/lang/oracle-jre8/PLIST.linux-x86_64
index 88fbbf986e2..50daf043f41 100644
--- a/lang/oracle-jre8/PLIST.linux-x86_64
+++ b/lang/oracle-jre8/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.7 2017/11/28 05:15:27 ryoon Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.8 2018/01/01 22:29:39 rillig Exp $
 bin/oracle8-java
 bin/oracle8-javaws
 bin/oracle8-keytool
@@ -132,10 +132,10 @@ java/oracle-8/lib/deploy/messages_zh_CN.properties.default
 java/oracle-8/lib/deploy/messages_zh_HK.properties.default
 java/oracle-8/lib/deploy/messages_zh_TW.properties.default
 java/oracle-8/lib/deploy/mixcode_s.png
-java/oracle-8/lib/deploy/splash_11-lic.gif
-java/oracle-8/lib/deploy/splash_11@2x-lic.gif
 java/oracle-8/lib/deploy/splash.gif
 java/oracle-8/lib/deploy/splash@2x.gif
+java/oracle-8/lib/deploy/splash_11-lic.gif
+java/oracle-8/lib/deploy/splash_11@2x-lic.gif
 java/oracle-8/lib/desktop/applications/sun-java.desktop
 java/oracle-8/lib/desktop/applications/sun-javaws.desktop
 java/oracle-8/lib/desktop/applications/sun_java.desktop
@@ -286,10 +286,10 @@ java/oracle-8/lib/security/java.policy
 java/oracle-8/lib/security/java.security.default
 java/oracle-8/lib/security/javaws.policy
 ${PLIST.jce}java/oracle-8/lib/security/local_policy.jar
-java/oracle-8/lib/security/policy/limited/local_policy.jar
 java/oracle-8/lib/security/policy/limited/US_export_policy.jar
-java/oracle-8/lib/security/policy/unlimited/local_policy.jar
+java/oracle-8/lib/security/policy/limited/local_policy.jar
 java/oracle-8/lib/security/policy/unlimited/US_export_policy.jar
+java/oracle-8/lib/security/policy/unlimited/local_policy.jar
 java/oracle-8/lib/security/trusted.libraries
 java/oracle-8/lib/sound.properties.default
 java/oracle-8/lib/tzdb.dat
diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386
index cb1dd2a6651..5c722a4ec9e 100644
--- a/lang/sun-jre6/PLIST.linux-i386
+++ b/lang/sun-jre6/PLIST.linux-i386
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-i386,v 1.25 2012/06/14 01:05:37 obache Exp $
+@comment $NetBSD: PLIST.linux-i386,v 1.26 2018/01/01 22:29:39 rillig Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -152,18 +152,16 @@ java/sun-6/lib/i386/client/Xusage.txt
 java/sun-6/lib/i386/client/libjsig.so
 java/sun-6/lib/i386/client/libjvm.so
 java/sun-6/lib/i386/headless/libmawt.so
+${PLIST.native}java/sun-6/lib/i386/jli/libX11.so.6
 java/sun-6/lib/i386/jli/libjli.so
 java/sun-6/lib/i386/jvm.cfg.default
 java/sun-6/lib/i386/libJdbcOdbc.so
 ${PLIST.native}java/sun-6/lib/i386/libX11.so.6
-${PLIST.native}java/sun-6/lib/i386/jli/libX11.so.6
 ${PLIST.native}java/sun-6/lib/i386/libXext.so.6
 ${PLIST.native}java/sun-6/lib/i386/libXi.so.6
 ${PLIST.native}java/sun-6/lib/i386/libXt.so.6
 ${PLIST.native}java/sun-6/lib/i386/libXtst.so.6
 ${PLIST.native}java/sun-6/lib/i386/libasound.so.2
-${PLIST.native}java/sun-6/lib/i386/libodbc.so
-${PLIST.native}java/sun-6/lib/i386/libodbcinst.so
 java/sun-6/lib/i386/libawt.so
 java/sun-6/lib/i386/libcmm.so
 java/sun-6/lib/i386/libdcpr.so
@@ -196,6 +194,8 @@ java/sun-6/lib/i386/libnet.so
 java/sun-6/lib/i386/libnio.so
 java/sun-6/lib/i386/libnpjp2.so
 java/sun-6/lib/i386/libnpt.so
+${PLIST.native}java/sun-6/lib/i386/libodbc.so
+${PLIST.native}java/sun-6/lib/i386/libodbcinst.so
 java/sun-6/lib/i386/librmi.so
 java/sun-6/lib/i386/libsplashscreen.so
 java/sun-6/lib/i386/libunpack.so
diff --git a/lang/sun-jre6/PLIST.linux-x86_64 b/lang/sun-jre6/PLIST.linux-x86_64
index 9ad8c8ea028..c4c49d89e50 100644
--- a/lang/sun-jre6/PLIST.linux-x86_64
+++ b/lang/sun-jre6/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.10 2012/12/30 03:05:13 sbd Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.11 2018/01/01 22:29:39 rillig Exp $
 bin/sun6-java
 bin/sun6-javaws
 bin/sun6-keytool
@@ -33,9 +33,16 @@ java/sun-6/javaws/javaws
 java/sun-6/lib/alt-rt.jar
 java/sun-6/lib/alt-string.jar
 java/sun-6/lib/amd64/headless/libmawt.so
+${PLIST.native}java/sun-6/lib/amd64/jli/libX11.so.6
 java/sun-6/lib/amd64/jli/libjli.so
 java/sun-6/lib/amd64/jvm.cfg.default
 java/sun-6/lib/amd64/libJdbcOdbc.so
+${PLIST.native}java/sun-6/lib/amd64/libX11.so.6
+${PLIST.native}java/sun-6/lib/amd64/libXext.so.6
+${PLIST.native}java/sun-6/lib/amd64/libXi.so.6
+${PLIST.native}java/sun-6/lib/amd64/libXt.so.6
+${PLIST.native}java/sun-6/lib/amd64/libXtst.so.6
+${PLIST.native}java/sun-6/lib/amd64/libasound.so.2
 java/sun-6/lib/amd64/libawt.so
 java/sun-6/lib/amd64/libcmm.so
 java/sun-6/lib/amd64/libdcpr.so
@@ -66,6 +73,8 @@ java/sun-6/lib/amd64/libnet.so
 java/sun-6/lib/amd64/libnio.so
 java/sun-6/lib/amd64/libnpjp2.so
 java/sun-6/lib/amd64/libnpt.so
+${PLIST.native}java/sun-6/lib/amd64/libodbc.so
+${PLIST.native}java/sun-6/lib/amd64/libodbcinst.so
 java/sun-6/lib/amd64/librmi.so
 java/sun-6/lib/amd64/libsplashscreen.so
 java/sun-6/lib/amd64/libunpack.so
@@ -255,15 +264,6 @@ java/sun-6/lib/security/local_policy.jar
 java/sun-6/lib/security/trusted.libraries
 java/sun-6/lib/servicetag/jdk_header.png
 java/sun-6/lib/sound.properties.default
-${PLIST.native}java/sun-6/lib/amd64/libX11.so.6
-${PLIST.native}java/sun-6/lib/amd64/jli/libX11.so.6
-${PLIST.native}java/sun-6/lib/amd64/libXext.so.6
-${PLIST.native}java/sun-6/lib/amd64/libXi.so.6
-${PLIST.native}java/sun-6/lib/amd64/libXt.so.6
-${PLIST.native}java/sun-6/lib/amd64/libXtst.so.6
-${PLIST.native}java/sun-6/lib/amd64/libasound.so.2
-${PLIST.native}java/sun-6/lib/amd64/libodbc.so
-${PLIST.native}java/sun-6/lib/amd64/libodbcinst.so
 java/sun-6/lib/zi/Africa/Abidjan
 java/sun-6/lib/zi/Africa/Accra
 java/sun-6/lib/zi/Africa/Addis_Ababa
diff --git a/lang/sun-jre7/PLIST.linux-x86_64 b/lang/sun-jre7/PLIST.linux-x86_64
index af121c94d20..f7c0e3d7682 100644
--- a/lang/sun-jre7/PLIST.linux-x86_64
+++ b/lang/sun-jre7/PLIST.linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.linux-x86_64,v 1.9 2016/05/08 17:23:29 christos Exp $
+@comment $NetBSD: PLIST.linux-x86_64,v 1.10 2018/01/01 22:29:39 rillig Exp $
 bin/sun7-java
 bin/sun7-javaws
 bin/sun7-keytool
@@ -45,8 +45,6 @@ ${PLIST.native}java/sun-7/lib/amd64/libXi.so.6
 ${PLIST.native}java/sun-7/lib/amd64/libXt.so.6
 ${PLIST.native}java/sun-7/lib/amd64/libXtst.so.6
 ${PLIST.native}java/sun-7/lib/amd64/libasound.so.2
-${PLIST.native}java/sun-7/lib/amd64/libodbc.so
-${PLIST.native}java/sun-7/lib/amd64/libodbcinst.so
 java/sun-7/lib/amd64/libawt.so
 java/sun-7/lib/amd64/libdcpr.so
 java/sun-7/lib/amd64/libdeploy.so
@@ -83,6 +81,8 @@ java/sun-7/lib/amd64/libnet.so
 java/sun-7/lib/amd64/libnio.so
 java/sun-7/lib/amd64/libnpjp2.so
 java/sun-7/lib/amd64/libnpt.so
+${PLIST.native}java/sun-7/lib/amd64/libodbc.so
+${PLIST.native}java/sun-7/lib/amd64/libodbcinst.so
 java/sun-7/lib/amd64/libprism-es2.so
 java/sun-7/lib/amd64/libsctp.so
 java/sun-7/lib/amd64/libsplashscreen.so
diff --git a/lang/tcl-otcl/PLIST b/lang/tcl-otcl/PLIST
index dac18306dee..94aa8ade7e3 100644
--- a/lang/tcl-otcl/PLIST
+++ b/lang/tcl-otcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 20:34:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/01/01 22:29:40 rillig Exp $
 bin/otclsh
 bin/owish
 include/otcl.h
@@ -8,5 +8,5 @@ share/doc/tcl/otcl/autoload.html
 share/doc/tcl/otcl/capi.html
 share/doc/tcl/otcl/class.html
 share/doc/tcl/otcl/object.html
-share/doc/tcl/otcl/tutorial.html
 share/doc/tcl/otcl/otcl-paper.ps.gz
+share/doc/tcl/otcl/tutorial.html