TeX Live 2024 pretest binaries rebuild for NetBSD/amd64 and NetBSD/i386, both built on version 9.3

git-svn-id: svn://tug.org/texlive/trunk@70286 c570f23f-e606-0410-a88d-b1316a301751

184 files changed, 246 insertions, 20 deletions

diff --git a/Master/bin/amd64-netbsd/afm2pl b/Master/bin/amd64-netbsd/afm2pl
index c9be03367ba..817141f3f7b 100755
--- a/Master/bin/amd64-netbsd/afm2pl
+++ b/Master/bin/amd64-netbsd/afm2pl
diff --git a/Master/bin/amd64-netbsd/afm2tfm b/Master/bin/amd64-netbsd/afm2tfm
index 0cf3a2b63dd..0bca72db215 100755
--- a/Master/bin/amd64-netbsd/afm2tfm
+++ b/Master/bin/amd64-netbsd/afm2tfm
diff --git a/Master/bin/amd64-netbsd/aleph b/Master/bin/amd64-netbsd/aleph
index c7cb6accb94..fcd8b76e5ce 100755
--- a/Master/bin/amd64-netbsd/aleph
+++ b/Master/bin/amd64-netbsd/aleph
diff --git a/Master/bin/amd64-netbsd/bibtex b/Master/bin/amd64-netbsd/bibtex
index 9ff10724c26..9d40fbb7680 100755
--- a/Master/bin/amd64-netbsd/bibtex
+++ b/Master/bin/amd64-netbsd/bibtex
diff --git a/Master/bin/amd64-netbsd/bibtex8 b/Master/bin/amd64-netbsd/bibtex8
index d00008af3ec..df230d0fb4b 100755
--- a/Master/bin/amd64-netbsd/bibtex8
+++ b/Master/bin/amd64-netbsd/bibtex8
diff --git a/Master/bin/amd64-netbsd/bibtexu b/Master/bin/amd64-netbsd/bibtexu
index ac1daf9fd48..8695239e769 100755
--- a/Master/bin/amd64-netbsd/bibtexu
+++ b/Master/bin/amd64-netbsd/bibtexu
diff --git a/Master/bin/amd64-netbsd/chktex b/Master/bin/amd64-netbsd/chktex
index 8560f7c2215..1f06922e2ed 100755
--- a/Master/bin/amd64-netbsd/chktex
+++ b/Master/bin/amd64-netbsd/chktex
diff --git a/Master/bin/amd64-netbsd/ctangle b/Master/bin/amd64-netbsd/ctangle
index 7bc8ed6c5a5..9eb38db8454 100755
--- a/Master/bin/amd64-netbsd/ctangle
+++ b/Master/bin/amd64-netbsd/ctangle
diff --git a/Master/bin/amd64-netbsd/ctie b/Master/bin/amd64-netbsd/ctie
index acc6b7f6da5..65ad9f1afb7 100755
--- a/Master/bin/amd64-netbsd/ctie
+++ b/Master/bin/amd64-netbsd/ctie
diff --git a/Master/bin/amd64-netbsd/ctwill b/Master/bin/amd64-netbsd/ctwill
index 2bcf651da25..f55de5ca676 100755
--- a/Master/bin/amd64-netbsd/ctwill
+++ b/Master/bin/amd64-netbsd/ctwill
diff --git a/Master/bin/amd64-netbsd/ctwill-proofsort b/Master/bin/amd64-netbsd/ctwill-proofsort
index 8cdce90ddbd..c05c50ee1fa 100755
--- a/Master/bin/amd64-netbsd/ctwill-proofsort
+++ b/Master/bin/amd64-netbsd/ctwill-proofsort
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: ctwill-proofsort 68690 2023-10-29 13:15:04Z ascherer $
+# $Id: ctwill-proofsort 69852 2024-02-14 08:19:45Z ascherer $
 # Public domain.  Originally written by Andreas Scherer, 2023.
 
 use strict;
@@ -39,7 +39,7 @@ sub help_handler {
 }
 ## version()
 sub version {
-  return $progname.' $Revision: 68690 $ $Date: 2023-10-29 14:15:04 +0100 (Sun, 29 Oct 2023) $'."\n";
+  return $progname.' $Revision: 69852 $ $Date: 2024-02-14 09:19:45 +0100 (Wed, 14 Feb 2024) $'."\n";
 }
 
 # Read input from the console and look for blocks like
@@ -100,11 +100,9 @@ It reads its input from <STDIN> and writes its output to <STDOUT>.
 
 =item Run CTWILL twice on your 'input_file'.w, creating 'input_file'.tex
 
-=item Invoke "ctwill-proofsort < 'input_file'.tex > 'input_file'-sorted.tex"
+=item Invoke "( ctwill-proofsort < 'input_file'.tex ) 1<> 'input_file'.tex"
 
-=item Invoke "mv 'input_file'-sorted.tex 'input_file'.tex"
-
-=item Run TeX on 'input_file'.tex
+=item Run TeX on 'input_file'.tex once
 
 =back
 
