-min-crossrefs needs .aux removal; other doc tweaks

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

11 files changed, 413 insertions, 423 deletions

diff --git a/Build/source/doc/tlbuild.info b/Build/source/doc/tlbuild.info
index ade20e87cd9..786881058df 100644
--- a/Build/source/doc/tlbuild.info
+++ b/Build/source/doc/tlbuild.info
@@ -76,13 +76,13 @@ information for different systems, along with
    For information on acquiring the TL sources, see
 <http://tug.org/texlive/svn>.
 
-   This manual does not duplicate the (primarily user-level) information
-found in other TL documentation resources, such as:
+   This manual does not duplicate the information found in other TL
+documentation resources, such as:
 
    * The TeX Live web pages: <http://tug.org/texlive>.
 
-   * The web page with an overview of how to build the binaries which
-     are distributed with TeX Live: <http://tug.org/texlive/build.html>.
+   * The web page describing how to build the binaries which are
+     distributed with TeX Live: <http://tug.org/texlive/build.html>.
 
    * The TeX Live user manual: <http://tug.org/texlive/doc.html>, or run
      'texdoc texlive'.
@@ -5072,312 +5072,312 @@ Index
 Tag Table:
 Node: Top1208
 Node: Introduction2183
-Node: Overview of build system3938
-Node: Prerequisites5981
-Node: Building8379
-Node: Build iteration9627
-Node: Build problems10699
-Node: Build in parallel11102
-Node: Build distribution11694
-Node: Build one package12265
-Node: Installing15617
-Node: Installation directories16632
-Node: Linked scripts18448
-Node: Distro builds19929
-Node: Layout and infrastructure22319
-Node: Build system tools23147
-Node: Top-level directories25158
-Node: Autoconf macros27572
-Node: General setup macros28273
-Node: Macros for programs29140
-Node: Macros for compilers29952
-Node: Macros for libraries31386
-Node: Macros for library and header flags31812
-Node: Macros for Windows33692
-Node: Library modules35269
-Node: png library35758
-Node: zlib library38032
-Node: freetype library38547
-Node: kpathsea library39075
-Node: Program modules40474
-Node: t1utils package40902
-Node: xindy package41453
-Node: xdvik package42603
-Node: asymptote43676
-Node: Extending TeX Live44127
-Node: Adding a new program module44904
-Node: Adding a new generic library module48199
-Node: Adding a new TeX-specific library module50412
-Node: Configure options51099
-Node: Global configure options52481
-Node: --disable-native-texlive-build53023
-Node: --prefix --bindir ...54013
-Node: --disable-largefile54553
-Node: --disable-missing55238
-Node: --enable-compiler-warnings=LEVEL55639
-Node: --enable-cxx-runtime-hack56378
-Node: --enable-maintainer-mode56805
-Node: --enable-multiplatform57334
-Node: --enable-shared57872
-Node: --enable-silent-rules58243
-Node: --without-ln-s58699
-Node: --without-x59050
-Node: Program-specific configure options59238
-Node: --enable-PROG --disable-PROG59881
-Node: --disable-all-pkgs60158
-Node: Configure options for texk/web2c61144
-Node: Configure options for texk/bibtex-x63662
-Node: Configure options for texk/dvipdfm-x64205
-Node: Configure options for texk/dvisvgm64978
-Node: Configure options for texk/texlive65864
-Node: Configure options for texk/xdvik66285
-Node: Configure options for utils/xindy66889
-Node: Library-specific configure options67790
-Node: Configure options for kpathsea68801
-Node: Configure options for system poppler69510
-Node: Variables for configure70301
-Node: Cross compilation71729
-Node: Cross configuring73028
-Node: Cross problems74701
-Node: Coding conventions76348
-Node: Declarations and definitions77087
-Node: Const79269
-Node: Continuous integration81132
-Node: install-tl84666
-Node: install-tl NAME85011
-Node: install-tl SYNOPSIS85169
-Node: install-tl DESCRIPTION85377
-Node: install-tl REFERENCES86378
-Node: install-tl OPTIONS86894
-Ref: install-tl *-gui* [[=]_module_]87248
-Ref: install-tl text87457
-Ref: install-tl wizard87580
-Ref: install-tl perltk87734
-Ref: install-tl *-no-gui*88168
-Ref: install-tl *-lang* _llcode_88249
-Ref: install-tl *-repository* _url|path_88936
-Ref: install-tl *-select-repository*90747
-Ref: install-tl *-all-options*91183
-Ref: install-tl *-custom-bin* _path_91490
-Ref: install-tl *-debug-translation*92145
-Ref: install-tl *-force-platform* _platform_92364
-Ref: install-tl *-help*, *--help*, *-?*92608
-Ref: install-tl *-in-place*93001
-Ref: install-tl *-logfile* _file_93528
-Ref: install-tl *-no-cls*93879
-Ref: install-tl *-non-admin*94010
-Ref: install-tl *--persistent-downloads*94115
-Ref: install-tl *--no-persistent-downloads*94143
-Ref: install-tl *-portable*94751
-Ref: install-tl *-print-platform*94890
-Ref: install-tl *-profile* _profile_95083
-Ref: install-tl *-q*96577
-Ref: install-tl *-scheme* _scheme_96639
-Ref: install-tl *-v*97113
-Ref: install-tl *-version*, *--version*97274
-Node: install-tl ENVIRONMENT VARIABLES97405
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK97794
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE97996
-Ref: install-tl TEXLIVE_INSTALL_PREFIX98102
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG98133
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME98162
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL98192
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG98226
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR98257
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR98285
-Ref: install-tl NOPERLDOC98340
-Node: install-tl AUTHORS AND COPYRIGHT98404
-Node: tlmgr98762
-Node: tlmgr NAME99199
-Node: tlmgr SYNOPSIS99324
-Node: tlmgr DESCRIPTION99514
-Node: tlmgr EXAMPLES100610
-Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet100901
-Ref: tlmgr tlmgr update --list101082
-Ref: tlmgr tlmgr update --all101175
-Ref: tlmgr tlmgr info _pkg_101331
-Node: tlmgr OPTIONS101537
-Ref: tlmgr *--repository* _url|path_102057
-Ref: tlmgr *--gui* [_action_]102782
-Ref: tlmgr *--gui-lang* _llcode_103189
-Ref: tlmgr *--debug-translation*103872
-Ref: tlmgr *--machine-readable*104075
-Ref: tlmgr *--no-execute-actions*104343
-Ref: tlmgr *--package-logfile* _file_104536
-Ref: tlmgr *--pause*104791
-Ref: tlmgr *--persistent-downloads*104946
-Ref: tlmgr *--no-persistent-downloads*104974
-Ref: tlmgr *--pin-file*105468
-Ref: tlmgr *--usermode*105686
-Ref: tlmgr *--usertree* _dir_105806
-Node: tlmgr ACTIONS106356
-Node: tlmgr help107588
-Node: tlmgr version108064
-Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...108382
-Ref: tlmgr *--backupdir* _directory_109476
-Ref: tlmgr *--all*109673
-Ref: tlmgr *--clean*[=_N_]109895
-Ref: tlmgr *--dry-run*110192
-Node: tlmgr candidates _pkg_110312
-Ref: tlmgr *candidates _pkg_* 1110599
-Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]110743
-Ref: tlmgr *files*111186
-Ref: tlmgr *depends*111321
-Ref: tlmgr *executes*111663
-Ref: tlmgr *runfiles*111781
-Ref: tlmgr *--use-svn*111893
-Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]112010
-Node: tlmgr dump-tlpdb [--local|--remote]114082
-Ref: tlmgr *--local*114592
-Ref: tlmgr *--remote*114631
-Node: tlmgr generate [_option_]... _what_115053
-Ref: tlmgr *generate language*115294
-Ref: tlmgr *generate language.dat*115319
-Ref: tlmgr *generate language.def*115344
-Ref: tlmgr *generate language.dat.lua*115373
-Ref: tlmgr *generate fmtutil*115393
-Ref: tlmgr *--dest* _output_file_117630
-Ref: tlmgr *--localcfg* _local_conf_file_118206
-Ref: tlmgr *--rebuild-sys*118329
-Node: tlmgr gui119190
-Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]119434
-Ref: tlmgr *--list*120639
-Ref: tlmgr *--only-installed*120918
-Ref: tlmgr *--taxonomy*121133
-Ref: tlmgr *--keyword*121145
-Ref: tlmgr *--functionality*121163
-Ref: tlmgr *--characterization*121184
-Node: tlmgr init-usertree121397
-Node: tlmgr install [_option_]... _pkg_...121823
-Ref: tlmgr *--file*122187
-Ref: tlmgr *--reinstall*122413
-Ref: tlmgr *--no-depends*122793
-Ref: tlmgr *--no-depends-at-all*122952
-Ref: tlmgr *--dry-run* 1123350
-Ref: tlmgr *--force*123468
-Node: tlmgr option123674
-Ref: tlmgr *option [show]*123847
-Ref: tlmgr *option showall*123865
-Ref: tlmgr *option _key_ [_value_]*123891
-Node: tlmgr paper127739
-Ref: tlmgr *paper [a4|letter]*127924
-Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*127998
-Node: tlmgr path [--w32mode=user|admin] [add|remove]129025
-Node: tlmgr pinning130508
-Ref: tlmgr pinning show130815
-Ref: tlmgr pinning add _repo_ _pkgglob_...130888
-Ref: tlmgr pinning remove _repo_ _pkgglob_...131007
-Ref: tlmgr pinning remove _repo_ --all131160
-Node: tlmgr platform list|add|remove _platform_...131214
-Node: tlmgr platform set _platform_131462
-Node: tlmgr platform set auto131690
-Ref: tlmgr *--dry-run* 2132807
-Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...132916
-Node: tlmgr print-platform134218
-Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]134690
-Ref: tlmgr *--all* 1135586
-Ref: tlmgr *--backupdir* _directory_ 1135780
-Ref: tlmgr *--dry-run* 3135936
-Ref: tlmgr *--force* 1136053
-Node: tlmgr remove [_option_]... _pkg_...136081
-Ref: tlmgr *--no-depends* 1136604
-Ref: tlmgr *--no-depends-at-all* 1136666
-Ref: tlmgr *--force* 2136722
-Ref: tlmgr *--dry-run* 4137194
-Node: tlmgr repository137301
-Ref: tlmgr *repository list*137509
-Ref: tlmgr *repository list _path|tag_*137539
-Ref: tlmgr *repository add _path_ [_tag_]*137572
-Ref: tlmgr *repository remove _path|tag_*137604
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*137658
-Node: tlmgr search [_option_...] _what_138742
-Node: tlmgr search [_option_...] --file _what_139253
-Node: tlmgr search [_option_...] --taxonomy _what_139504
-Node: tlmgr search [_option_...] --keyword _what_139815
-Node: tlmgr search [_option_...] --functionality _what_140133
-Node: tlmgr search [_option_...] --characterization _what_140471
-Node: tlmgr search [_option_...] --all _what_140811
-Ref: tlmgr *--global*141259
-Ref: tlmgr *--word*141371
-Ref: tlmgr *--list* 1141610
-Ref: tlmgr *--file* 1141956
-Ref: tlmgr *--taxonomy* 1142013
-Ref: tlmgr *--keyword* 1142025
-Ref: tlmgr *--functionality* 1142043
-Ref: tlmgr *--characterization* 1142064
-Ref: tlmgr *--all* 2142219
-Node: tlmgr uninstall142302
-Ref: tlmgr *--force* 3142556
-Node: tlmgr update [_option_]... [_pkg_]...142612
-Ref: tlmgr *--all* 3142983
-Ref: tlmgr *--self*144724
-Ref: tlmgr *--dry-run* 5145488
-Ref: tlmgr *--list* [_pkg_]145665
-Ref: tlmgr *--exclude* _pkg_146354
-Ref: tlmgr *--no-auto-remove* [_pkg_]...147047
-Ref: tlmgr *--no-auto-install* [_pkg_]...147498
-Ref: tlmgr *--reinstall-forcibly-removed*148154
-Ref: tlmgr *--backup* and *--backupdir* _directory_148718
-Ref: tlmgr *--no-depends* 2149899
-Ref: tlmgr *--no-depends-at-all* 2150102
-Ref: tlmgr *--force* 4150158
-Node: tlmgr USER MODE150584
-Node: tlmgr user mode install153395
-Node: tlmgr user mode backup; restore; remove; update154342
-Node: tlmgr user mode generate; option; paper154784
-Node: tlmgr CONFIGURATION FILE FOR TLMGR155160
-Node: tlmgr TAXONOMIES156251
-Ref: tlmgr --keyword 2156877
-Ref: tlmgr --functionality 2156962
-Ref: tlmgr --characterization 2157118
-Ref: tlmgr --taxonomy 2157259
-Node: tlmgr MULTIPLE REPOSITORIES157800
-Node: tlmgr Pinning159521
-Node: tlmgr GUI FOR TLMGR161496
-Node: tlmgr Main display162718
-Node: tlmgr Display configuration area162970
-Ref: tlmgr Status163331
-Ref: tlmgr Category163495
-Ref: tlmgr Match163681
-Ref: tlmgr Selection163941
-Ref: tlmgr Display configuration buttons164145
-Node: tlmgr Package list area164328
-Ref: tlmgr a checkbox164912
-Ref: tlmgr package name165048
-Ref: tlmgr local revision (and version)165147
-Ref: tlmgr remote revision (and version)165522
-Ref: tlmgr short description165819
-Node: tlmgr Main display action buttons165864
-Ref: tlmgr Update all installed166130
-Ref: tlmgr Update166502
-Ref: tlmgr Install166552
-Ref: tlmgr Remove166738
-Ref: tlmgr Backup166916
-Node: tlmgr Menu bar167073
-Ref: tlmgr tlmgr menu167270
-Ref: tlmgr Options menu167578
-Ref: tlmgr Actions menu168661
-Ref: tlmgr Help menu169089
-Node: tlmgr MACHINE-READABLE OUTPUT169222
-Node: tlmgr Machine-readable update and install output170032
-Ref: tlmgr location-url _location_171308
-Ref: tlmgr total-bytes _count_171524
-Ref: tlmgr _pkgname_171934
-Ref: tlmgr _status_172144
-Ref: tlmgr d172222
-Ref: tlmgr f172282
-Ref: tlmgr u172461
-Ref: tlmgr r172507
-Ref: tlmgr a172630
-Ref: tlmgr i172808
-Ref: tlmgr I172927
-Ref: tlmgr _localrev_173029
-Ref: tlmgr _serverrev_173136
-Ref: tlmgr _size_173248
-Ref: tlmgr _runtime_173417
-Ref: tlmgr _esttot_173487
-Node: tlmgr Machine-readable option output173520
-Node: tlmgr AUTHORS AND COPYRIGHT174032
-Node: Index174379
+Node: Overview of build system3906
+Node: Prerequisites5949
+Node: Building8347
+Node: Build iteration9595
+Node: Build problems10667
+Node: Build in parallel11070
+Node: Build distribution11662
+Node: Build one package12233
+Node: Installing15585
+Node: Installation directories16600
+Node: Linked scripts18416
+Node: Distro builds19897
+Node: Layout and infrastructure22287
+Node: Build system tools23115
+Node: Top-level directories25126
+Node: Autoconf macros27540
+Node: General setup macros28241
+Node: Macros for programs29108
+Node: Macros for compilers29920
+Node: Macros for libraries31354
+Node: Macros for library and header flags31780
+Node: Macros for Windows33660
+Node: Library modules35237
+Node: png library35726
+Node: zlib library38000
+Node: freetype library38515
+Node: kpathsea library39043
+Node: Program modules40442
+Node: t1utils package40870
+Node: xindy package41421
+Node: xdvik package42571
+Node: asymptote43644
+Node: Extending TeX Live44095
+Node: Adding a new program module44872
+Node: Adding a new generic library module48167
+Node: Adding a new TeX-specific library module50380
+Node: Configure options51067
+Node: Global configure options52449
+Node: --disable-native-texlive-build52991
+Node: --prefix --bindir ...53981
+Node: --disable-largefile54521
+Node: --disable-missing55206
+Node: --enable-compiler-warnings=LEVEL55607
+Node: --enable-cxx-runtime-hack56346
+Node: --enable-maintainer-mode56773
+Node: --enable-multiplatform57302
+Node: --enable-shared57840
+Node: --enable-silent-rules58211
+Node: --without-ln-s58667
+Node: --without-x59018
+Node: Program-specific configure options59206
+Node: --enable-PROG --disable-PROG59849
+Node: --disable-all-pkgs60126
+Node: Configure options for texk/web2c61112
+Node: Configure options for texk/bibtex-x63630
+Node: Configure options for texk/dvipdfm-x64173
+Node: Configure options for texk/dvisvgm64946
+Node: Configure options for texk/texlive65832
+Node: Configure options for texk/xdvik66253
+Node: Configure options for utils/xindy66857
+Node: Library-specific configure options67758
+Node: Configure options for kpathsea68769
+Node: Configure options for system poppler69478
+Node: Variables for configure70269
+Node: Cross compilation71697
+Node: Cross configuring72996
+Node: Cross problems74669
+Node: Coding conventions76316
+Node: Declarations and definitions77055
+Node: Const79237
+Node: Continuous integration81100
+Node: install-tl84634
+Node: install-tl NAME84979
+Node: install-tl SYNOPSIS85137
+Node: install-tl DESCRIPTION85345
+Node: install-tl REFERENCES86346
+Node: install-tl OPTIONS86862
+Ref: install-tl *-gui* [[=]_module_]87216
+Ref: install-tl text87425
+Ref: install-tl wizard87548
+Ref: install-tl perltk87702
+Ref: install-tl *-no-gui*88136
+Ref: install-tl *-lang* _llcode_88217
+Ref: install-tl *-repository* _url|path_88904
+Ref: install-tl *-select-repository*90715
+Ref: install-tl *-all-options*91151
+Ref: install-tl *-custom-bin* _path_91458
+Ref: install-tl *-debug-translation*92113
+Ref: install-tl *-force-platform* _platform_92332
+Ref: install-tl *-help*, *--help*, *-?*92576
+Ref: install-tl *-in-place*92969
+Ref: install-tl *-logfile* _file_93496
+Ref: install-tl *-no-cls*93847
+Ref: install-tl *-non-admin*93978
+Ref: install-tl *--persistent-downloads*94083
+Ref: install-tl *--no-persistent-downloads*94111
+Ref: install-tl *-portable*94719
+Ref: install-tl *-print-platform*94858
+Ref: install-tl *-profile* _profile_95051
+Ref: install-tl *-q*96545
+Ref: install-tl *-scheme* _scheme_96607
+Ref: install-tl *-v*97081
+Ref: install-tl *-version*, *--version*97242
+Node: install-tl ENVIRONMENT VARIABLES97373
+Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK97762
+Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE97964
+Ref: install-tl TEXLIVE_INSTALL_PREFIX98070
+Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG98101
+Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME98130
+Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL98160
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG98194
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR98225
+Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR98253
+Ref: install-tl NOPERLDOC98308
+Node: install-tl AUTHORS AND COPYRIGHT98372
+Node: tlmgr98730
+Node: tlmgr NAME99167
+Node: tlmgr SYNOPSIS99292
+Node: tlmgr DESCRIPTION99482
+Node: tlmgr EXAMPLES100578
+Ref: tlmgr tlmgr option repository http://mirror.ctan.org/systems/texlive/tlnet100869
+Ref: tlmgr tlmgr update --list101050
+Ref: tlmgr tlmgr update --all101143
+Ref: tlmgr tlmgr info _pkg_101299
+Node: tlmgr OPTIONS101505
+Ref: tlmgr *--repository* _url|path_102025
+Ref: tlmgr *--gui* [_action_]102750
+Ref: tlmgr *--gui-lang* _llcode_103157
+Ref: tlmgr *--debug-translation*103840
+Ref: tlmgr *--machine-readable*104043
+Ref: tlmgr *--no-execute-actions*104311
+Ref: tlmgr *--package-logfile* _file_104504
+Ref: tlmgr *--pause*104759
+Ref: tlmgr *--persistent-downloads*104914
+Ref: tlmgr *--no-persistent-downloads*104942
+Ref: tlmgr *--pin-file*105436
+Ref: tlmgr *--usermode*105654
+Ref: tlmgr *--usertree* _dir_105774
+Node: tlmgr ACTIONS106324
+Node: tlmgr help107556
+Node: tlmgr version108032
+Node: tlmgr backup [--clean[=_N_]] [--backupdir _dir_] [--all | _pkg_]...108350
+Ref: tlmgr *--backupdir* _directory_109444
+Ref: tlmgr *--all*109641
+Ref: tlmgr *--clean*[=_N_]109863
+Ref: tlmgr *--dry-run*110160
+Node: tlmgr candidates _pkg_110280
+Ref: tlmgr *candidates _pkg_* 1110567
+Node: tlmgr check [_option_]... [files|depends|executes|runfiles|all]110711
+Ref: tlmgr *files*111154
+Ref: tlmgr *depends*111289
+Ref: tlmgr *executes*111631
+Ref: tlmgr *runfiles*111749
+Ref: tlmgr *--use-svn*111861
+Node: tlmgr conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]111978
+Node: tlmgr dump-tlpdb [--local|--remote]114050
+Ref: tlmgr *--local*114560
+Ref: tlmgr *--remote*114599
+Node: tlmgr generate [_option_]... _what_115021
+Ref: tlmgr *generate language*115262
+Ref: tlmgr *generate language.dat*115287
+Ref: tlmgr *generate language.def*115312
+Ref: tlmgr *generate language.dat.lua*115341
+Ref: tlmgr *generate fmtutil*115361
+Ref: tlmgr *--dest* _output_file_117598
+Ref: tlmgr *--localcfg* _local_conf_file_118174
+Ref: tlmgr *--rebuild-sys*118297
+Node: tlmgr gui119158
+Node: tlmgr info [_option_...] [collections|schemes|_pkg_...]119402
+Ref: tlmgr *--list*120607
+Ref: tlmgr *--only-installed*120886
+Ref: tlmgr *--taxonomy*121101
+Ref: tlmgr *--keyword*121113
+Ref: tlmgr *--functionality*121131
+Ref: tlmgr *--characterization*121152
+Node: tlmgr init-usertree121365
+Node: tlmgr install [_option_]... _pkg_...121791
+Ref: tlmgr *--file*122155
+Ref: tlmgr *--reinstall*122381
+Ref: tlmgr *--no-depends*122761
+Ref: tlmgr *--no-depends-at-all*122920
+Ref: tlmgr *--dry-run* 1123318
+Ref: tlmgr *--force*123436
+Node: tlmgr option123642
+Ref: tlmgr *option [show]*123815
+Ref: tlmgr *option showall*123833
+Ref: tlmgr *option _key_ [_value_]*123859
+Node: tlmgr paper127707
+Ref: tlmgr *paper [a4|letter]*127892
+Ref: tlmgr *[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*127966
+Node: tlmgr path [--w32mode=user|admin] [add|remove]128993
+Node: tlmgr pinning130476
+Ref: tlmgr pinning show130783
+Ref: tlmgr pinning add _repo_ _pkgglob_...130856
+Ref: tlmgr pinning remove _repo_ _pkgglob_...130975
+Ref: tlmgr pinning remove _repo_ --all131128
+Node: tlmgr platform list|add|remove _platform_...131182
+Node: tlmgr platform set _platform_131430
+Node: tlmgr platform set auto131658
+Ref: tlmgr *--dry-run* 2132775
+Node: tlmgr postaction [--w32mode=user|admin] [--fileassocmode=1|2] [--all] [install|remove] [shortcut|fileassoc|script] [_pkg_]...132884
+Node: tlmgr print-platform134186
+Node: tlmgr restore [--backupdir _dir_] [--all | _pkg_ [_rev_]]134658
+Ref: tlmgr *--all* 1135554
+Ref: tlmgr *--backupdir* _directory_ 1135748
+Ref: tlmgr *--dry-run* 3135904
+Ref: tlmgr *--force* 1136021
+Node: tlmgr remove [_option_]... _pkg_...136049
+Ref: tlmgr *--no-depends* 1136572
+Ref: tlmgr *--no-depends-at-all* 1136634
+Ref: tlmgr *--force* 2136690
+Ref: tlmgr *--dry-run* 4137162
+Node: tlmgr repository137269
+Ref: tlmgr *repository list*137477
+Ref: tlmgr *repository list _path|tag_*137507
+Ref: tlmgr *repository add _path_ [_tag_]*137540
+Ref: tlmgr *repository remove _path|tag_*137572
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*137626
+Node: tlmgr search [_option_...] _what_138710
+Node: tlmgr search [_option_...] --file _what_139221
+Node: tlmgr search [_option_...] --taxonomy _what_139472
+Node: tlmgr search [_option_...] --keyword _what_139783
+Node: tlmgr search [_option_...] --functionality _what_140101
+Node: tlmgr search [_option_...] --characterization _what_140439
+Node: tlmgr search [_option_...] --all _what_140779
+Ref: tlmgr *--global*141227
+Ref: tlmgr *--word*141339
+Ref: tlmgr *--list* 1141578
+Ref: tlmgr *--file* 1141924
+Ref: tlmgr *--taxonomy* 1141981
+Ref: tlmgr *--keyword* 1141993
+Ref: tlmgr *--functionality* 1142011
+Ref: tlmgr *--characterization* 1142032
+Ref: tlmgr *--all* 2142187
+Node: tlmgr uninstall142270
+Ref: tlmgr *--force* 3142524
+Node: tlmgr update [_option_]... [_pkg_]...142580
+Ref: tlmgr *--all* 3142951
+Ref: tlmgr *--self*144692
+Ref: tlmgr *--dry-run* 5145456
+Ref: tlmgr *--list* [_pkg_]145633
+Ref: tlmgr *--exclude* _pkg_146322
+Ref: tlmgr *--no-auto-remove* [_pkg_]...147015
+Ref: tlmgr *--no-auto-install* [_pkg_]...147466
+Ref: tlmgr *--reinstall-forcibly-removed*148122
+Ref: tlmgr *--backup* and *--backupdir* _directory_148686
+Ref: tlmgr *--no-depends* 2149867
+Ref: tlmgr *--no-depends-at-all* 2150070
+Ref: tlmgr *--force* 4150126
+Node: tlmgr USER MODE150552
+Node: tlmgr user mode install153363
+Node: tlmgr user mode backup; restore; remove; update154310
+Node: tlmgr user mode generate; option; paper154752
+Node: tlmgr CONFIGURATION FILE FOR TLMGR155128
+Node: tlmgr TAXONOMIES156219
+Ref: tlmgr --keyword 2156845
+Ref: tlmgr --functionality 2156930
+Ref: tlmgr --characterization 2157086
+Ref: tlmgr --taxonomy 2157227
+Node: tlmgr MULTIPLE REPOSITORIES157768
+Node: tlmgr Pinning159489
+Node: tlmgr GUI FOR TLMGR161464
+Node: tlmgr Main display162686
+Node: tlmgr Display configuration area162938
+Ref: tlmgr Status163299
+Ref: tlmgr Category163463
+Ref: tlmgr Match163649
+Ref: tlmgr Selection163909
+Ref: tlmgr Display configuration buttons164113
+Node: tlmgr Package list area164296
+Ref: tlmgr a checkbox164880
+Ref: tlmgr package name165016
+Ref: tlmgr local revision (and version)165115
+Ref: tlmgr remote revision (and version)165490
+Ref: tlmgr short description165787
+Node: tlmgr Main display action buttons165832
+Ref: tlmgr Update all installed166098
+Ref: tlmgr Update166470
+Ref: tlmgr Install166520
+Ref: tlmgr Remove166706
+Ref: tlmgr Backup166884
+Node: tlmgr Menu bar167041
+Ref: tlmgr tlmgr menu167238
+Ref: tlmgr Options menu167546
+Ref: tlmgr Actions menu168629
+Ref: tlmgr Help menu169057
+Node: tlmgr MACHINE-READABLE OUTPUT169190
+Node: tlmgr Machine-readable update and install output170000
+Ref: tlmgr location-url _location_171276
+Ref: tlmgr total-bytes _count_171492
+Ref: tlmgr _pkgname_171902
+Ref: tlmgr _status_172112
+Ref: tlmgr d172190
+Ref: tlmgr f172250
+Ref: tlmgr u172429
+Ref: tlmgr r172475
+Ref: tlmgr a172598
+Ref: tlmgr i172776
+Ref: tlmgr I172895
+Ref: tlmgr _localrev_172997
+Ref: tlmgr _serverrev_173104
+Ref: tlmgr _size_173216
+Ref: tlmgr _runtime_173385
+Ref: tlmgr _esttot_173455
+Node: tlmgr Machine-readable option output173488
+Node: tlmgr AUTHORS AND COPYRIGHT174000
+Node: Index174347
 
 End Tag Table
diff --git a/Build/source/doc/tlbuild.texi b/Build/source/doc/tlbuild.texi
index de29edd07a2..a3b638edc4c 100644
--- a/Build/source/doc/tlbuild.texi
+++ b/Build/source/doc/tlbuild.texi
@@ -119,13 +119,13 @@ information for different systems, along with
 For information on acquiring the TL sources, see
 @url{http://tug.org/texlive/svn}.
 
-This manual does not duplicate the (primarily user-level) information
-found in other TL documentation resources, such as:
+This manual does not duplicate the information found in other TL
+documentation resources, such as:
 
 @itemize
 @item The @TL{} web pages: @url{http://tug.org/texlive}.
 
-@item The web page with an overview of how to build the binaries which 
+@item The web page describing how to build the binaries which 
 are distributed with @TL{}: @url{http://tug.org/texlive/build.html}.
 
 @item The @TL{} user manual: @url{http://tug.org/texlive/doc.html}, or
@@ -2571,64 +2571,6 @@ push. No further action is necessary on Travis-CI.
 If changes have been pushed via the cron job above, Travis-CI will
 automatically checkout the last pushed commit and try building it.
 
-@comment
-@comment The following needs improvement
-@comment
-@comment @subheading Developer setup for Git/Subversion
-@comment 
-@comment In case a developer of code in the @TL{} source code wants to use the CI
-@comment testing facility, the following steps are necessary for initialization:
-@comment 
-@comment @itemize @bullet
-@comment @item
-@comment Initial @code{git-svn} checkout as laid out above, replacing
-@comment @code{USER} with the Subversion user name. This initial checkout might
-@comment take quite some time as the whole history has to be parsed. In case the
-@comment checkout is interrupted, change into the already created folder and call
-@comment @code{git svn fetch} to continue pulling from the remote until all
-@comment changes have been fetched.
-@comment 
-@comment @item
-@comment Adding the Git remote as laid out above. After that it is also necessary
-@comment to set the upstream for the @code{master} branch with
-@comment @code{git branch --set-upstream-to=origin/master master} followed by a
-@comment @code{git pull}. The last command will probably not fetch anything since
-@comment but update the local information about availability.
-@comment 
-@comment @end itemize
-@comment 
-@comment After this development can be done as follows:
-@comment 
-@comment @itemize @bullet
-@comment @item
-@comment Create a new branch based on @code{master}: @code{git checkout -b feature}
-@comment and develop the new features in this branch.
-@comment 
-@comment @item
-@comment Pushing the branch to Github will kick of automatic CI testing on this
-@comment branch, too.
-@comment 
-@comment @item
-@comment When the feature is ready, first the branch @code{feature} needs to be
-@comment rebased onto current @code{master} with @code{git rebase master}, then
-@comment merged into @code{master}, followed by a submission to the Subversion
-@comment repository via @code{git svn dcommit}. Don't push to master on Github
-@comment (it is anyway protected), your changes will come in in due time via a
-@comment pull on master.
-@comment 
-@comment @item
-@comment After the branch is included in master, optionally delete the local and
-@comment rmeote branch @code{feature}.
-@comment 
-@comment @end itemize
-@comment 
-@comment The above method is the standards and safest method, but there is an
-@comment alternative way by first pulling from Github, and then tricking git-svn
-@comment into believing that everything has been fetched from Subversion
-@comment already. This alternative method is explained XXXXXXXXX (my BLOG?)
-@comment 
-@comment 
-
 @c made from pod doc.
 @include tlbuild-incl/install-tl.texi
 @include tlbuild-incl/tlmgr.texi
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index f2a0ce396fe..136db935232 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-23  Karl Berry  <karl@freefriends.org>
+
+	* lib.h (LIB_START_FATAL): mention that the identifier `kpse'
+	has to be defined for this to work.  (In practice, it's a local
+	variable.) Private report from Douglas McKenna, 2018/02/21.
+
 2018-02-21  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* xgetcwd.c: Replace LIB_FATAL2 by FATAL2.
diff --git a/Build/source/texk/kpathsea/cnf-to-paths.awk b/Build/source/texk/kpathsea/cnf-to-paths.awk
index faae308cb4a..d06f871c313 100644
--- a/Build/source/texk/kpathsea/cnf-to-paths.awk
+++ b/Build/source/texk/kpathsea/cnf-to-paths.awk
@@ -14,7 +14,10 @@
   # 
   # 1) definitions referring to SELFAUTO*, which we want to keep.  In
   # particular, this is how the compile-time TEXMFCNF gets defined and
-  # thus how texmf.cnf gets found.
+  # thus how texmf.cnf gets found.  In fact, TEXMFCNF is the only
+  # relevant compile-time value at all, and since its value is not used
+  # from texmf.cnf, we could simplify this whole process in both
+  # directions. Maybe someday.
   # 
   # 2) definitions starting with a /, which we also want to keep.  Here
   # we assume a distro maintainer has changed a variable, e.g.,
@@ -25,7 +28,7 @@
   # That way, the binaries don't get changed just because we change
   # definitions in texmf.cnf.
   # 
-  # The definition of DEFAULT_TEXMF (and other variables)
+  # The definition of DEFAULT_TEXMFROOT (and other variables)
   # that winds up in the final paths.h will not be used.
   
   # Extract the identifier and the value from the line.  Since
diff --git a/Build/source/texk/kpathsea/lib.h b/Build/source/texk/kpathsea/lib.h
index df380f654d6..9255834ce29 100644
--- a/Build/source/texk/kpathsea/lib.h
+++ b/Build/source/texk/kpathsea/lib.h
@@ -87,6 +87,7 @@ extern "C" {
 #define WARNING4(str, e1, e2, e3, e4)                                   \
   START_WARNING (); fprintf (stderr, str, e1, e2, e3, e4); END_WARNING ()
 
+/* This requires an identifier `kpse' to be set up correctly.  Sorry.  */
 #define LIB_START_FATAL() do { \
   fprintf (stderr, "%s: fatal: ", kpse->invocation_name);
 
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index ea4fa468e19..964a392e8e0 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-23  Karl Berry  <karl@freefriends.org>
+
+	* doc/web2c.texi (bibtex invocation): mention need to remove aux
+	file from previous run for -min-crossrefs to be effective.
+	https://tex.stackexchange.com/questions/123740
+
 2018-02-18  Karl Berry  <karl@tug.org>
 
 	* bibtex.ch (str_ends_with): new fn.
diff --git a/Build/source/texk/web2c/doc/web2c.info b/Build/source/texk/web2c/doc/web2c.info
index 767f53994ee..8a2c67ab664 100644
--- a/Build/source/texk/web2c/doc/web2c.info
+++ b/Build/source/texk/web2c/doc/web2c.info
@@ -1,4 +1,4 @@
-This is web2c.info, produced by makeinfo version 6.3 from web2c.texi.
+This is web2c.info, produced by makeinfo version 6.5 from web2c.texi.
 
 This file documents the installation and use of the programs in Web2c,
 an implementation of Donald Knuth's TeX system.
@@ -2227,9 +2227,13 @@ macros.  BibTeX searches for '.bib' files using the 'BIBINPUTS' and
      even if it was not explicitly referenced in the .aux file.  For
      example, E might be a conference proceedings as a whole, with the
      cross-referencing entries being individual articles published in
-     the proceedings.  In some circumstances, you may want to avoid
-     these automatic inclusions altogether; to do this, make N a
-     sufficiently large number.
+     the proceedings.
+
+     If you want to avoid these automatic inclusions altogether, make N
+     a sufficiently large number, and be sure to remove any previous
+     .aux and .bbl files.  Otherwise the option may appear to have no
+     effect, since BibTeX will have added the citation for E to the
+     .aux, and nothing will remove it.
 
    See also:
 'btxdoc.tex'
@@ -2318,9 +2322,9 @@ available in many other places, of course).
 
 * Menu:
 
-* tangle invocation::           
-* weave invocation::            
-* pooltype invocation::         
+* tangle invocation::
+* weave invocation::
+* pooltype invocation::
 
 
 File: web2c.info,  Node: tangle invocation,  Next: weave invocation,  Up: WEB
@@ -2559,7 +2563,7 @@ program.
 
 * Menu:
 
-* dvitype output example::      
+* dvitype output example::
 
 
 File: web2c.info,  Node: dvitype output example,  Up: dvitype invocation
@@ -3635,7 +3639,7 @@ Index
 * bibliography items, cross-referenced:  bibtex invocation.   (line  31)
 * bibtex:                                bibtex invocation.   (line   6)
 * BibTeX:                                BibTeX.              (line   6)
-* BibTeX collection:                     bibtex invocation.   (line  54)
+* BibTeX collection:                     bibtex invocation.   (line  58)
 * BibTeX style files:                    Basic BibTeX style files.
                                                               (line   6)
 * BigEndian machines:                    Hardware and memory dumps.
@@ -3647,9 +3651,9 @@ Index
 * Breitenlohner, Peter:                  Introduction.        (line   9)
 * BSTINPUTS, search path for bst files:  bibtex invocation.   (line  18)
 * btex for MetaPost labels:              mpost invocation.    (line  48)
-* btxdoc.bib:                            bibtex invocation.   (line  48)
-* btxdoc.tex:                            bibtex invocation.   (line  42)
-* btxhak.tex:                            bibtex invocation.   (line  45)
+* btxdoc.bib:                            bibtex invocation.   (line  52)
+* btxdoc.tex:                            bibtex invocation.   (line  46)
+* btxhak.tex:                            bibtex invocation.   (line  49)
 * byte position:                         pktype invocation.   (line  40)
 * byte position <1>:                     gftype invocation.   (line  76)
 * byte swapping:                         Hardware and memory dumps.
@@ -3830,7 +3834,7 @@ Index
                                                               (line  21)
 * Free Software Foundation documentation system: Formats.     (line  47)
 * freedom of Web2c:                      Introduction.        (line  23)
-* ftp.math.utah.edu:                     bibtex invocation.   (line  54)
+* ftp.math.utah.edu:                     bibtex invocation.   (line  58)
 * generating source specials:            tex invocation.      (line 133)
 * geometric designs:                     Metafont.            (line   6)
 * geometric font scaling:                Font file formats.   (line  21)
@@ -4212,7 +4216,7 @@ Index
 * string numbers, displaying:            pooltype invocation. (line   6)
 * string pool, writing:                  tangle invocation.   (line  16)
 * string representation:                 pooltype invocation. (line  30)
-* style design, for BibTeX:              bibtex invocation.   (line  45)
+* style design, for BibTeX:              bibtex invocation.   (line  49)
 * style files:                           mft invocation.      (line  67)
 * substitutions of font glyphs:          MLTeX.               (line   6)
 * sun:                                   Online Metafont graphics.
@@ -4245,7 +4249,7 @@ Index
 * terminator for filenames:              \input filenames.    (line  10)
 * terse output:                          bibtex invocation.   (line  28)
 * tex:                                   tex invocation.      (line   6)
-* TeX, bibliographies for:               bibtex invocation.   (line  54)
+* TeX, bibliographies for:               bibtex invocation.   (line  58)
 * TeX, creating from Metafont:           mft invocation.      (line   6)
 * TeX, creating from WEB:                weave invocation.    (line   6)
 * TeX, description of:                   TeX.                 (line   6)
@@ -4297,7 +4301,7 @@ Index
 * Troff, and MetaPost:                   mpost invocation.    (line  65)
 * Troff, WEB for:                        WEB.                 (line  12)
 * Trojan horses and TeX programs:        tex invocation.      (line  48)
-* TUGboat bibliography:                  bibtex invocation.   (line  54)
+* TUGboat bibliography:                  bibtex invocation.   (line  58)
 * Type 1 conversion:                     Font utilities available elsewhere.
                                                               (line  39)
 * type design, personal:                 Initial Metafont.    (line  31)
@@ -4362,7 +4366,7 @@ Index
                                                               (line  69)
 * X toolkits and Metafont:               Online Metafont graphics.
                                                               (line  59)
-* xampl.bib:                             bibtex invocation.   (line  51)
+* xampl.bib:                             bibtex invocation.   (line  55)
 * xbfe, bitmap font editor:              Font utilities available elsewhere.
                                                               (line  23)
 * XeTeX:                                 TeX extensions.      (line  31)
@@ -4432,28 +4436,28 @@ Node: Initial MetaPost90194
 Node: dvitomp invocation91116
 Node: BibTeX91781
 Node: bibtex invocation92142
-Node: Basic BibTeX style files94440
-Node: WEB95770
-Node: tangle invocation97011
-Node: weave invocation99134
-Node: pooltype invocation100541
-Node: DVI utilities101671
-Node: dvicopy invocation102603
-Node: dvitype invocation103886
-Node: dvitype output example106221
-Node: Font utilities109272
-Node: Font file formats110452
-Node: gftopk invocation113721
-Node: pktogf invocation114912
-Node: pktype invocation116078
-Node: gftype invocation118901
-Node: tftopl invocation123404
-Node: pltotf invocation127997
-Node: vftovp invocation129048
-Node: vptovf invocation131283
-Node: Font utilities available elsewhere132310
-Node: Legalisms134690
-Node: References136844
-Node: Index141411
+Node: Basic BibTeX style files94616
+Node: WEB95946
+Node: tangle invocation97155
+Node: weave invocation99278
+Node: pooltype invocation100685
+Node: DVI utilities101815
+Node: dvicopy invocation102747
+Node: dvitype invocation104030
+Node: dvitype output example106359
+Node: Font utilities109410
+Node: Font file formats110590
+Node: gftopk invocation113859
+Node: pktogf invocation115050
+Node: pktype invocation116216
+Node: gftype invocation119039
+Node: tftopl invocation123542
+Node: pltotf invocation128135
+Node: vftovp invocation129186
+Node: vptovf invocation131421
+Node: Font utilities available elsewhere132448
+Node: Legalisms134828
+Node: References136982
+Node: Index141549
 
 End Tag Table
diff --git a/Build/source/texk/web2c/doc/web2c.texi b/Build/source/texk/web2c/doc/web2c.texi
index 950a6e31329..2ba32ac9beb 100644
--- a/Build/source/texk/web2c/doc/web2c.texi
+++ b/Build/source/texk/web2c/doc/web2c.texi
@@ -2699,9 +2699,14 @@ entry @var{e} via their @code{crossref} field, include @var{e} in the
 @t{.bbl} file, even if it was not explicitly referenced in the @t{.aux}
 file. For example, @var{e} might be a conference proceedings as a whole,
 with the cross-referencing entries being individual articles published
-in the proceedings.  In some circumstances, you may want to avoid these
-automatic inclusions altogether; to do this, make @var{n} a sufficiently
-large number.
+in the proceedings.
+
+If you want to avoid these automatic inclusions altogether, make
+@var{n} a sufficiently large number, and be sure to remove any
+previous @t{.aux} and @t{.bbl} files.  Otherwise the option may
+appear to have no effect, since Bib@TeX{} will have added the citation
+for @var{e} to the @t{.aux}, and nothing will remove it.
+
 @end table
 
 See also:
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index 90fc42c79d3..437021cc705 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,9 @@
+2018-02-23  Karl Berry  <karl@freefriends.org>
+
+	* bibtex.man: mention need to remove aux file from previous run
+	for -min-crossrefs to be effective.
+	https://tex.stackexchange.com/questions/123740
+
 2018-01-18  Karl Berry  <karl@freefriends.org>
 
 	* mf.man: spacing, no openin, per Debian.
diff --git a/Build/source/texk/web2c/man/bibtex.man b/Build/source/texk/web2c/man/bibtex.man
index b2fb880ee10..3f970a98b7e 100644
--- a/Build/source/texk/web2c/man/bibtex.man
+++ b/Build/source/texk/web2c/man/bibtex.man
@@ -1,4 +1,4 @@
-.TH BIBTEX 1 "16 June 2015" "bibtex 0.99d" "Web2C @VERSION@"
+.TH BIBTEX 1 "23 February 2018" "bibtex 0.99d" "Web2C @VERSION@"
 .\"=====================================================================
 .if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
 .if n .ds TX TeX
@@ -63,8 +63,20 @@ The
 .B \-min-crossrefs
 option defines the minimum number of
 .B crossref
-required for automatic inclusion of the crossref'd entry on the citation
+required for automatic inclusion of the crossref base entry in the citation
 list; the default is two. 
+To avoid these automatic inclusions altogether, give this option
+a sufficiently large number, and be sure to remove any
+previous
+.B .aux 
+and
+.B .bbl
+files.  Otherwise the option may
+appear to have no effect, since \*(BX will have added the citation
+for the base entry to the
+.B .aux
+file, and nothing will remove it.
+.PP
 With the
 .B \-terse
 option, \*(BX operates silently.  Without it, a banner and progress
diff --git a/Build/source/utils/README b/Build/source/utils/README
index b043bfcea2f..0b291cc0604 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -75,14 +75,15 @@ cd $libsigsegv_ver
 #
 # you may need this hack on 64-bit systems
 # if clisp's configure does not find libsigsegv.  Harmless to do in any case.
-ln -s lib $clisp_toolsdir/lib64
+ln -s lib $clisp_toolsdir/lib64 # for GNU/Linux 64-bit
+ln -s . $clisp_toolsdir/lib/64  # for Solaris 64-bit
 #
 # if you can't build libsigsegv, pass --ignore-absence-of-libsigsegv
 # when running configure for clisp.
 
 ffcall_ver=libffcall-2.1
 cd $clisp_basedir
-$wget https://ftp.gnu.org/gnu/libsigsegv/$ffcall_ver.tar.gz
+$wget https://ftp.gnu.org/gnu/libffcall/$ffcall_ver.tar.gz
 gzip -dc $ffcall_ver.tar.gz | tar xf -
 cd $ffcall_ver
 ./configure -C --prefix=$clisp_toolsdir --disable-shared --enable-static \
@@ -104,7 +105,7 @@ cd $libiconv_ver
 # foil wrong attempts at dynamic linking, etc.
 (cd $clisp_basedir/clisp-tools/lib && rm -f *.dylib *.la)
 
-clisp_ver=clisp-2.49.50
+clisp_ver=clisp-2.49.92
 cd $clisp_basedir
 $wget https://haible.de/bruno/gnu/clisp-2.49.50.tar.bz2
 bunzip2 -dc $clisp_ver.tar.bz2 | tar xf -
@@ -118,9 +119,13 @@ cd $clisp_ver
 #
 ./configure CPPFLAGS=-DUNIX_BINARY_DISTRIB --prefix=$clisp_toolsdir \
   --without-readline --without-dynamic-modules --without-termcap-ncurses \
-  --disable-nls --enable-portability \
+  --disable-nls \
   --with-libsigsegv-prefix=$clisp_toolsdir \
   --with-libffcall-prefix=$clisp_toolsdir \
   --with-libiconv-prefix=$clisp_toolsdir \
   $clisp_builddir \
 && (cd $clisp_builddir && make)
+
+There may be clisp test failures relating to sockets on some
+systems. Since xindy doesn't use sockets, we can ignore those for TL.
+