158 files changed, 141 insertions, 3 deletions

diff --git a/Master/bin/i386-freebsd/afm2pl b/Master/bin/i386-freebsd/afm2pl
index 8c645fcbbc6..607871d7171 100755
--- a/Master/bin/i386-freebsd/afm2pl
+++ b/Master/bin/i386-freebsd/afm2pl
diff --git a/Master/bin/i386-freebsd/afm2tfm b/Master/bin/i386-freebsd/afm2tfm
index 7be0a29f664..b67aa1fd6c9 100755
--- a/Master/bin/i386-freebsd/afm2tfm
+++ b/Master/bin/i386-freebsd/afm2tfm
diff --git a/Master/bin/i386-freebsd/aleph b/Master/bin/i386-freebsd/aleph
index ff664400ac1..395906873b7 100755
--- a/Master/bin/i386-freebsd/aleph
+++ b/Master/bin/i386-freebsd/aleph
diff --git a/Master/bin/i386-freebsd/autosp b/Master/bin/i386-freebsd/autosp
index a45370d868d..6311f62dbb3 100755
--- a/Master/bin/i386-freebsd/autosp
+++ b/Master/bin/i386-freebsd/autosp
diff --git a/Master/bin/i386-freebsd/axohelp b/Master/bin/i386-freebsd/axohelp
index 983d919262e..c6dbe819bf3 100755
--- a/Master/bin/i386-freebsd/axohelp
+++ b/Master/bin/i386-freebsd/axohelp
diff --git a/Master/bin/i386-freebsd/bbox b/Master/bin/i386-freebsd/bbox
index 1d9942a2cbd..8c673712553 100755
--- a/Master/bin/i386-freebsd/bbox
+++ b/Master/bin/i386-freebsd/bbox
diff --git a/Master/bin/i386-freebsd/bg5conv b/Master/bin/i386-freebsd/bg5conv
index 4575aba970b..7278ac6da65 100755
--- a/Master/bin/i386-freebsd/bg5conv
+++ b/Master/bin/i386-freebsd/bg5conv
diff --git a/Master/bin/i386-freebsd/bibtex b/Master/bin/i386-freebsd/bibtex
index cf3650ab62d..e33be031160 100755
--- a/Master/bin/i386-freebsd/bibtex
+++ b/Master/bin/i386-freebsd/bibtex
diff --git a/Master/bin/i386-freebsd/bibtex8 b/Master/bin/i386-freebsd/bibtex8
index 203cbb417d3..b8f197236bf 100755
--- a/Master/bin/i386-freebsd/bibtex8
+++ b/Master/bin/i386-freebsd/bibtex8
diff --git a/Master/bin/i386-freebsd/bibtexu b/Master/bin/i386-freebsd/bibtexu
index 7236c886da2..2d05ee98096 100755
--- a/Master/bin/i386-freebsd/bibtexu
+++ b/Master/bin/i386-freebsd/bibtexu
diff --git a/Master/bin/i386-freebsd/cef5conv b/Master/bin/i386-freebsd/cef5conv
index b7508f34458..bfd62c7210f 100755
--- a/Master/bin/i386-freebsd/cef5conv
+++ b/Master/bin/i386-freebsd/cef5conv
diff --git a/Master/bin/i386-freebsd/cefconv b/Master/bin/i386-freebsd/cefconv
index 444d397cb4a..7c6d6f0fa74 100755
--- a/Master/bin/i386-freebsd/cefconv
+++ b/Master/bin/i386-freebsd/cefconv
diff --git a/Master/bin/i386-freebsd/cefsconv b/Master/bin/i386-freebsd/cefsconv
index cb31fc0f35b..3c9aac1861a 100755
--- a/Master/bin/i386-freebsd/cefsconv
+++ b/Master/bin/i386-freebsd/cefsconv
diff --git a/Master/bin/i386-freebsd/cfftot1 b/Master/bin/i386-freebsd/cfftot1
index 323e8ffe1b4..8fc27231923 100755
--- a/Master/bin/i386-freebsd/cfftot1
+++ b/Master/bin/i386-freebsd/cfftot1
diff --git a/Master/bin/i386-freebsd/chkdvifont b/Master/bin/i386-freebsd/chkdvifont
index 2f43ea83fab..26803d6f40f 100755
--- a/Master/bin/i386-freebsd/chkdvifont
+++ b/Master/bin/i386-freebsd/chkdvifont
diff --git a/Master/bin/i386-freebsd/chktex b/Master/bin/i386-freebsd/chktex
index 440eddd3381..ed61df5e90a 100755
--- a/Master/bin/i386-freebsd/chktex
+++ b/Master/bin/i386-freebsd/chktex
diff --git a/Master/bin/i386-freebsd/ctangle b/Master/bin/i386-freebsd/ctangle
index 59c05d8bf45..213432090f0 100755
--- a/Master/bin/i386-freebsd/ctangle
+++ b/Master/bin/i386-freebsd/ctangle
diff --git a/Master/bin/i386-freebsd/ctie b/Master/bin/i386-freebsd/ctie
index c10f9321a07..12ec9eaa8fd 100755
--- a/Master/bin/i386-freebsd/ctie
+++ b/Master/bin/i386-freebsd/ctie
diff --git a/Master/bin/i386-freebsd/ctwill b/Master/bin/i386-freebsd/ctwill
index 44d038adcd2..81c34407747 100755
--- a/Master/bin/i386-freebsd/ctwill
+++ b/Master/bin/i386-freebsd/ctwill
diff --git a/Master/bin/i386-freebsd/ctwill-proofsort b/Master/bin/i386-freebsd/ctwill-proofsort
new file mode 100755
index 00000000000..9dc8d9d9cc7
--- /dev/null
+++ b/Master/bin/i386-freebsd/ctwill-proofsort
@@ -0,0 +1,138 @@
+#!/usr/bin/env perl
+# $Id$
+# 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 < input_file > output_file\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|EXAMPLE|COPYRIGHT");
+  close $pipe;
+  exit 0;
+}
+## version()
+sub version {
+  return $progname.' $Revision$ $Date$'."\n";
+}
+
+# Read input from the console and look for blocks like
+# \mini
+# [LOCATION KEY TEXPART]*
+# }\FI
+# and sort them alphabetically by the KEYs.
+#
+# Every KEY contains a single C identifier (variable, type, function, etc.),
+# either as a single brace-enclosed argument of a TeX control sequence,
+# or as a single identifier in $math_mode$; the latter come from '@f'ormat
+# definitions. All internal backslashes are removed from the KEY before it
+# is used in the storage.
+my %mini_index; # storage for index entries of a section
+my $print_index = 0; # do we collect and print a mini-index?
+foreach my $line (<STDIN>)
+{
+	if ("\\mini\n" eq $line) { # start of mini-index
+		$print_index = 1;
+		%mini_index = (); # reset mini-index storage
+	} elsif ("}\\FI\n" eq $line) { # end of mini-index
+		foreach my $key ($collator ?
+			$collator->sort(keys %mini_index) :
+			sort {"\L$a" cmp "\L$b"} keys %mini_index) {
+			print $mini_index{$key};
+		}
+		$print_index = 0;
+	} elsif ($print_index) { # mini-index entry
+		my (undef,$key) = split / /, $line; # 2nd column is the key
+		$key =~ s/\\//g; # strip internal TeX escape(s)
+		$key =~ m/\w*\{(\w+)\}/; # extract plain key from control seq.
+		$key =~ m/\$(\w+)\$/ unless defined $1; # extract @f TeX key
+		$mini_index{$1} = $line; # store index entry
+		next; # print later
+	}
+
+	print $line;
+}
+
+exit 0;
+
+=pod
+
+=encoding utf8
+
+=head1 NAME
+
+ctwill-proofsort - Sort mini-indexes alphabetically
+
+=head1 SHORT DESCRIPTION
+
+This small Perl script 'ctwill-proofsort' sorts the mini-indexes for each
+section in the TeX file created by 'ctwill +P', i.e., prior to
+formatting with the 'ctproofmac.tex' macros.
+It reads its input from <STDIN> and writes its output to <STDOUT>.
+
+=over
+
+=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 "mv 'input_file'-sorted.tex 'input_file'.tex"
+
+=item Run TeX on 'input_file'.tex
+
+=back
+
+See also "man ctwill" for more information on how to use the CTWILL system,
+both with or without the '+P' option.
+
+=head1 EXAMPLE
+
+Example from MMIX (https://github.com/ascherer/mmix, 'local' branch):
+
+=over
+
+=item $ tie -c mmotype-twill.ch mmotype.{w,ch} mmotype-mini.ch
+
+=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 $ tex mmotype
+
+=back
+
+=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-freebsd/ctwill-refsort b/Master/bin/i386-freebsd/ctwill-refsort
index 6a2b4f797f2..4b11c9987b8 100755
--- a/Master/bin/i386-freebsd/ctwill-refsort
+++ b/Master/bin/i386-freebsd/ctwill-refsort
diff --git a/Master/bin/i386-freebsd/ctwill-twinx b/Master/bin/i386-freebsd/ctwill-twinx
index c592e1a311d..664217ad56f 100755
--- a/Master/bin/i386-freebsd/ctwill-twinx
+++ b/Master/bin/i386-freebsd/ctwill-twinx
diff --git a/Master/bin/i386-freebsd/cweave b/Master/bin/i386-freebsd/cweave
index 921a64fbf5e..935a029f94d 100755
--- a/Master/bin/i386-freebsd/cweave
+++ b/Master/bin/i386-freebsd/cweave
diff --git a/Master/bin/i386-freebsd/detex b/Master/bin/i386-freebsd/detex
index 19424548fc2..860529d5d91 100755
--- a/Master/bin/i386-freebsd/detex
+++ b/Master/bin/i386-freebsd/detex
diff --git a/Master/bin/i386-freebsd/devnag b/Master/bin/i386-freebsd/devnag
index 956cf8c115d..794681017d5 100755
--- a/Master/bin/i386-freebsd/devnag
+++ b/Master/bin/i386-freebsd/devnag
diff --git a/Master/bin/i386-freebsd/disdvi b/Master/bin/i386-freebsd/disdvi
index 0a7d25b2e97..fa5104e72ff 100755
--- a/Master/bin/i386-freebsd/disdvi
+++ b/Master/bin/i386-freebsd/disdvi
diff --git a/Master/bin/i386-freebsd/dt2dv b/Master/bin/i386-freebsd/dt2dv
index f51bebeb52f..d0c7823b918 100755
--- a/Master/bin/i386-freebsd/dt2dv
+++ b/Master/bin/i386-freebsd/dt2dv
diff --git a/Master/bin/i386-freebsd/dv2dt b/Master/bin/i386-freebsd/dv2dt
index d7a3ddcf7a3..ab2424d12f4 100755
--- a/Master/bin/i386-freebsd/dv2dt
+++ b/Master/bin/i386-freebsd/dv2dt
diff --git a/Master/bin/i386-freebsd/dvi2tty b/Master/bin/i386-freebsd/dvi2tty
index ac1e8d7024d..9f380bdeade 100755
--- a/Master/bin/i386-freebsd/dvi2tty
+++ b/Master/bin/i386-freebsd/dvi2tty
diff --git a/Master/bin/i386-freebsd/dvibook b/Master/bin/i386-freebsd/dvibook
index 3b212ec3d9b..fd9bd678d66 100755
--- a/Master/bin/i386-freebsd/dvibook
+++ b/Master/bin/i386-freebsd/dvibook
diff --git a/Master/bin/i386-freebsd/dviconcat b/Master/bin/i386-freebsd/dviconcat
index baaca2c1de4..7fa698c985f 100755
--- a/Master/bin/i386-freebsd/dviconcat
+++ b/Master/bin/i386-freebsd/dviconcat
diff --git a/Master/bin/i386-freebsd/dvicopy b/Master/bin/i386-freebsd/dvicopy
index 0d4ac207697..863e1acc842 100755
--- a/Master/bin/i386-freebsd/dvicopy
+++ b/Master/bin/i386-freebsd/dvicopy
diff --git a/Master/bin/i386-freebsd/dvidvi b/Master/bin/i386-freebsd/dvidvi
index e2982001318..2a675bf5cbb 100755
--- a/Master/bin/i386-freebsd/dvidvi
+++ b/Master/bin/i386-freebsd/dvidvi
diff --git a/Master/bin/i386-freebsd/dvilj b/Master/bin/i386-freebsd/dvilj
index 9f0ebf93355..b423aba9766 100755
--- a/Master/bin/i386-freebsd/dvilj
+++ b/Master/bin/i386-freebsd/dvilj
diff --git a/Master/bin/i386-freebsd/dvilj2p b/Master/bin/i386-freebsd/dvilj2p
index 470a549cef1..5447bbf9f48 100755
--- a/Master/bin/i386-freebsd/dvilj2p
+++ b/Master/bin/i386-freebsd/dvilj2p
diff --git a/Master/bin/i386-freebsd/dvilj4 b/Master/bin/i386-freebsd/dvilj4
index 99bebb3dc5d..34744deb156 100755
--- a/Master/bin/i386-freebsd/dvilj4
+++ b/Master/bin/i386-freebsd/dvilj4
diff --git a/Master/bin/i386-freebsd/dvilj4l b/Master/bin/i386-freebsd/dvilj4l
index c13e6085a43..ffedf59deaf 100755
--- a/Master/bin/i386-freebsd/dvilj4l
+++ b/Master/bin/i386-freebsd/dvilj4l
diff --git a/Master/bin/i386-freebsd/dvipng b/Master/bin/i386-freebsd/dvipng
index 456dff992ba..79c3e5c9226 100755
--- a/Master/bin/i386-freebsd/dvipng
+++ b/Master/bin/i386-freebsd/dvipng
diff --git a/Master/bin/i386-freebsd/dvipos b/Master/bin/i386-freebsd/dvipos
index 1e8d744e1ef..0fa2d10a9a8 100755
--- a/Master/bin/i386-freebsd/dvipos
+++ b/Master/bin/i386-freebsd/dvipos
diff --git a/Master/bin/i386-freebsd/dvips b/Master/bin/i386-freebsd/dvips
index 0f72292dc52..6fe40f0a89d 100755
--- a/Master/bin/i386-freebsd/dvips
+++ b/Master/bin/i386-freebsd/dvips
diff --git a/Master/bin/i386-freebsd/dviselect b/Master/bin/i386-freebsd/dviselect
index a6ddc72bb28..365cdaf4f33 100755
--- a/Master/bin/i386-freebsd/dviselect
+++ b/Master/bin/i386-freebsd/dviselect
diff --git a/Master/bin/i386-freebsd/dvispc b/Master/bin/i386-freebsd/dvispc
index 1ddeb39dc5a..b4c2c75a922 100755
--- a/Master/bin/i386-freebsd/dvispc
+++ b/Master/bin/i386-freebsd/dvispc
diff --git a/Master/bin/i386-freebsd/dvisvgm b/Master/bin/i386-freebsd/dvisvgm
index 51399a6960a..19bc21e5daa 100755
--- a/Master/bin/i386-freebsd/dvisvgm
+++ b/Master/bin/i386-freebsd/dvisvgm
diff --git a/Master/bin/i386-freebsd/dvitodvi b/Master/bin/i386-freebsd/dvitodvi
index f931f646f09..319d4aa361a 100755
--- a/Master/bin/i386-freebsd/dvitodvi
+++ b/Master/bin/i386-freebsd/dvitodvi
diff --git a/Master/bin/i386-freebsd/dvitype b/Master/bin/i386-freebsd/dvitype
index 206e97dc9e9..f005afc3b6f 100755
--- a/Master/bin/i386-freebsd/dvitype
+++ b/Master/bin/i386-freebsd/dvitype
diff --git a/Master/bin/i386-freebsd/epsffit b/Master/bin/i386-freebsd/epsffit
index 0bc862a8286..b82dcafc4e3 100755
--- a/Master/bin/i386-freebsd/epsffit
+++ b/Master/bin/i386-freebsd/epsffit
diff --git a/Master/bin/i386-freebsd/eptex b/Master/bin/i386-freebsd/eptex
index e8f7fc81e12..7d58dd848c9 100755..120000
--- a/Master/bin/i386-freebsd/eptex
+++ b/Master/bin/i386-freebsd/eptex
diff --git a/Master/bin/i386-freebsd/euptex b/Master/bin/i386-freebsd/euptex
index 2a99462f457..95951480622 100755
--- a/Master/bin/i386-freebsd/euptex
+++ b/Master/bin/i386-freebsd/euptex
diff --git a/Master/bin/i386-freebsd/extconv b/Master/bin/i386-freebsd/extconv
index e2971bbaf09..ba6bd7991fd 100755
--- a/Master/bin/i386-freebsd/extconv
+++ b/Master/bin/i386-freebsd/extconv
diff --git a/Master/bin/i386-freebsd/gftodvi b/Master/bin/i386-freebsd/gftodvi
index e89b913e925..f60d9b6b5b7 100755
--- a/Master/bin/i386-freebsd/gftodvi
+++ b/Master/bin/i386-freebsd/gftodvi
diff --git a/Master/bin/i386-freebsd/gftopk b/Master/bin/i386-freebsd/gftopk
index 7631cc7e7ba..4af989eb645 100755
--- a/Master/bin/i386-freebsd/gftopk
+++ b/Master/bin/i386-freebsd/gftopk
diff --git a/Master/bin/i386-freebsd/gftype b/Master/bin/i386-freebsd/gftype
index 39bfde27eba..185fb1f6e23 100755
--- a/Master/bin/i386-freebsd/gftype
+++ b/Master/bin/i386-freebsd/gftype
diff --git a/Master/bin/i386-freebsd/gregorio b/Master/bin/i386-freebsd/gregorio
index cbb572b55c4..8b4ed35c4f1 100755
--- a/Master/bin/i386-freebsd/gregorio
+++ b/Master/bin/i386-freebsd/gregorio
diff --git a/Master/bin/i386-freebsd/gsftopk b/Master/bin/i386-freebsd/gsftopk
index c517a513f35..14b8caa8141 100755
--- a/Master/bin/i386-freebsd/gsftopk
+++ b/Master/bin/i386-freebsd/gsftopk
diff --git a/Master/bin/i386-freebsd/hbf2gf b/Master/bin/i386-freebsd/hbf2gf
index cd39df3ebc4..a6edfd5ede4 100755
--- a/Master/bin/i386-freebsd/hbf2gf
+++ b/Master/bin/i386-freebsd/hbf2gf
diff --git a/Master/bin/i386-freebsd/hishrink b/Master/bin/i386-freebsd/hishrink
index 513474eed77..c711d9481bc 100755
--- a/Master/bin/i386-freebsd/hishrink
+++ b/Master/bin/i386-freebsd/hishrink
diff --git a/Master/bin/i386-freebsd/histretch b/Master/bin/i386-freebsd/histretch
index 57b8f5fef57..c50572dedc3 100755
--- a/Master/bin/i386-freebsd/histretch
+++ b/Master/bin/i386-freebsd/histretch
diff --git a/Master/bin/i386-freebsd/hitex b/Master/bin/i386-freebsd/hitex
index 126b44e09c8..df950848be6 100755
--- a/Master/bin/i386-freebsd/hitex
+++ b/Master/bin/i386-freebsd/hitex
diff --git a/Master/bin/i386-freebsd/kpseaccess b/Master/bin/i386-freebsd/kpseaccess
index 277f2f0cc90..c175c326e28 100755
--- a/Master/bin/i386-freebsd/kpseaccess
+++ b/Master/bin/i386-freebsd/kpseaccess
diff --git a/Master/bin/i386-freebsd/kpsereadlink b/Master/bin/i386-freebsd/kpsereadlink
index 7c94133b19d..8bbf8aba924 100755
--- a/Master/bin/i386-freebsd/kpsereadlink
+++ b/Master/bin/i386-freebsd/kpsereadlink
diff --git a/Master/bin/i386-freebsd/kpsestat b/Master/bin/i386-freebsd/kpsestat
index 585a0e8eeed..4812c7cfc14 100755
--- a/Master/bin/i386-freebsd/kpsestat
+++ b/Master/bin/i386-freebsd/kpsestat
diff --git a/Master/bin/i386-freebsd/kpsewhich b/Master/bin/i386-freebsd/kpsewhich
index f7164ba44a4..b9793889487 100755
--- a/Master/bin/i386-freebsd/kpsewhich
+++ b/Master/bin/i386-freebsd/kpsewhich
diff --git a/Master/bin/i386-freebsd/lacheck b/Master/bin/i386-freebsd/lacheck
index 01098001540..d908329e12d 100755
--- a/Master/bin/i386-freebsd/lacheck
+++ b/Master/bin/i386-freebsd/lacheck
diff --git a/Master/bin/i386-freebsd/luahbtex b/Master/bin/i386-freebsd/luahbtex
index e060f262356..0cf69ce6928 100755
--- a/Master/bin/i386-freebsd/luahbtex
+++ b/Master/bin/i386-freebsd/luahbtex
diff --git a/Master/bin/i386-freebsd/luajithbtex b/Master/bin/i386-freebsd/luajithbtex
index 15188d4d5d6..0387532db85 100755
--- a/Master/bin/i386-freebsd/luajithbtex
+++ b/Master/bin/i386-freebsd/luajithbtex
diff --git a/Master/bin/i386-freebsd/luajittex b/Master/bin/i386-freebsd/luajittex
index 80c1d831255..9915d39cfa6 100755
--- a/Master/bin/i386-freebsd/luajittex
+++ b/Master/bin/i386-freebsd/luajittex
diff --git a/Master/bin/i386-freebsd/luatex b/Master/bin/i386-freebsd/luatex
index 5b7ffd1438e..dfe2600fb20 100755
--- a/Master/bin/i386-freebsd/luatex
+++ b/Master/bin/i386-freebsd/luatex
diff --git a/Master/bin/i386-freebsd/mag b/Master/bin/i386-freebsd/mag
index 6347a869c5b..5f569dd765e 100755
--- a/Master/bin/i386-freebsd/mag
+++ b/Master/bin/i386-freebsd/mag
diff --git a/Master/bin/i386-freebsd/makeindex b/Master/bin/i386-freebsd/makeindex
index 55ac4db6def..5649287d925 100755
--- a/Master/bin/i386-freebsd/makeindex
+++ b/Master/bin/i386-freebsd/makeindex
diff --git a/Master/bin/i386-freebsd/makejvf b/Master/bin/i386-freebsd/makejvf
index 233b9a4f5b6..04f533d2d1d 100755
--- a/Master/bin/i386-freebsd/makejvf
+++ b/Master/bin/i386-freebsd/makejvf
diff --git a/Master/bin/i386-freebsd/mendex b/Master/bin/i386-freebsd/mendex
index 7e588ad251c..f122ff1d2a4 100755
--- a/Master/bin/i386-freebsd/mendex
+++ b/Master/bin/i386-freebsd/mendex
diff --git a/Master/bin/i386-freebsd/mf b/Master/bin/i386-freebsd/mf
index 04123d67f3d..d6ff03bd8f1 100755
--- a/Master/bin/i386-freebsd/mf
+++ b/Master/bin/i386-freebsd/mf
diff --git a/Master/bin/i386-freebsd/mf-nowin b/Master/bin/i386-freebsd/mf-nowin
index 58adfbd9381..19a91dae88b 100755
--- a/Master/bin/i386-freebsd/mf-nowin
+++ b/Master/bin/i386-freebsd/mf-nowin
diff --git a/Master/bin/i386-freebsd/mflua b/Master/bin/i386-freebsd/mflua
index 793808c6c8c..c24b6adb6f2 100755
--- a/Master/bin/i386-freebsd/mflua
+++ b/Master/bin/i386-freebsd/mflua
diff --git a/Master/bin/i386-freebsd/mfluajit b/Master/bin/i386-freebsd/mfluajit
index 0d453a52e45..4215339b223 100755
--- a/Master/bin/i386-freebsd/mfluajit
+++ b/Master/bin/i386-freebsd/mfluajit
diff --git a/Master/bin/i386-freebsd/mft b/Master/bin/i386-freebsd/mft
index 7aba1ed841a..bf34b4677db 100755
--- a/Master/bin/i386-freebsd/mft
+++ b/Master/bin/i386-freebsd/mft
diff --git a/Master/bin/i386-freebsd/mkindex b/Master/bin/i386-freebsd/mkindex
index 7e6c57fa196..60a237beb54 100755
--- a/Master/bin/i386-freebsd/mkindex
+++ b/Master/bin/i386-freebsd/mkindex
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: mkindex 52596 2019-11-01 18:11:31Z karl $
+# $Id$
 # Public domain. Originally written by Thomas Esser around 2001..
 
 test -f /bin/sh5 && test -z "$RUNNING_SH5" \
diff --git a/Master/bin/i386-freebsd/mktexlsr b/Master/bin/i386-freebsd/mktexlsr
index a36378a2b9f..ae516694ea0 120000
--- a/Master/bin/i386-freebsd/mktexlsr
+++ b/Master/bin/i386-freebsd/mktexlsr
@@ -1 +1 @@
-../../texmf-dist/scripts/texlive/mktexlsr
\ No newline at end of file
+../../texmf-dist/scripts/texlive/mktexlsr.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/mmafm b/Master/bin/i386-freebsd/mmafm
index 59c0ccd10fc..3259f756d90 100755
--- a/Master/bin/i386-freebsd/mmafm
+++ b/Master/bin/i386-freebsd/mmafm
diff --git a/Master/bin/i386-freebsd/mmpfb b/Master/bin/i386-freebsd/mmpfb
index b97d46af621..0e5e88816fc 100755
--- a/Master/bin/i386-freebsd/mmpfb
+++ b/Master/bin/i386-freebsd/mmpfb
diff --git a/Master/bin/i386-freebsd/mpost b/Master/bin/i386-freebsd/mpost
index 3ae731a523e..347aab1759b 100755
--- a/Master/bin/i386-freebsd/mpost
+++ b/Master/bin/i386-freebsd/mpost
diff --git a/Master/bin/i386-freebsd/msxlint b/Master/bin/i386-freebsd/msxlint
index 8f35dd03c15..3b32c60a4bf 100755
--- a/Master/bin/i386-freebsd/msxlint
+++ b/Master/bin/i386-freebsd/msxlint
diff --git a/Master/bin/i386-freebsd/odvicopy b/Master/bin/i386-freebsd/odvicopy
index 84eaecd6e1e..76dbdbaab1e 100755
--- a/Master/bin/i386-freebsd/odvicopy
+++ b/Master/bin/i386-freebsd/odvicopy
diff --git a/Master/bin/i386-freebsd/odvitype b/Master/bin/i386-freebsd/odvitype
index fe8ad000c04..cad20bd8d15 100755
--- a/Master/bin/i386-freebsd/odvitype
+++ b/Master/bin/i386-freebsd/odvitype
diff --git a/Master/bin/i386-freebsd/omfonts b/Master/bin/i386-freebsd/omfonts
index 9d19dff72da..c1a63a8b6c0 100755
--- a/Master/bin/i386-freebsd/omfonts
+++ b/Master/bin/i386-freebsd/omfonts
diff --git a/Master/bin/i386-freebsd/otangle b/Master/bin/i386-freebsd/otangle
index 26aa4db5f69..3ce87e05704 100755
--- a/Master/bin/i386-freebsd/otangle
+++ b/Master/bin/i386-freebsd/otangle
diff --git a/Master/bin/i386-freebsd/otfinfo b/Master/bin/i386-freebsd/otfinfo
index 1cadc4d1a15..4b33c49e7e0 100755
--- a/Master/bin/i386-freebsd/otfinfo
+++ b/Master/bin/i386-freebsd/otfinfo
diff --git a/Master/bin/i386-freebsd/otftotfm b/Master/bin/i386-freebsd/otftotfm
index 406ff427e55..06579f8fe3c 100755
--- a/Master/bin/i386-freebsd/otftotfm
+++ b/Master/bin/i386-freebsd/otftotfm
diff --git a/Master/bin/i386-freebsd/otp2ocp b/Master/bin/i386-freebsd/otp2ocp
index 922150b4aa7..338d8b343d8 100755
--- a/Master/bin/i386-freebsd/otp2ocp
+++ b/Master/bin/i386-freebsd/otp2ocp
diff --git a/Master/bin/i386-freebsd/outocp b/Master/bin/i386-freebsd/outocp
index 8b3244de45b..68594066ec3 100755
--- a/Master/bin/i386-freebsd/outocp
+++ b/Master/bin/i386-freebsd/outocp
diff --git a/Master/bin/i386-freebsd/patgen b/Master/bin/i386-freebsd/patgen
index 0dce3c038bc..9fd88f830dd 100755
--- a/Master/bin/i386-freebsd/patgen
+++ b/Master/bin/i386-freebsd/patgen
diff --git a/Master/bin/i386-freebsd/pdfclose b/Master/bin/i386-freebsd/pdfclose
index 35643a72e30..99692b41ca3 100755
--- a/Master/bin/i386-freebsd/pdfclose
+++ b/Master/bin/i386-freebsd/pdfclose
diff --git a/Master/bin/i386-freebsd/pdfopen b/Master/bin/i386-freebsd/pdfopen
index dae776ddd7c..523c9bd40ea 100755
--- a/Master/bin/i386-freebsd/pdfopen
+++ b/Master/bin/i386-freebsd/pdfopen
diff --git a/Master/bin/i386-freebsd/pdftex b/Master/bin/i386-freebsd/pdftex
index 141152f3233..b08ef3dad9e 100755
--- a/Master/bin/i386-freebsd/pdftex
+++ b/Master/bin/i386-freebsd/pdftex
diff --git a/Master/bin/i386-freebsd/pdftosrc b/Master/bin/i386-freebsd/pdftosrc
index 565688183c5..aff72c5c48b 100755
--- a/Master/bin/i386-freebsd/pdftosrc
+++ b/Master/bin/i386-freebsd/pdftosrc
diff --git a/Master/bin/i386-freebsd/pfb2pfa b/Master/bin/i386-freebsd/pfb2pfa
index 60a8cc66a9e..772a72043b2 100755
--- a/Master/bin/i386-freebsd/pfb2pfa
+++ b/Master/bin/i386-freebsd/pfb2pfa
diff --git a/Master/bin/i386-freebsd/pk2bm b/Master/bin/i386-freebsd/pk2bm
index 8d4c3b9f2fb..f5657a3afa9 100755
--- a/Master/bin/i386-freebsd/pk2bm
+++ b/Master/bin/i386-freebsd/pk2bm
diff --git a/Master/bin/i386-freebsd/pktogf b/Master/bin/i386-freebsd/pktogf
index 5de5d91927b..4555778ca5a 100755
--- a/Master/bin/i386-freebsd/pktogf
+++ b/Master/bin/i386-freebsd/pktogf
diff --git a/Master/bin/i386-freebsd/pktype b/Master/bin/i386-freebsd/pktype
index 2eb02ddc5ef..dcf529bb2af 100755
--- a/Master/bin/i386-freebsd/pktype
+++ b/Master/bin/i386-freebsd/pktype
diff --git a/Master/bin/i386-freebsd/pltotf b/Master/bin/i386-freebsd/pltotf
index f4d05ea1635..ac4687980a3 100755
--- a/Master/bin/i386-freebsd/pltotf
+++ b/Master/bin/i386-freebsd/pltotf
diff --git a/Master/bin/i386-freebsd/pmpost b/Master/bin/i386-freebsd/pmpost
index 8aac8667615..42d435f1095 100755
--- a/Master/bin/i386-freebsd/pmpost
+++ b/Master/bin/i386-freebsd/pmpost
diff --git a/Master/bin/i386-freebsd/pmxab b/Master/bin/i386-freebsd/pmxab
index 8f88d9005bc..e55fbd263cf 100755
--- a/Master/bin/i386-freebsd/pmxab
+++ b/Master/bin/i386-freebsd/pmxab
diff --git a/Master/bin/i386-freebsd/pooltype b/Master/bin/i386-freebsd/pooltype
index 21e0b39656a..270ca632f9d 100755
--- a/Master/bin/i386-freebsd/pooltype
+++ b/Master/bin/i386-freebsd/pooltype
diff --git a/Master/bin/i386-freebsd/prepmx b/Master/bin/i386-freebsd/prepmx
index a1ba27d7f07..153c8c8c6a4 100755
--- a/Master/bin/i386-freebsd/prepmx
+++ b/Master/bin/i386-freebsd/prepmx
diff --git a/Master/bin/i386-freebsd/ps2pk b/Master/bin/i386-freebsd/ps2pk
index 13ae93924fe..be899a35131 100755
--- a/Master/bin/i386-freebsd/ps2pk
+++ b/Master/bin/i386-freebsd/ps2pk
diff --git a/Master/bin/i386-freebsd/psbook b/Master/bin/i386-freebsd/psbook
index 38ca86709e9..e55767184f9 100755
--- a/Master/bin/i386-freebsd/psbook
+++ b/Master/bin/i386-freebsd/psbook
diff --git a/Master/bin/i386-freebsd/psnup b/Master/bin/i386-freebsd/psnup
index 9b03fc1f2d1..f4babf12727 100755
--- a/Master/bin/i386-freebsd/psnup
+++ b/Master/bin/i386-freebsd/psnup
diff --git a/Master/bin/i386-freebsd/psresize b/Master/bin/i386-freebsd/psresize
index dfc908f938f..fef8bd8fa66 100755
--- a/Master/bin/i386-freebsd/psresize
+++ b/Master/bin/i386-freebsd/psresize
diff --git a/Master/bin/i386-freebsd/psselect b/Master/bin/i386-freebsd/psselect
index 14a68b63e43..9a3dc1eb2db 100755
--- a/Master/bin/i386-freebsd/psselect
+++ b/Master/bin/i386-freebsd/psselect
diff --git a/Master/bin/i386-freebsd/pstops b/Master/bin/i386-freebsd/pstops
index fa81011f6ab..3128fc41652 100755
--- a/Master/bin/i386-freebsd/pstops
+++ b/Master/bin/i386-freebsd/pstops
diff --git a/Master/bin/i386-freebsd/ptekf b/Master/bin/i386-freebsd/ptekf
new file mode 100755
index 00000000000..5fc6e82ab33
--- /dev/null
+++ b/Master/bin/i386-freebsd/ptekf
diff --git a/Master/bin/i386-freebsd/scor2prt b/Master/bin/i386-freebsd/scor2prt
index 4482fd01a87..0d1bfb77bdb 100755
--- a/Master/bin/i386-freebsd/scor2prt
+++ b/Master/bin/i386-freebsd/scor2prt
diff --git a/Master/bin/i386-freebsd/sjisconv b/Master/bin/i386-freebsd/sjisconv
index 0eec6e9b8a9..21cd4ccb4c4 100755
--- a/Master/bin/i386-freebsd/sjisconv
+++ b/Master/bin/i386-freebsd/sjisconv
diff --git a/Master/bin/i386-freebsd/synctex b/Master/bin/i386-freebsd/synctex
index 6540c10fff5..e93137278c5 100755
--- a/Master/bin/i386-freebsd/synctex
+++ b/Master/bin/i386-freebsd/synctex
diff --git a/Master/bin/i386-freebsd/t1ascii b/Master/bin/i386-freebsd/t1ascii
index cad6622cb0d..8323d45334d 100755
--- a/Master/bin/i386-freebsd/t1ascii
+++ b/Master/bin/i386-freebsd/t1ascii
diff --git a/Master/bin/i386-freebsd/t1asm b/Master/bin/i386-freebsd/t1asm
index 935952eaca3..bca9b783eb2 100755
--- a/Master/bin/i386-freebsd/t1asm
+++ b/Master/bin/i386-freebsd/t1asm
diff --git a/Master/bin/i386-freebsd/t1binary b/Master/bin/i386-freebsd/t1binary
index 682ff39e759..69898a7855a 100755
--- a/Master/bin/i386-freebsd/t1binary
+++ b/Master/bin/i386-freebsd/t1binary
diff --git a/Master/bin/i386-freebsd/t1disasm b/Master/bin/i386-freebsd/t1disasm
index 1d866c25206..7910b693b85 100755
--- a/Master/bin/i386-freebsd/t1disasm
+++ b/Master/bin/i386-freebsd/t1disasm
diff --git a/Master/bin/i386-freebsd/t1dotlessj b/Master/bin/i386-freebsd/t1dotlessj
index 24684503cc5..15290bdd118 100755
--- a/Master/bin/i386-freebsd/t1dotlessj
+++ b/Master/bin/i386-freebsd/t1dotlessj
diff --git a/Master/bin/i386-freebsd/t1lint b/Master/bin/i386-freebsd/t1lint
index 6e7888292b6..86089e3d293 100755
--- a/Master/bin/i386-freebsd/t1lint
+++ b/Master/bin/i386-freebsd/t1lint
diff --git a/Master/bin/i386-freebsd/t1mac b/Master/bin/i386-freebsd/t1mac
index 98822f86a82..50ccff245fb 100755
--- a/Master/bin/i386-freebsd/t1mac
+++ b/Master/bin/i386-freebsd/t1mac
diff --git a/Master/bin/i386-freebsd/t1rawafm b/Master/bin/i386-freebsd/t1rawafm
index e54b12bf1fd..1f0f267ef7e 100755
--- a/Master/bin/i386-freebsd/t1rawafm
+++ b/Master/bin/i386-freebsd/t1rawafm
diff --git a/Master/bin/i386-freebsd/t1reencode b/Master/bin/i386-freebsd/t1reencode
index bd9e957a6fa..447d1bcda78 100755
--- a/Master/bin/i386-freebsd/t1reencode
+++ b/Master/bin/i386-freebsd/t1reencode
diff --git a/Master/bin/i386-freebsd/t1testpage b/Master/bin/i386-freebsd/t1testpage
index fbb1dc3ea8c..2bddf3fb589 100755
--- a/Master/bin/i386-freebsd/t1testpage
+++ b/Master/bin/i386-freebsd/t1testpage
diff --git a/Master/bin/i386-freebsd/t1unmac b/Master/bin/i386-freebsd/t1unmac
index fd209263231..803393841de 100755
--- a/Master/bin/i386-freebsd/t1unmac
+++ b/Master/bin/i386-freebsd/t1unmac
diff --git a/Master/bin/i386-freebsd/t4ht b/Master/bin/i386-freebsd/t4ht
index d5b0f5a555c..ed5ce9fc027 100755
--- a/Master/bin/i386-freebsd/t4ht
+++ b/Master/bin/i386-freebsd/t4ht
diff --git a/Master/bin/i386-freebsd/tangle b/Master/bin/i386-freebsd/tangle
index 2a57ab45ebc..c6e9e7082ef 100755
--- a/Master/bin/i386-freebsd/tangle
+++ b/Master/bin/i386-freebsd/tangle
diff --git a/Master/bin/i386-freebsd/teckit_compile b/Master/bin/i386-freebsd/teckit_compile
index f108fe6fd0b..9d90ed84568 100755
--- a/Master/bin/i386-freebsd/teckit_compile
+++ b/Master/bin/i386-freebsd/teckit_compile
diff --git a/Master/bin/i386-freebsd/tex b/Master/bin/i386-freebsd/tex
index 7ebfe807409..1eccc3e3738 100755
--- a/Master/bin/i386-freebsd/tex
+++ b/Master/bin/i386-freebsd/tex
diff --git a/Master/bin/i386-freebsd/tex2aspc b/Master/bin/i386-freebsd/tex2aspc
index b98e3a062f4..51b4a61716f 100755
--- a/Master/bin/i386-freebsd/tex2aspc
+++ b/Master/bin/i386-freebsd/tex2aspc
diff --git a/Master/bin/i386-freebsd/tex4ht b/Master/bin/i386-freebsd/tex4ht
index 43f42bcba59..880d071520b 100755
--- a/Master/bin/i386-freebsd/tex4ht
+++ b/Master/bin/i386-freebsd/tex4ht
diff --git a/Master/bin/i386-freebsd/tftopl b/Master/bin/i386-freebsd/tftopl
index 6d33a94ee6e..0632f0a5496 100755
--- a/Master/bin/i386-freebsd/tftopl
+++ b/Master/bin/i386-freebsd/tftopl
diff --git a/Master/bin/i386-freebsd/tie b/Master/bin/i386-freebsd/tie
index 2c8880c230f..58b00fa86d8 100755
--- a/Master/bin/i386-freebsd/tie
+++ b/Master/bin/i386-freebsd/tie
diff --git a/Master/bin/i386-freebsd/tpic2pdftex b/Master/bin/i386-freebsd/tpic2pdftex
index cd67803b979..ecdf35d6b2b 100755
--- a/Master/bin/i386-freebsd/tpic2pdftex
+++ b/Master/bin/i386-freebsd/tpic2pdftex
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $Id: tpic2pdftex 29534 2013-03-27 23:56:34Z karl $
+# $Id$
 #
 # Experimental awk-script for conversion of tpic \specials as produced
 # by (groff-)pic into pdfTeX \pdfliteral sections for further processing
diff --git a/Master/bin/i386-freebsd/ttf2afm b/Master/bin/i386-freebsd/ttf2afm
index 8006b833447..ebbe2bd469f 100755
--- a/Master/bin/i386-freebsd/ttf2afm
+++ b/Master/bin/i386-freebsd/ttf2afm
diff --git a/Master/bin/i386-freebsd/ttf2pk b/Master/bin/i386-freebsd/ttf2pk
index c5337976c6c..c7413ed8577 100755
--- a/Master/bin/i386-freebsd/ttf2pk
+++ b/Master/bin/i386-freebsd/ttf2pk
diff --git a/Master/bin/i386-freebsd/ttf2tfm b/Master/bin/i386-freebsd/ttf2tfm
index 01f074b5236..c16c3252215 100755
--- a/Master/bin/i386-freebsd/ttf2tfm
+++ b/Master/bin/i386-freebsd/ttf2tfm
diff --git a/Master/bin/i386-freebsd/ttfdump b/Master/bin/i386-freebsd/ttfdump
index 541b7e079f6..a225ebb4142 100755
--- a/Master/bin/i386-freebsd/ttfdump
+++ b/Master/bin/i386-freebsd/ttfdump
diff --git a/Master/bin/i386-freebsd/ttftotype42 b/Master/bin/i386-freebsd/ttftotype42
index 81436e054b4..ea63a6c1972 100755
--- a/Master/bin/i386-freebsd/ttftotype42
+++ b/Master/bin/i386-freebsd/ttftotype42
diff --git a/Master/bin/i386-freebsd/twill b/Master/bin/i386-freebsd/twill
index b9abe9654d1..e38d4b22b13 100755
--- a/Master/bin/i386-freebsd/twill
+++ b/Master/bin/i386-freebsd/twill
diff --git a/Master/bin/i386-freebsd/upbibtex b/Master/bin/i386-freebsd/upbibtex
index d963538c79d..af8db9c01e7 100755
--- a/Master/bin/i386-freebsd/upbibtex
+++ b/Master/bin/i386-freebsd/upbibtex
diff --git a/Master/bin/i386-freebsd/updvitype b/Master/bin/i386-freebsd/updvitype
index f775d62488b..b27a05f067f 100755
--- a/Master/bin/i386-freebsd/updvitype
+++ b/Master/bin/i386-freebsd/updvitype
diff --git a/Master/bin/i386-freebsd/upmendex b/Master/bin/i386-freebsd/upmendex
index c2b21ee16bd..b3ce11317cd 100755
--- a/Master/bin/i386-freebsd/upmendex
+++ b/Master/bin/i386-freebsd/upmendex
diff --git a/Master/bin/i386-freebsd/upmpost b/Master/bin/i386-freebsd/upmpost
index 0794cc887e0..3b6891fc1cd 100755
--- a/Master/bin/i386-freebsd/upmpost
+++ b/Master/bin/i386-freebsd/upmpost
diff --git a/Master/bin/i386-freebsd/uppltotf b/Master/bin/i386-freebsd/uppltotf
index 9e5135deee1..126f1020270 100755
--- a/Master/bin/i386-freebsd/uppltotf
+++ b/Master/bin/i386-freebsd/uppltotf
diff --git a/Master/bin/i386-freebsd/uptftopl b/Master/bin/i386-freebsd/uptftopl
index c6e809f41a0..07629e6e05e 100755
--- a/Master/bin/i386-freebsd/uptftopl
+++ b/Master/bin/i386-freebsd/uptftopl
diff --git a/Master/bin/i386-freebsd/vftovp b/Master/bin/i386-freebsd/vftovp
index 79ffbfb13ec..54ecbff1e16 100755
--- a/Master/bin/i386-freebsd/vftovp
+++ b/Master/bin/i386-freebsd/vftovp
diff --git a/Master/bin/i386-freebsd/vlna b/Master/bin/i386-freebsd/vlna
index 863f59c02a6..cf9a28493f2 100755
--- a/Master/bin/i386-freebsd/vlna
+++ b/Master/bin/i386-freebsd/vlna
diff --git a/Master/bin/i386-freebsd/vptovf b/Master/bin/i386-freebsd/vptovf
index 34be3dc4f64..3a776ffe1f7 100755
--- a/Master/bin/i386-freebsd/vptovf
+++ b/Master/bin/i386-freebsd/vptovf
diff --git a/Master/bin/i386-freebsd/weave b/Master/bin/i386-freebsd/weave
index 2d5ec7c2263..021c15b8217 100755
--- a/Master/bin/i386-freebsd/weave
+++ b/Master/bin/i386-freebsd/weave
diff --git a/Master/bin/i386-freebsd/wofm2opl b/Master/bin/i386-freebsd/wofm2opl
index e8ad8676964..b95492fd72d 100755
--- a/Master/bin/i386-freebsd/wofm2opl
+++ b/Master/bin/i386-freebsd/wofm2opl
diff --git a/Master/bin/i386-freebsd/wopl2ofm b/Master/bin/i386-freebsd/wopl2ofm
index e6f73e69ea7..4bee1d69444 100755
--- a/Master/bin/i386-freebsd/wopl2ofm
+++ b/Master/bin/i386-freebsd/wopl2ofm
diff --git a/Master/bin/i386-freebsd/wovf2ovp b/Master/bin/i386-freebsd/wovf2ovp
index f6e0955aa8f..52f621349b5 100755
--- a/Master/bin/i386-freebsd/wovf2ovp
+++ b/Master/bin/i386-freebsd/wovf2ovp
diff --git a/Master/bin/i386-freebsd/wovp2ovf b/Master/bin/i386-freebsd/wovp2ovf
index 1592ad24ea3..c54b796e564 100755
--- a/Master/bin/i386-freebsd/wovp2ovf
+++ b/Master/bin/i386-freebsd/wovp2ovf
diff --git a/Master/bin/i386-freebsd/xdvi-xaw b/Master/bin/i386-freebsd/xdvi-xaw
index 1cf76b6b39f..3ad0849a0ab 100755
--- a/Master/bin/i386-freebsd/xdvi-xaw
+++ b/Master/bin/i386-freebsd/xdvi-xaw
diff --git a/Master/bin/i386-freebsd/xdvipdfmx b/Master/bin/i386-freebsd/xdvipdfmx
index 54759a8898d..cd7a3191753 100755
--- a/Master/bin/i386-freebsd/xdvipdfmx
+++ b/Master/bin/i386-freebsd/xdvipdfmx
diff --git a/Master/bin/i386-freebsd/xetex b/Master/bin/i386-freebsd/xetex
index a6c56c8007f..919bc5f86b2 100755
--- a/Master/bin/i386-freebsd/xetex
+++ b/Master/bin/i386-freebsd/xetex
diff --git a/Master/bin/i386-freebsd/xml2pmx b/Master/bin/i386-freebsd/xml2pmx
index 2aa96181af4..e1dbcafae7e 100755
--- a/Master/bin/i386-freebsd/xml2pmx
+++ b/Master/bin/i386-freebsd/xml2pmx