@@ -121,9 +119,7 @@ Example from MMIX (https://github.com/ascherer/mmix, 'local' branch):
 
 =item $ ctwill +P -x mmotype mmotype-twill (run this two times)
 
-=item $ ctwill-proofsort < mmotype.tex > mmotype-sorted.tex
-
-=item $ mv mmotype-sorted.tex mmotype.tex
+=item $ ( ctwill-proofsort < mmotype.tex ) 1<> mmotype.tex
 
 =item $ tex mmotype
 
diff --git a/Master/bin/amd64-netbsd/cweave b/Master/bin/amd64-netbsd/cweave
index f4cb326e101..71abb497735 100755
--- a/Master/bin/amd64-netbsd/cweave
+++ b/Master/bin/amd64-netbsd/cweave
diff --git a/Master/bin/amd64-netbsd/detex b/Master/bin/amd64-netbsd/detex
index 0560a3c284b..aa68e00c8be 100755
--- a/Master/bin/amd64-netbsd/detex
+++ b/Master/bin/amd64-netbsd/detex
diff --git a/Master/bin/amd64-netbsd/disdvi b/Master/bin/amd64-netbsd/disdvi
index 6b9a70bb789..b1fc400345a 100755
--- a/Master/bin/amd64-netbsd/disdvi
+++ b/Master/bin/amd64-netbsd/disdvi
diff --git a/Master/bin/amd64-netbsd/dvi2tty b/Master/bin/amd64-netbsd/dvi2tty
index 206cb85cf68..e29aecb4b82 100755
--- a/Master/bin/amd64-netbsd/dvi2tty
+++ b/Master/bin/amd64-netbsd/dvi2tty
diff --git a/Master/bin/amd64-netbsd/dvicopy b/Master/bin/amd64-netbsd/dvicopy
index 65ba6916466..3ce8c66369c 100755
--- a/Master/bin/amd64-netbsd/dvicopy
+++ b/Master/bin/amd64-netbsd/dvicopy
diff --git a/Master/bin/amd64-netbsd/dvilj b/Master/bin/amd64-netbsd/dvilj
index 1c150254ad2..862cbb47476 100755
--- a/Master/bin/amd64-netbsd/dvilj
+++ b/Master/bin/amd64-netbsd/dvilj
diff --git a/Master/bin/amd64-netbsd/dvilj2p b/Master/bin/amd64-netbsd/dvilj2p
index 9288f7d8637..8c61976fac0 100755
--- a/Master/bin/amd64-netbsd/dvilj2p
+++ b/Master/bin/amd64-netbsd/dvilj2p
diff --git a/Master/bin/amd64-netbsd/dvilj4 b/Master/bin/amd64-netbsd/dvilj4
index fd54b73a7ac..2bb89e33264 100755
--- a/Master/bin/amd64-netbsd/dvilj4
+++ b/Master/bin/amd64-netbsd/dvilj4
diff --git a/Master/bin/amd64-netbsd/dvilj4l b/Master/bin/amd64-netbsd/dvilj4l
index c9cee0af989..35e6f6b2c0f 100755
--- a/Master/bin/amd64-netbsd/dvilj4l
+++ b/Master/bin/amd64-netbsd/dvilj4l
diff --git a/Master/bin/amd64-netbsd/dvipng b/Master/bin/amd64-netbsd/dvipng
index 509df6bc999..18c931e73eb 100755
--- a/Master/bin/amd64-netbsd/dvipng
+++ b/Master/bin/amd64-netbsd/dvipng
diff --git a/Master/bin/amd64-netbsd/dvipos b/Master/bin/amd64-netbsd/dvipos
index 3c027a838cb..433f036cb73 100755
--- a/Master/bin/amd64-netbsd/dvipos
+++ b/Master/bin/amd64-netbsd/dvipos
diff --git a/Master/bin/amd64-netbsd/dvips b/Master/bin/amd64-netbsd/dvips
index 7b5cc9d8f58..0feb70b4896 100755
--- a/Master/bin/amd64-netbsd/dvips
+++ b/Master/bin/amd64-netbsd/dvips
diff --git a/Master/bin/amd64-netbsd/dvispc b/Master/bin/amd64-netbsd/dvispc
index 2197a8493b7..c4c663314bb 100755
--- a/Master/bin/amd64-netbsd/dvispc
+++ b/Master/bin/amd64-netbsd/dvispc
diff --git a/Master/bin/amd64-netbsd/dvisvgm b/Master/bin/amd64-netbsd/dvisvgm
index c6dbf3d0c1f..3e89ebdb9a0 100755
--- a/Master/bin/amd64-netbsd/dvisvgm
+++ b/Master/bin/amd64-netbsd/dvisvgm
diff --git a/Master/bin/amd64-netbsd/dvitype b/Master/bin/amd64-netbsd/dvitype
index 1e60a1b7bf9..3ec4f77b71e 100755
--- a/Master/bin/amd64-netbsd/dvitype
+++ b/Master/bin/amd64-netbsd/dvitype
diff --git a/Master/bin/amd64-netbsd/euptex b/Master/bin/amd64-netbsd/euptex
index 9f3125162dd..3afe885f929 100755
--- a/Master/bin/amd64-netbsd/euptex
+++ b/Master/bin/amd64-netbsd/euptex
diff --git a/Master/bin/amd64-netbsd/gftodvi b/Master/bin/amd64-netbsd/gftodvi
index e346a4fcb71..b2a53633f42 100755
--- a/Master/bin/amd64-netbsd/gftodvi
+++ b/Master/bin/amd64-netbsd/gftodvi
diff --git a/Master/bin/amd64-netbsd/gftopk b/Master/bin/amd64-netbsd/gftopk
index 97599325807..0720b90f3b8 100755
--- a/Master/bin/amd64-netbsd/gftopk
+++ b/Master/bin/amd64-netbsd/gftopk
diff --git a/Master/bin/amd64-netbsd/gftype b/Master/bin/amd64-netbsd/gftype
index 153045bb22c..4d2ff8bfcc2 100755
--- a/Master/bin/amd64-netbsd/gftype
+++ b/Master/bin/amd64-netbsd/gftype
diff --git a/Master/bin/amd64-netbsd/gregorio b/Master/bin/amd64-netbsd/gregorio
index 82922ae1ca5..8f48cdc9eb9 100755
--- a/Master/bin/amd64-netbsd/gregorio
+++ b/Master/bin/amd64-netbsd/gregorio
diff --git a/Master/bin/amd64-netbsd/gsftopk b/Master/bin/amd64-netbsd/gsftopk
index 5b9f9f8f615..5a9e6cbacb1 100755
--- a/Master/bin/amd64-netbsd/gsftopk
+++ b/Master/bin/amd64-netbsd/gsftopk
diff --git a/Master/bin/amd64-netbsd/hbf2gf b/Master/bin/amd64-netbsd/hbf2gf
index 3fb81379549..d813c6cf1c4 100755
--- a/Master/bin/amd64-netbsd/hbf2gf
+++ b/Master/bin/amd64-netbsd/hbf2gf
diff --git a/Master/bin/amd64-netbsd/hitex b/Master/bin/amd64-netbsd/hitex
index 103eea9b818..e0462bb82f1 100755
--- a/Master/bin/amd64-netbsd/hitex
+++ b/Master/bin/amd64-netbsd/hitex
diff --git a/Master/bin/amd64-netbsd/kpsewhich b/Master/bin/amd64-netbsd/kpsewhich
index 987fa9f4b90..29ff37a72af 100755
--- a/Master/bin/amd64-netbsd/kpsewhich
+++ b/Master/bin/amd64-netbsd/kpsewhich
diff --git a/Master/bin/amd64-netbsd/luahbtex b/Master/bin/amd64-netbsd/luahbtex
index 9eae334bc39..d8fdc8395d3 100755
--- a/Master/bin/amd64-netbsd/luahbtex
+++ b/Master/bin/amd64-netbsd/luahbtex
diff --git a/Master/bin/amd64-netbsd/luajithbtex b/Master/bin/amd64-netbsd/luajithbtex
index 827f301e254..10dbd2003a7 100755
--- a/Master/bin/amd64-netbsd/luajithbtex
+++ b/Master/bin/amd64-netbsd/luajithbtex
diff --git a/Master/bin/amd64-netbsd/luajittex b/Master/bin/amd64-netbsd/luajittex
index 34867575203..e692c999c29 100755
--- a/Master/bin/amd64-netbsd/luajittex
+++ b/Master/bin/amd64-netbsd/luajittex
diff --git a/Master/bin/amd64-netbsd/luatex b/Master/bin/amd64-netbsd/luatex
index 41a9dd52c98..d1fde0b7829 100755
--- a/Master/bin/amd64-netbsd/luatex
+++ b/Master/bin/amd64-netbsd/luatex
diff --git a/Master/bin/amd64-netbsd/makeindex b/Master/bin/amd64-netbsd/makeindex
index 6ceaf487452..0d12f28d31c 100755
--- a/Master/bin/amd64-netbsd/makeindex
+++ b/Master/bin/amd64-netbsd/makeindex
diff --git a/Master/bin/amd64-netbsd/makejvf b/Master/bin/amd64-netbsd/makejvf
index eb556ed43da..b04f7121129 100755
--- a/Master/bin/amd64-netbsd/makejvf
+++ b/Master/bin/amd64-netbsd/makejvf
diff --git a/Master/bin/amd64-netbsd/mendex b/Master/bin/amd64-netbsd/mendex
index eae010845a9..1f61d651885 100755
--- a/Master/bin/amd64-netbsd/mendex
+++ b/Master/bin/amd64-netbsd/mendex
diff --git a/Master/bin/amd64-netbsd/mf b/Master/bin/amd64-netbsd/mf
index e783a8657d9..3255ef3431c 100755
--- a/Master/bin/amd64-netbsd/mf
+++ b/Master/bin/amd64-netbsd/mf
diff --git a/Master/bin/amd64-netbsd/mf-nowin b/Master/bin/amd64-netbsd/mf-nowin
index 8310f0638c4..8fcacc2a29d 100755
--- a/Master/bin/amd64-netbsd/mf-nowin
+++ b/Master/bin/amd64-netbsd/mf-nowin
diff --git a/Master/bin/amd64-netbsd/mflua b/Master/bin/amd64-netbsd/mflua
index d4a186eb7ef..ffeb7854bca 100755
--- a/Master/bin/amd64-netbsd/mflua
+++ b/Master/bin/amd64-netbsd/mflua
diff --git a/Master/bin/amd64-netbsd/mfluajit b/Master/bin/amd64-netbsd/mfluajit
index 66a8503a961..dc8a717e6e2 100755
--- a/Master/bin/amd64-netbsd/mfluajit
+++ b/Master/bin/amd64-netbsd/mfluajit
diff --git a/Master/bin/amd64-netbsd/mft b/Master/bin/amd64-netbsd/mft
index d66e89fc1d6..1eaf108e117 100755
--- a/Master/bin/amd64-netbsd/mft
+++ b/Master/bin/amd64-netbsd/mft
diff --git a/Master/bin/amd64-netbsd/mpost b/Master/bin/amd64-netbsd/mpost
index 061f31c8200..08a6c9c8e84 100755
--- a/Master/bin/amd64-netbsd/mpost
+++ b/Master/bin/amd64-netbsd/mpost
diff --git a/Master/bin/amd64-netbsd/odvicopy b/Master/bin/amd64-netbsd/odvicopy
index 22a1c56a604..b44af7fa969 100755
--- a/Master/bin/amd64-netbsd/odvicopy
+++ b/Master/bin/amd64-netbsd/odvicopy
diff --git a/Master/bin/amd64-netbsd/odvitype b/Master/bin/amd64-netbsd/odvitype
index e592479f565..724e3b31e32 100755
--- a/Master/bin/amd64-netbsd/odvitype
+++ b/Master/bin/amd64-netbsd/odvitype
diff --git a/Master/bin/amd64-netbsd/omfonts b/Master/bin/amd64-netbsd/omfonts
index a8aa5f037ed..814fdc2dae5 100755
--- a/Master/bin/amd64-netbsd/omfonts
+++ b/Master/bin/amd64-netbsd/omfonts
diff --git a/Master/bin/amd64-netbsd/otangle b/Master/bin/amd64-netbsd/otangle
index 7290fee5779..e3858d00cca 100755
--- a/Master/bin/amd64-netbsd/otangle
+++ b/Master/bin/amd64-netbsd/otangle
diff --git a/Master/bin/amd64-netbsd/otftotfm b/Master/bin/amd64-netbsd/otftotfm
index a0b48d028de..64cf461bc6e 100755
--- a/Master/bin/amd64-netbsd/otftotfm
+++ b/Master/bin/amd64-netbsd/otftotfm
diff --git a/Master/bin/amd64-netbsd/otp2ocp b/Master/bin/amd64-netbsd/otp2ocp
index 2b74eda4213..fa3707a9a51 100755
--- a/Master/bin/amd64-netbsd/otp2ocp
+++ b/Master/bin/amd64-netbsd/otp2ocp
diff --git a/Master/bin/amd64-netbsd/outocp b/Master/bin/amd64-netbsd/outocp
index 03eac6906e0..98ee353f791 100755
--- a/Master/bin/amd64-netbsd/outocp
+++ b/Master/bin/amd64-netbsd/outocp
diff --git a/Master/bin/amd64-netbsd/pdftex b/Master/bin/amd64-netbsd/pdftex
index 2926d17339f..a8fdc01f756 100755
--- a/Master/bin/amd64-netbsd/pdftex
+++ b/Master/bin/amd64-netbsd/pdftex
diff --git a/Master/bin/amd64-netbsd/pktogf b/Master/bin/amd64-netbsd/pktogf
index 436cf46b77c..206275b1304 100755
--- a/Master/bin/amd64-netbsd/pktogf
+++ b/Master/bin/amd64-netbsd/pktogf
diff --git a/Master/bin/amd64-netbsd/pktype b/Master/bin/amd64-netbsd/pktype
index 4018da799b2..9a0f49886fe 100755
--- a/Master/bin/amd64-netbsd/pktype
+++ b/Master/bin/amd64-netbsd/pktype
diff --git a/Master/bin/amd64-netbsd/pmpost b/Master/bin/amd64-netbsd/pmpost
index 8e2ec3fbb78..068ecfbe732 100755
--- a/Master/bin/amd64-netbsd/pmpost
+++ b/Master/bin/amd64-netbsd/pmpost
diff --git a/Master/bin/amd64-netbsd/ps2pk b/Master/bin/amd64-netbsd/ps2pk
index aec209f289f..0f7a974203d 100755
--- a/Master/bin/amd64-netbsd/ps2pk
+++ b/Master/bin/amd64-netbsd/ps2pk
diff --git a/Master/bin/amd64-netbsd/psnup b/Master/bin/amd64-netbsd/psnup
index 709ebdb768d..f7743e14cd1 100755
--- a/Master/bin/amd64-netbsd/psnup
+++ b/Master/bin/amd64-netbsd/psnup
diff --git a/Master/bin/amd64-netbsd/psresize b/Master/bin/amd64-netbsd/psresize
index d5b7c33cf96..2407c7e2da1 100755
--- a/Master/bin/amd64-netbsd/psresize
+++ b/Master/bin/amd64-netbsd/psresize
diff --git a/Master/bin/amd64-netbsd/pstops b/Master/bin/amd64-netbsd/pstops
index 331be68215c..15528c2ef1c 100755
--- a/Master/bin/amd64-netbsd/pstops
+++ b/Master/bin/amd64-netbsd/pstops
diff --git a/Master/bin/amd64-netbsd/ptekf b/Master/bin/amd64-netbsd/ptekf
index 74e2591bd87..233613ebd2e 100755
--- a/Master/bin/amd64-netbsd/ptekf
+++ b/Master/bin/amd64-netbsd/ptekf
diff --git a/Master/bin/amd64-netbsd/ptex b/Master/bin/amd64-netbsd/ptex
index da5a0e6822f..7d58dd848c9 120000
--- a/Master/bin/amd64-netbsd/ptex
+++ b/Master/bin/amd64-netbsd/ptex
@@ -1 +1 @@
-eptex
\ No newline at end of file
+euptex
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/t4ht b/Master/bin/amd64-netbsd/t4ht
index 8443126b854..3a30a37c2d4 100755
--- a/Master/bin/amd64-netbsd/t4ht
+++ b/Master/bin/amd64-netbsd/t4ht
diff --git a/Master/bin/amd64-netbsd/tangle b/Master/bin/amd64-netbsd/tangle
index 6d8a197b8c4..b6e13914d63 100755
--- a/Master/bin/amd64-netbsd/tangle
+++ b/Master/bin/amd64-netbsd/tangle
diff --git a/Master/bin/amd64-netbsd/tex b/Master/bin/amd64-netbsd/tex
index 7995e56ed03..4d12964b029 100755
--- a/Master/bin/amd64-netbsd/tex
+++ b/Master/bin/amd64-netbsd/tex
diff --git a/Master/bin/amd64-netbsd/tex4ht b/Master/bin/amd64-netbsd/tex4ht
index faec15f2741..bf9261b6814 100755
--- a/Master/bin/amd64-netbsd/tex4ht
+++ b/Master/bin/amd64-netbsd/tex4ht
diff --git a/Master/bin/amd64-netbsd/tftopl b/Master/bin/amd64-netbsd/tftopl
index d350168fdbe..bbf4a29a1ad 100755
--- a/Master/bin/amd64-netbsd/tftopl
+++ b/Master/bin/amd64-netbsd/tftopl
diff --git a/Master/bin/amd64-netbsd/tie b/Master/bin/amd64-netbsd/tie
index d1cca4379da..a0be08a8004 100755
--- a/Master/bin/amd64-netbsd/tie
+++ b/Master/bin/amd64-netbsd/tie
diff --git a/Master/bin/amd64-netbsd/ttf2afm b/Master/bin/amd64-netbsd/ttf2afm
index d0d830d8172..bf1c8e7ee06 100755
--- a/Master/bin/amd64-netbsd/ttf2afm
+++ b/Master/bin/amd64-netbsd/ttf2afm
diff --git a/Master/bin/amd64-netbsd/ttf2pk b/Master/bin/amd64-netbsd/ttf2pk
index 4f70c705ea2..b5d2e22e706 100755
--- a/Master/bin/amd64-netbsd/ttf2pk
+++ b/Master/bin/amd64-netbsd/ttf2pk
diff --git a/Master/bin/amd64-netbsd/ttf2tfm b/Master/bin/amd64-netbsd/ttf2tfm
index 45c7c2ee974..c53a6ece25f 100755
--- a/Master/bin/amd64-netbsd/ttf2tfm
+++ b/Master/bin/amd64-netbsd/ttf2tfm
diff --git a/Master/bin/amd64-netbsd/ttfdump b/Master/bin/amd64-netbsd/ttfdump
index 99badd27518..720e52bfdfe 100755
--- a/Master/bin/amd64-netbsd/ttfdump
+++ b/Master/bin/amd64-netbsd/ttfdump
diff --git a/Master/bin/amd64-netbsd/twill b/Master/bin/amd64-netbsd/twill
index ca9dad52062..645808ba008 100755
--- a/Master/bin/amd64-netbsd/twill
+++ b/Master/bin/amd64-netbsd/twill
diff --git a/Master/bin/amd64-netbsd/twill-refsort b/Master/bin/amd64-netbsd/twill-refsort
new file mode 100755
index 00000000000..80d17263dc3
--- /dev/null
+++ b/Master/bin/amd64-netbsd/twill-refsort
@@ -0,0 +1,117 @@
+#!/usr/bin/env perl
+# $Id: twill-refsort 69812 2024-02-11 23:09:24Z karl $
+# Public domain.  Originally written by Andreas Scherer, 2023.
+
+use strict;
+use warnings;
+
+use File::Basename;
+use Getopt::Long qw(:config no_ignore_case bundling);
+use Pod::Usage;
+
+my $progname;
+my $collator;
+
+BEGIN {
+  $progname = basename $0;
+  # Unicode::Collate has been around a long time,
+  # but it's not part of core Perl.
+  eval {
+    require Unicode::Collate;
+    $collator = Unicode::Collate->new();
+  };
+}
+
+my $usage = "Usage: $progname < foo.ref > foo.sref\n";
+
+# Standard options for TeX Live.
+Getopt::Long::GetOptions(
+  'help|?'  => \&help_handler,
+  'version' => sub { print version(); exit 0; }
+) or die $usage;
+## help_handler()
+sub help_handler {
+  open(my $pipe, '|-', $ENV{PAGER} || 'less -e') or exit 1;
+  pod2usage(-message => version(), -output => $pipe,
+    -verbose => 99, -sections => "SHORT DESCRIPTION|COPYRIGHT");
+  close $pipe;
+  exit 0;
+}
+## version()
+sub version {
+  return $progname.' $Revision: 69812 $ $Date: 2024-02-12 00:09:24 +0100 (Mon, 12 Feb 2024) $'."\n";
+}
+
+# Read input lines from the console and look for blocks like
+# !127
+# [+ KEY LOCATION TEXPART]*
+# and sort them alphabetically by the KEYs.
+#
+# Every KEY consists of a single PASCAL identifier (variable, type, function,
+# etc.) after an initial '+ ' marker. This marker is replaced with the '\['
+# macro (i.e., '\makeref') to help TeX format the mini-index.
+#
+# The page number in the '!\d+' indicator is appended as argument of the
+# '\donewithpage' macro.
+my %mini_index; # storage for index entries of a two-page spread
+my $donewithpage; # recto page number of a two-page spread
+foreach my $line (<STDIN>)
+{
+  if ($line =~ m/\!(\d+)/) { # start of a new two-page spread
+    if ($donewithpage) { # skip over first indicator line
+      foreach my $key ($collator ?
+        $collator->sort(keys %mini_index) :
+        sort {"\L$a" cmp "\L$b"} keys %mini_index) {
+        print $mini_index{$key};
+      }
+      %mini_index = (); # reset mini-index storage
+      print "\\donewithpage$donewithpage\n"; # done with current spread
+    }
+    $donewithpage = $1; # start of next spread
+  } else { # mini-index entry
+    my (undef,$key) = split / /, $line; # 2nd column is the key
+    $line =~ s/^\+ /\\\[/; # add \makeref macro
+    $mini_index{$key} = $line; # store index entry
+    next; # print later
+  }
+}
+
+print "\\donewithpage$donewithpage\n"; # done with current spread
+
+exit 0;
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+twill-refsort - Sort mini-indexes alphabetically
+
+=head1 SHORT DESCRIPTION
+
+This small Perl script 'twill-refsort' sorts the mini-indexes for each section
+in the '.ref' file created by 'twill foo' (twice) and 'tex foo' (first run).
+It reads its input from STDIN and writes its output to STDOUT.
+
+=over
+
+=item Run TWILL twice on your 'foo'.w, creating 'foo'.tex
+
+=item Invoke "tex 'foo'.tex", creating 'foo'.ref
+
+=item Invoke "twill-refsort < 'foo'.ref > 'foo'.sref"
+
+=item Run TeX on 'foo'.tex a second time
+
+=back
+
+See also "man twill" for more information on how to use the TWILL system.
+
+=head1 COPYRIGHT
+
+Public domain.  Originally written by Andreas Scherer, 2023.
+
+Contemporary development on https://github.com/ascherer/cwebbin.
+
+=cut
diff --git a/Master/bin/amd64-netbsd/upbibtex b/Master/bin/amd64-netbsd/upbibtex
index 18c09d64b47..d06ff71145b 100755
--- a/Master/bin/amd64-netbsd/upbibtex
+++ b/Master/bin/amd64-netbsd/upbibtex
diff --git a/Master/bin/amd64-netbsd/updvitype b/Master/bin/amd64-netbsd/updvitype
index 1d725437d2e..68ce09a8052 100755
--- a/Master/bin/amd64-netbsd/updvitype
+++ b/Master/bin/amd64-netbsd/updvitype
diff --git a/Master/bin/amd64-netbsd/upmendex b/Master/bin/amd64-netbsd/upmendex
index 9b733de6533..74c73839610 100755
--- a/Master/bin/amd64-netbsd/upmendex
+++ b/Master/bin/amd64-netbsd/upmendex
diff --git a/Master/bin/amd64-netbsd/upmpost b/Master/bin/amd64-netbsd/upmpost
index 554bebb6c77..986d4f971b3 100755
--- a/Master/bin/amd64-netbsd/upmpost
+++ b/Master/bin/amd64-netbsd/upmpost
diff --git a/Master/bin/amd64-netbsd/uppltotf b/Master/bin/amd64-netbsd/uppltotf
index bbec5ae638a..81584f507ac 100755
--- a/Master/bin/amd64-netbsd/uppltotf
+++ b/Master/bin/amd64-netbsd/uppltotf
diff --git a/Master/bin/amd64-netbsd/uptftopl b/Master/bin/amd64-netbsd/uptftopl
index 3914b9984f2..9b3f04df8ee 100755
--- a/Master/bin/amd64-netbsd/uptftopl
+++ b/Master/bin/amd64-netbsd/uptftopl
diff --git a/Master/bin/amd64-netbsd/vftovp b/Master/bin/amd64-netbsd/vftovp
index 7810f54c4aa..8eb7cc6c5de 100755
--- a/Master/bin/amd64-netbsd/vftovp
+++ b/Master/bin/amd64-netbsd/vftovp
diff --git a/Master/bin/amd64-netbsd/weave b/Master/bin/amd64-netbsd/weave
index 1ae324e6f71..a8456a2b0c8 100755
--- a/Master/bin/amd64-netbsd/weave
+++ b/Master/bin/amd64-netbsd/weave
diff --git a/Master/bin/amd64-netbsd/wofm2opl b/Master/bin/amd64-netbsd/wofm2opl
index fc9e56b6d50..f0c267b7905 100755
--- a/Master/bin/amd64-netbsd/wofm2opl
+++ b/Master/bin/amd64-netbsd/wofm2opl
diff --git a/Master/bin/amd64-netbsd/wovf2ovp b/Master/bin/amd64-netbsd/wovf2ovp
index 3a107372776..c3d895582c4 100755
--- a/Master/bin/amd64-netbsd/wovf2ovp
+++ b/Master/bin/amd64-netbsd/wovf2ovp
diff --git a/Master/bin/amd64-netbsd/xdvi-xaw b/Master/bin/amd64-netbsd/xdvi-xaw
index 932c8539690..6ef7277f110 100755
--- a/Master/bin/amd64-netbsd/xdvi-xaw
+++ b/Master/bin/amd64-netbsd/xdvi-xaw
diff --git a/Master/bin/amd64-netbsd/xdvipdfmx b/Master/bin/amd64-netbsd/xdvipdfmx
index 28d45165457..4b6f9a62a0d 100755
--- a/Master/bin/amd64-netbsd/xdvipdfmx
+++ b/Master/bin/amd64-netbsd/xdvipdfmx
diff --git a/Master/bin/amd64-netbsd/xetex b/Master/bin/amd64-netbsd/xetex
index 5f28304137c..e5d75b4da98 100755
--- a/Master/bin/amd64-netbsd/xetex
+++ b/Master/bin/amd64-netbsd/xetex
diff --git a/Master/bin/amd64-netbsd/xindy.mem b/Master/bin/amd64-netbsd/xindy.mem
index 1ceba3af6f7..da52e4d7925 100644
--- a/Master/bin/amd64-netbsd/xindy.mem
+++ b/Master/bin/amd64-netbsd/xindy.mem
diff --git a/Master/bin/amd64-netbsd/xindy.run b/Master/bin/amd64-netbsd/xindy.run
index a83658fcb00..69d0757cf54 100755
--- a/Master/bin/amd64-netbsd/xindy.run
+++ b/Master/bin/amd64-netbsd/xindy.run
diff --git a/Master/bin/i386-netbsd/afm2pl b/Master/bin/i386-netbsd/afm2pl
index 32eb39c3d31..aa9dce8de23 100755
--- a/Master/bin/i386-netbsd/afm2pl
+++ b/Master/bin/i386-netbsd/afm2pl
diff --git a/Master/bin/i386-netbsd/afm2tfm b/Master/bin/i386-netbsd/afm2tfm
index 45e501ea142..6ef939c3c54 100755
--- a/Master/bin/i386-netbsd/afm2tfm
+++ b/Master/bin/i386-netbsd/afm2tfm
diff --git a/Master/bin/i386-netbsd/aleph b/Master/bin/i386-netbsd/aleph
index f3aecf9ade7..bcaa61091eb 100755
--- a/Master/bin/i386-netbsd/aleph
+++ b/Master/bin/i386-netbsd/aleph
diff --git a/Master/bin/i386-netbsd/bibtex b/Master/bin/i386-netbsd/bibtex
index 12fc16af36a..328ceee7e34 100755
--- a/Master/bin/i386-netbsd/bibtex
+++ b/Master/bin/i386-netbsd/bibtex
diff --git a/Master/bin/i386-netbsd/bibtex8 b/Master/bin/i386-netbsd/bibtex8
index 7f2c2cb450c..c875d85bbaf 100755
--- a/Master/bin/i386-netbsd/bibtex8
+++ b/Master/bin/i386-netbsd/bibtex8
diff --git a/Master/bin/i386-netbsd/bibtexu b/Master/bin/i386-netbsd/bibtexu
index 249b454aafd..5a67ee05ec0 100755
--- a/Master/bin/i386-netbsd/bibtexu
+++ b/Master/bin/i386-netbsd/bibtexu
diff --git a/Master/bin/i386-netbsd/chktex b/Master/bin/i386-netbsd/chktex
index 26c8fda070f..51a59b723fe 100755
--- a/Master/bin/i386-netbsd/chktex
+++ b/Master/bin/i386-netbsd/chktex
diff --git a/Master/bin/i386-netbsd/ctangle b/Master/bin/i386-netbsd/ctangle
index 1939d4b6f1a..4b9167a3f50 100755
--- a/Master/bin/i386-netbsd/ctangle
+++ b/Master/bin/i386-netbsd/ctangle
diff --git a/Master/bin/i386-netbsd/ctie b/Master/bin/i386-netbsd/ctie
index ed512980536..a39ed0cfac3 100755
--- a/Master/bin/i386-netbsd/ctie
+++ b/Master/bin/i386-netbsd/ctie
diff --git a/Master/bin/i386-netbsd/ctwill b/Master/bin/i386-netbsd/ctwill
index a07d4c0333c..f4dd2ffb3c1 100755
--- a/Master/bin/i386-netbsd/ctwill
+++ b/Master/bin/i386-netbsd/ctwill
diff --git a/Master/bin/i386-netbsd/ctwill-proofsort b/Master/bin/i386-netbsd/ctwill-proofsort
index 8cdce90ddbd..c05c50ee1fa 100755
--- a/Master/bin/i386-netbsd/ctwill-proofsort
+++ b/Master/bin/i386-netbsd/ctwill-proofsort
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: ctwill-proofsort 68690 2023-10-29 13:15:04Z ascherer $
+# $Id: ctwill-proofsort 69852 2024-02-14 08:19:45Z ascherer $
 # Public domain.  Originally written by Andreas Scherer, 2023.
 
 use strict;
@@ -39,7 +39,7 @@ sub help_handler {
 }
 ## version()
 sub version {
-  return $progname.' $Revision: 68690 $ $Date: 2023-10-29 14:15:04 +0100 (Sun, 29 Oct 2023) $'."\n";
+  return $progname.' $Revision: 69852 $ $Date: 2024-02-14 09:19:45 +0100 (Wed, 14 Feb 2024) $'."\n";
 }
 
 # Read input from the console and look for blocks like
@@ -100,11 +100,9 @@ It reads its input from <STDIN> and writes its output to <STDOUT>.
 
 =item Run CTWILL twice on your 'input_file'.w, creating 'input_file'.tex
 
-=item Invoke "ctwill-proofsort < 'input_file'.tex > 'input_file'-sorted.tex"
+=item Invoke "( ctwill-proofsort < 'input_file'.tex ) 1<> 'input_file'.tex"
 
-=item Invoke "mv 'input_file'-sorted.tex 'input_file'.tex"
-
-=item Run TeX on 'input_file'.tex
+=item Run TeX on 'input_file'.tex once
 
 =back
 
@@ -121,9 +119,7 @@ Example from MMIX (https://github.com/ascherer/mmix, 'local' branch):
 
 =item $ ctwill +P -x mmotype mmotype-twill (run this two times)
 
-=item $ ctwill-proofsort < mmotype.tex > mmotype-sorted.tex
-
-=item $ mv mmotype-sorted.tex mmotype.tex
+=item $ ( ctwill-proofsort < mmotype.tex ) 1<> mmotype.tex
 
 =item $ tex mmotype
 
diff --git a/Master/bin/i386-netbsd/cweave b/Master/bin/i386-netbsd/cweave
index aa94dc387ca..4582038e72a 100755
--- a/Master/bin/i386-netbsd/cweave
+++ b/Master/bin/i386-netbsd/cweave
diff --git a/Master/bin/i386-netbsd/detex b/Master/bin/i386-netbsd/detex
index 15791d7e825..7cd6d18c74a 100755
--- a/Master/bin/i386-netbsd/detex
+++ b/Master/bin/i386-netbsd/detex
diff --git a/Master/bin/i386-netbsd/disdvi b/Master/bin/i386-netbsd/disdvi
index feaf70bd66b..38287e14907 100755
--- a/Master/bin/i386-netbsd/disdvi
+++ b/Master/bin/i386-netbsd/disdvi
diff --git a/Master/bin/i386-netbsd/dvi2tty b/Master/bin/i386-netbsd/dvi2tty
index 1f1e3bbbf2b..240fd7ec595 100755
--- a/Master/bin/i386-netbsd/dvi2tty
+++ b/Master/bin/i386-netbsd/dvi2tty
diff --git a/Master/bin/i386-netbsd/dvicopy b/Master/bin/i386-netbsd/dvicopy
index a2769ccee99..1197924cff8 100755
--- a/Master/bin/i386-netbsd/dvicopy
+++ b/Master/bin/i386-netbsd/dvicopy
diff --git a/Master/bin/i386-netbsd/dvilj b/Master/bin/i386-netbsd/dvilj
index 02d1dfac6dd..26a08295d10 100755
--- a/Master/bin/i386-netbsd/dvilj
+++ b/Master/bin/i386-netbsd/dvilj
diff --git a/Master/bin/i386-netbsd/dvilj2p b/Master/bin/i386-netbsd/dvilj2p
index ad14b0ca935..89fcfa39144 100755
--- a/Master/bin/i386-netbsd/dvilj2p
+++ b/Master/bin/i386-netbsd/dvilj2p
diff --git a/Master/bin/i386-netbsd/dvilj4 b/Master/bin/i386-netbsd/dvilj4
index 374217b45e9..9182893b809 100755
--- a/Master/bin/i386-netbsd/dvilj4
+++ b/Master/bin/i386-netbsd/dvilj4
diff --git a/Master/bin/i386-netbsd/dvilj4l b/Master/bin/i386-netbsd/dvilj4l
index 10e82fa8528..1c7ce8d3787 100755
--- a/Master/bin/i386-netbsd/dvilj4l
+++ b/Master/bin/i386-netbsd/dvilj4l
diff --git a/Master/bin/i386-netbsd/dvipng b/Master/bin/i386-netbsd/dvipng
index db4f7d2cad5..621abccda9f 100755
--- a/Master/bin/i386-netbsd/dvipng
+++ b/Master/bin/i386-netbsd/dvipng
diff --git a/Master/bin/i386-netbsd/dvipos b/Master/bin/i386-netbsd/dvipos
index a8dee87263c..4e4134f19a3 100755
--- a/Master/bin/i386-netbsd/dvipos
+++ b/Master/bin/i386-netbsd/dvipos
diff --git a/Master/bin/i386-netbsd/dvips b/Master/bin/i386-netbsd/dvips
index 83a02dd750d..a6b9804e235 100755
--- a/Master/bin/i386-netbsd/dvips
+++ b/Master/bin/i386-netbsd/dvips
diff --git a/Master/bin/i386-netbsd/dvispc b/Master/bin/i386-netbsd/dvispc
index 64eee774082..6671e18809b 100755
--- a/Master/bin/i386-netbsd/dvispc
+++ b/Master/bin/i386-netbsd/dvispc
diff --git a/Master/bin/i386-netbsd/dvisvgm b/Master/bin/i386-netbsd/dvisvgm
index 80e49a1fa83..8aa12290220 100755
--- a/Master/bin/i386-netbsd/dvisvgm
+++ b/Master/bin/i386-netbsd/dvisvgm
diff --git a/Master/bin/i386-netbsd/dvitype b/Master/bin/i386-netbsd/dvitype
index a72acddeac8..b8ae88469e5 100755
--- a/Master/bin/i386-netbsd/dvitype
+++ b/Master/bin/i386-netbsd/dvitype
diff --git a/Master/bin/i386-netbsd/euptex b/Master/bin/i386-netbsd/euptex
index 3372a43a2da..d56af32cc36 100755
--- a/Master/bin/i386-netbsd/euptex
+++ b/Master/bin/i386-netbsd/euptex
diff --git a/Master/bin/i386-netbsd/gftodvi b/Master/bin/i386-netbsd/gftodvi
index 11761725889..4137d86e7ee 100755
--- a/Master/bin/i386-netbsd/gftodvi
+++ b/Master/bin/i386-netbsd/gftodvi
diff --git a/Master/bin/i386-netbsd/gftopk b/Master/bin/i386-netbsd/gftopk
index edc1df90db8..6bd00739d8c 100755
--- a/Master/bin/i386-netbsd/gftopk
+++ b/Master/bin/i386-netbsd/gftopk
diff --git a/Master/bin/i386-netbsd/gftype b/Master/bin/i386-netbsd/gftype
index 10074ccf811..b68f96fc9a3 100755
--- a/Master/bin/i386-netbsd/gftype
+++ b/Master/bin/i386-netbsd/gftype
diff --git a/Master/bin/i386-netbsd/gregorio b/Master/bin/i386-netbsd/gregorio
index a888bd60629..fa22d8af4f2 100755
--- a/Master/bin/i386-netbsd/gregorio
+++ b/Master/bin/i386-netbsd/gregorio
diff --git a/Master/bin/i386-netbsd/gsftopk b/Master/bin/i386-netbsd/gsftopk
index dfbbbbf16e7..617c75a6322 100755
--- a/Master/bin/i386-netbsd/gsftopk
+++ b/Master/bin/i386-netbsd/gsftopk
diff --git a/Master/bin/i386-netbsd/hbf2gf b/Master/bin/i386-netbsd/hbf2gf
index 5b01c095992..c8edd54a630 100755
--- a/Master/bin/i386-netbsd/hbf2gf
+++ b/Master/bin/i386-netbsd/hbf2gf
diff --git a/Master/bin/i386-netbsd/hitex b/Master/bin/i386-netbsd/hitex
index 1a4d2a49158..c91164831d5 100755
--- a/Master/bin/i386-netbsd/hitex
+++ b/Master/bin/i386-netbsd/hitex
diff --git a/Master/bin/i386-netbsd/kpsewhich b/Master/bin/i386-netbsd/kpsewhich
index 53d2938ac58..ee6e87bd0a0 100755
--- a/Master/bin/i386-netbsd/kpsewhich
+++ b/Master/bin/i386-netbsd/kpsewhich
diff --git a/Master/bin/i386-netbsd/luahbtex b/Master/bin/i386-netbsd/luahbtex
index cc78ccf4407..2c82761a41a 100755
--- a/Master/bin/i386-netbsd/luahbtex
+++ b/Master/bin/i386-netbsd/luahbtex
diff --git a/Master/bin/i386-netbsd/luajithbtex b/Master/bin/i386-netbsd/luajithbtex
index 7cba7424748..cf4d1a1b2ed 100755
--- a/Master/bin/i386-netbsd/luajithbtex
+++ b/Master/bin/i386-netbsd/luajithbtex
diff --git a/Master/bin/i386-netbsd/luajittex b/Master/bin/i386-netbsd/luajittex
index 4f5bd4f4e44..eddd7dd0339 100755
--- a/Master/bin/i386-netbsd/luajittex
+++ b/Master/bin/i386-netbsd/luajittex
diff --git a/Master/bin/i386-netbsd/luatex b/Master/bin/i386-netbsd/luatex
index 425e73f77a7..f4698a3dcef 100755
--- a/Master/bin/i386-netbsd/luatex
+++ b/Master/bin/i386-netbsd/luatex
diff --git a/Master/bin/i386-netbsd/makeindex b/Master/bin/i386-netbsd/makeindex
index ab235666cd2..f5144f915a8 100755
--- a/Master/bin/i386-netbsd/makeindex
+++ b/Master/bin/i386-netbsd/makeindex
diff --git a/Master/bin/i386-netbsd/makejvf b/Master/bin/i386-netbsd/makejvf
index a112808a0e9..ea0b0f31046 100755
--- a/Master/bin/i386-netbsd/makejvf
+++ b/Master/bin/i386-netbsd/makejvf
diff --git a/Master/bin/i386-netbsd/mendex b/Master/bin/i386-netbsd/mendex
index 1ce63cdaee5..87e93106b3f 100755
--- a/Master/bin/i386-netbsd/mendex
+++ b/Master/bin/i386-netbsd/mendex
diff --git a/Master/bin/i386-netbsd/mf b/Master/bin/i386-netbsd/mf
index 76adbdbf392..fda16cd94ce 100755
--- a/Master/bin/i386-netbsd/mf
+++ b/Master/bin/i386-netbsd/mf
diff --git a/Master/bin/i386-netbsd/mf-nowin b/Master/bin/i386-netbsd/mf-nowin
index a79941ae9b8..f7b1b206562 100755
--- a/Master/bin/i386-netbsd/mf-nowin
+++ b/Master/bin/i386-netbsd/mf-nowin
diff --git a/Master/bin/i386-netbsd/mflua b/Master/bin/i386-netbsd/mflua
index 08e1286013f..f5bbe2bd8a7 100755
--- a/Master/bin/i386-netbsd/mflua
+++ b/Master/bin/i386-netbsd/mflua
diff --git a/Master/bin/i386-netbsd/mfluajit b/Master/bin/i386-netbsd/mfluajit
index 49cc68aa7d3..09bf891f949 100755
--- a/Master/bin/i386-netbsd/mfluajit
+++ b/Master/bin/i386-netbsd/mfluajit
diff --git a/Master/bin/i386-netbsd/mft b/Master/bin/i386-netbsd/mft
index 2ce4b162fd7..7cf3ac2f2fb 100755
--- a/Master/bin/i386-netbsd/mft
+++ b/Master/bin/i386-netbsd/mft
diff --git a/Master/bin/i386-netbsd/mpost b/Master/bin/i386-netbsd/mpost
index e1f7c72da26..099e8164f7a 100755
--- a/Master/bin/i386-netbsd/mpost
+++ b/Master/bin/i386-netbsd/mpost
diff --git a/Master/bin/i386-netbsd/odvicopy b/Master/bin/i386-netbsd/odvicopy
index 0a55dbb8710..83cd7764fb2 100755
--- a/Master/bin/i386-netbsd/odvicopy
+++ b/Master/bin/i386-netbsd/odvicopy
diff --git a/Master/bin/i386-netbsd/odvitype b/Master/bin/i386-netbsd/odvitype
index ec913ea51cd..3638b5fee99 100755
--- a/Master/bin/i386-netbsd/odvitype
+++ b/Master/bin/i386-netbsd/odvitype
diff --git a/Master/bin/i386-netbsd/omfonts b/Master/bin/i386-netbsd/omfonts
index 24429a019ef..104376526c1 100755
--- a/Master/bin/i386-netbsd/omfonts
+++ b/Master/bin/i386-netbsd/omfonts
diff --git a/Master/bin/i386-netbsd/otangle b/Master/bin/i386-netbsd/otangle
index a50728b17da..7048bfc71c9 100755
--- a/Master/bin/i386-netbsd/otangle
+++ b/Master/bin/i386-netbsd/otangle
diff --git a/Master/bin/i386-netbsd/otftotfm b/Master/bin/i386-netbsd/otftotfm
index 19bbc19b705..c5b1eb6a7f0 100755
--- a/Master/bin/i386-netbsd/otftotfm
+++ b/Master/bin/i386-netbsd/otftotfm
diff --git a/Master/bin/i386-netbsd/otp2ocp b/Master/bin/i386-netbsd/otp2ocp
index 5c2aa35b01a..1bbce1ba547 100755
--- a/Master/bin/i386-netbsd/otp2ocp
+++ b/Master/bin/i386-netbsd/otp2ocp
diff --git a/Master/bin/i386-netbsd/outocp b/Master/bin/i386-netbsd/outocp
index 0c9535ad815..b081cfb128e 100755
--- a/Master/bin/i386-netbsd/outocp
+++ b/Master/bin/i386-netbsd/outocp
diff --git a/Master/bin/i386-netbsd/pdftex b/Master/bin/i386-netbsd/pdftex
index 54d82722c35..3fee8ab473a 100755
--- a/Master/bin/i386-netbsd/pdftex
+++ b/Master/bin/i386-netbsd/pdftex
diff --git a/Master/bin/i386-netbsd/pktogf b/Master/bin/i386-netbsd/pktogf
index 3fd3fd39a5d..75031860637 100755
--- a/Master/bin/i386-netbsd/pktogf
+++ b/Master/bin/i386-netbsd/pktogf
diff --git a/Master/bin/i386-netbsd/pktype b/Master/bin/i386-netbsd/pktype
index 41ad4c8adb3..96bfb7a6cea 100755
--- a/Master/bin/i386-netbsd/pktype
+++ b/Master/bin/i386-netbsd/pktype
diff --git a/Master/bin/i386-netbsd/pmpost b/Master/bin/i386-netbsd/pmpost
index bbce2015cac..af7dfa8f4c0 100755
--- a/Master/bin/i386-netbsd/pmpost
+++ b/Master/bin/i386-netbsd/pmpost
diff --git a/Master/bin/i386-netbsd/ps2pk b/Master/bin/i386-netbsd/ps2pk
index 2ad8a129dbc..b28ed74c6a2 100755
--- a/Master/bin/i386-netbsd/ps2pk
+++ b/Master/bin/i386-netbsd/ps2pk
diff --git a/Master/bin/i386-netbsd/psnup b/Master/bin/i386-netbsd/psnup
index 48a5239fcfc..84f558e2ebb 100755
--- a/Master/bin/i386-netbsd/psnup
+++ b/Master/bin/i386-netbsd/psnup
diff --git a/Master/bin/i386-netbsd/psresize b/Master/bin/i386-netbsd/psresize
index 09e64365ca1..1f4e4f1a6ab 100755
--- a/Master/bin/i386-netbsd/psresize
+++ b/Master/bin/i386-netbsd/psresize
diff --git a/Master/bin/i386-netbsd/pstops b/Master/bin/i386-netbsd/pstops
index 9c91ef3f73f..99093260dde 100755
--- a/Master/bin/i386-netbsd/pstops
+++ b/Master/bin/i386-netbsd/pstops
diff --git a/Master/bin/i386-netbsd/ptekf b/Master/bin/i386-netbsd/ptekf
index 510db808f75..f7181a91093 100755
--- a/Master/bin/i386-netbsd/ptekf
+++ b/Master/bin/i386-netbsd/ptekf
diff --git a/Master/bin/i386-netbsd/ptex b/Master/bin/i386-netbsd/ptex
index da5a0e6822f..7d58dd848c9 120000
--- a/Master/bin/i386-netbsd/ptex
+++ b/Master/bin/i386-netbsd/ptex
@@ -1 +1 @@
-eptex
\ No newline at end of file
+euptex
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/t4ht b/Master/bin/i386-netbsd/t4ht
index c21b0f4a8e5..275ef380b87 100755
--- a/Master/bin/i386-netbsd/t4ht
+++ b/Master/bin/i386-netbsd/t4ht
diff --git a/Master/bin/i386-netbsd/tangle b/Master/bin/i386-netbsd/tangle
index a79c363db4d..23ff8bb6f92 100755
--- a/Master/bin/i386-netbsd/tangle
+++ b/Master/bin/i386-netbsd/tangle
diff --git a/Master/bin/i386-netbsd/tex b/Master/bin/i386-netbsd/tex
index 74a9a2dd8e5..a74bbca3bf2 100755
--- a/Master/bin/i386-netbsd/tex
+++ b/Master/bin/i386-netbsd/tex
diff --git a/Master/bin/i386-netbsd/tex4ht b/Master/bin/i386-netbsd/tex4ht
index 7a6b6363ce0..354f07aab48 100755
--- a/Master/bin/i386-netbsd/tex4ht
+++ b/Master/bin/i386-netbsd/tex4ht
diff --git a/Master/bin/i386-netbsd/tftopl b/Master/bin/i386-netbsd/tftopl
index 6903b029b81..7733b8f1cc4 100755
--- a/Master/bin/i386-netbsd/tftopl
+++ b/Master/bin/i386-netbsd/tftopl
diff --git a/Master/bin/i386-netbsd/tie b/Master/bin/i386-netbsd/tie
index ed06bf3374f..950543824e2 100755
--- a/Master/bin/i386-netbsd/tie
+++ b/Master/bin/i386-netbsd/tie
diff --git a/Master/bin/i386-netbsd/ttf2afm b/Master/bin/i386-netbsd/ttf2afm
index a94a353bc6b..b3af893370d 100755
--- a/Master/bin/i386-netbsd/ttf2afm
+++ b/Master/bin/i386-netbsd/ttf2afm
diff --git a/Master/bin/i386-netbsd/ttf2pk b/Master/bin/i386-netbsd/ttf2pk
index ad1ac431224..1a884ab1f9e 100755
--- a/Master/bin/i386-netbsd/ttf2pk
+++ b/Master/bin/i386-netbsd/ttf2pk
diff --git a/Master/bin/i386-netbsd/ttf2tfm b/Master/bin/i386-netbsd/ttf2tfm
index 131a77ca7a8..b8690a40e5e 100755
--- a/Master/bin/i386-netbsd/ttf2tfm
+++ b/Master/bin/i386-netbsd/ttf2tfm
diff --git a/Master/bin/i386-netbsd/ttfdump b/Master/bin/i386-netbsd/ttfdump
index 3fc9d5e0ce2..76ef71ba2b4 100755
--- a/Master/bin/i386-netbsd/ttfdump
+++ b/Master/bin/i386-netbsd/ttfdump
diff --git a/Master/bin/i386-netbsd/twill b/Master/bin/i386-netbsd/twill
index 537890e0dde..644f228ee63 100755
--- a/Master/bin/i386-netbsd/twill
+++ b/Master/bin/i386-netbsd/twill
diff --git a/Master/bin/i386-netbsd/twill-refsort b/Master/bin/i386-netbsd/twill-refsort
new file mode 100755
index 00000000000..80d17263dc3
--- /dev/null
+++ b/Master/bin/i386-netbsd/twill-refsort
@@ -0,0 +1,117 @@
+#!/usr/bin/env perl
+# $Id: twill-refsort 69812 2024-02-11 23:09:24Z karl $
+# Public domain.  Originally written by Andreas Scherer, 2023.
+
+use strict;
+use warnings;
+
+use File::Basename;
+use Getopt::Long qw(:config no_ignore_case bundling);
+use Pod::Usage;
+
+my $progname;
+my $collator;
+
+BEGIN {
+  $progname = basename $0;
+  # Unicode::Collate has been around a long time,
+  # but it's not part of core Perl.
+  eval {
+    require Unicode::Collate;
+    $collator = Unicode::Collate->new();
+  };
+}
+
+my $usage = "Usage: $progname < foo.ref > foo.sref\n";
+
+# Standard options for TeX Live.
+Getopt::Long::GetOptions(
+  'help|?'  => \&help_handler,
+  'version' => sub { print version(); exit 0; }
+) or die $usage;
+## help_handler()
+sub help_handler {
+  open(my $pipe, '|-', $ENV{PAGER} || 'less -e') or exit 1;
+  pod2usage(-message => version(), -output => $pipe,
+    -verbose => 99, -sections => "SHORT DESCRIPTION|COPYRIGHT");
+  close $pipe;
+  exit 0;
+}
+## version()
+sub version {
+  return $progname.' $Revision: 69812 $ $Date: 2024-02-12 00:09:24 +0100 (Mon, 12 Feb 2024) $'."\n";
+}
+
+# Read input lines from the console and look for blocks like
+# !127
+# [+ KEY LOCATION TEXPART]*
+# and sort them alphabetically by the KEYs.
+#
+# Every KEY consists of a single PASCAL identifier (variable, type, function,
+# etc.) after an initial '+ ' marker. This marker is replaced with the '\['
+# macro (i.e., '\makeref') to help TeX format the mini-index.
+#
+# The page number in the '!\d+' indicator is appended as argument of the
+# '\donewithpage' macro.
+my %mini_index; # storage for index entries of a two-page spread
+my $donewithpage; # recto page number of a two-page spread
+foreach my $line (<STDIN>)
+{
+  if ($line =~ m/\!(\d+)/) { # start of a new two-page spread
+    if ($donewithpage) { # skip over first indicator line
+      foreach my $key ($collator ?
+        $collator->sort(keys %mini_index) :
+        sort {"\L$a" cmp "\L$b"} keys %mini_index) {
+        print $mini_index{$key};
+      }
+      %mini_index = (); # reset mini-index storage
+      print "\\donewithpage$donewithpage\n"; # done with current spread
+    }
+    $donewithpage = $1; # start of next spread
+  } else { # mini-index entry
+    my (undef,$key) = split / /, $line; # 2nd column is the key
+    $line =~ s/^\+ /\\\[/; # add \makeref macro
+    $mini_index{$key} = $line; # store index entry
+    next; # print later
+  }
+}
+
+print "\\donewithpage$donewithpage\n"; # done with current spread
+
+exit 0;
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+twill-refsort - Sort mini-indexes alphabetically
+
+=head1 SHORT DESCRIPTION
+
+This small Perl script 'twill-refsort' sorts the mini-indexes for each section
+in the '.ref' file created by 'twill foo' (twice) and 'tex foo' (first run).
+It reads its input from STDIN and writes its output to STDOUT.
+
+=over
+
+=item Run TWILL twice on your 'foo'.w, creating 'foo'.tex
+
+=item Invoke "tex 'foo'.tex", creating 'foo'.ref
+
+=item Invoke "twill-refsort < 'foo'.ref > 'foo'.sref"
+
+=item Run TeX on 'foo'.tex a second time
+
+=back
+
+See also "man twill" for more information on how to use the TWILL system.
+
+=head1 COPYRIGHT
+
+Public domain.  Originally written by Andreas Scherer, 2023.
+
+Contemporary development on https://github.com/ascherer/cwebbin.
+
+=cut
diff --git a/Master/bin/i386-netbsd/upbibtex b/Master/bin/i386-netbsd/upbibtex
index 66e17e98aa3..32534e5a2a5 100755
--- a/Master/bin/i386-netbsd/upbibtex
+++ b/Master/bin/i386-netbsd/upbibtex
diff --git a/Master/bin/i386-netbsd/updvitype b/Master/bin/i386-netbsd/updvitype
index 1a29767cd92..c9f7728700d 100755
--- a/Master/bin/i386-netbsd/updvitype
+++ b/Master/bin/i386-netbsd/updvitype
diff --git a/Master/bin/i386-netbsd/upmendex b/Master/bin/i386-netbsd/upmendex
index 99e2e06a466..c7a3897c8d8 100755
--- a/Master/bin/i386-netbsd/upmendex
+++ b/Master/bin/i386-netbsd/upmendex
diff --git a/Master/bin/i386-netbsd/upmpost b/Master/bin/i386-netbsd/upmpost
index b96d71f062a..bb435d8aad5 100755
--- a/Master/bin/i386-netbsd/upmpost
+++ b/Master/bin/i386-netbsd/upmpost
diff --git a/Master/bin/i386-netbsd/uppltotf b/Master/bin/i386-netbsd/uppltotf
index 337eccc3c1f..39fd0dbe9af 100755
--- a/Master/bin/i386-netbsd/uppltotf
+++ b/Master/bin/i386-netbsd/uppltotf
diff --git a/Master/bin/i386-netbsd/uptftopl b/Master/bin/i386-netbsd/uptftopl
index 94dd09caabe..fb859566efe 100755
--- a/Master/bin/i386-netbsd/uptftopl
+++ b/Master/bin/i386-netbsd/uptftopl
diff --git a/Master/bin/i386-netbsd/vftovp b/Master/bin/i386-netbsd/vftovp
index 9c1681bd8b0..8b402cd0456 100755
--- a/Master/bin/i386-netbsd/vftovp
+++ b/Master/bin/i386-netbsd/vftovp
diff --git a/Master/bin/i386-netbsd/weave b/Master/bin/i386-netbsd/weave
index 76f3d8413e1..1213fb7aab4 100755
--- a/Master/bin/i386-netbsd/weave
+++ b/Master/bin/i386-netbsd/weave
diff --git a/Master/bin/i386-netbsd/wofm2opl b/Master/bin/i386-netbsd/wofm2opl
index 2e9631d4951..e401699e288 100755
--- a/Master/bin/i386-netbsd/wofm2opl
+++ b/Master/bin/i386-netbsd/wofm2opl
diff --git a/Master/bin/i386-netbsd/wovf2ovp b/Master/bin/i386-netbsd/wovf2ovp
index f0f2ff3d891..e0a799c25e6 100755
--- a/Master/bin/i386-netbsd/wovf2ovp
+++ b/Master/bin/i386-netbsd/wovf2ovp
diff --git a/Master/bin/i386-netbsd/xdvi-xaw b/Master/bin/i386-netbsd/xdvi-xaw
index 603c3227684..339cd83f0f7 100755
--- a/Master/bin/i386-netbsd/xdvi-xaw
+++ b/Master/bin/i386-netbsd/xdvi-xaw
diff --git a/Master/bin/i386-netbsd/xdvipdfmx b/Master/bin/i386-netbsd/xdvipdfmx
index 7f10984770f..ae8c3740cf9 100755
--- a/Master/bin/i386-netbsd/xdvipdfmx
+++ b/Master/bin/i386-netbsd/xdvipdfmx
diff --git a/Master/bin/i386-netbsd/xetex b/Master/bin/i386-netbsd/xetex
index 89d0e666da1..8b5a6c80662 100755
--- a/Master/bin/i386-netbsd/xetex
+++ b/Master/bin/i386-netbsd/xetex
diff --git a/Master/bin/i386-netbsd/xindy.mem b/Master/bin/i386-netbsd/xindy.mem
index b10cae544f2..4dd4e250f39 100644
--- a/Master/bin/i386-netbsd/xindy.mem
+++ b/Master/bin/i386-netbsd/xindy.mem
diff --git a/Master/bin/i386-netbsd/xindy.run b/Master/bin/i386-netbsd/xindy.run
index 2fd02a10e50..9a04397fd85 100755
--- a/Master/bin/i386-netbsd/xindy.run
+++ b/Master/bin/i386-netbsd/xindy.run