3 files changed, 36 insertions, 25 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index 840d5f78be2..4e0855319b8 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,3 +1,4 @@
+# $Id: TLConfig.pm 34040 2014-05-15 12:16:59Z siepo $
 # TeXLive::TLConfig.pm - module exporting configuration values
 # Copyright 2007-2014 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
@@ -5,7 +6,7 @@
 
 package TeXLive::TLConfig;
 
-my $svnrev = '$Revision: 33571 $';
+my $svnrev = '$Revision: 34040 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -175,7 +176,7 @@ our %TLPDBOptions = (
     [ "p", "/usr/local/share/man", "sys_man",
       "Destination for symlinks for man pages" ],
   "w32_multi_user" =>
-    [ "b", 0, "multiuser",
+    [ "b", 1, "multiuser",
       "Install for all users (w32)" ],
   "generate_updmap" =>
     [ "b", 0, "generate_updmap",
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index cc3735299f3..06da8ce60f4 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,3 +1,4 @@
+# $Id: TLUtils.pm 34057 2014-05-16 05:25:02Z preining $
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
 # Copyright 2007-2014 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
@@ -5,7 +6,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 33564 $';
+my $svnrev = '$Revision: 34057 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -200,7 +201,6 @@ use Cwd;
 use Digest::MD5;
 use Getopt::Long;
 use File::Temp;
-use Time::HiRes;
 
 use TeXLive::TLConfig;
 
@@ -1410,7 +1410,7 @@ sub install_packages {
       # The open might fail for no good reason on Windows.
       # Try again for a while, but not forever.
       if ($count++ == 100) { die "$0: open($tlpobj_file) failed: $!"; }
-      Time::HiRes::sleep(0.01);  # sleep briefly
+      select (undef, undef, undef, .1);  # sleep briefly
     }
     $tlpobj->writeout(\*TMP);
     close(TMP);
@@ -2688,7 +2688,7 @@ sub make_var_skeleton {
   my ($prefix) = @_;
 
   mkdirhier "$prefix/tex/generic/config";
-  mkdirhier "$prefix/fonts/map/dvipdfm/updmap";
+  mkdirhier "$prefix/fonts/map/dvipdfmx/updmap";
   mkdirhier "$prefix/fonts/map/dvips/updmap";
   mkdirhier "$prefix/fonts/map/pdftex/updmap";
   mkdirhier "$prefix/fonts/pk";
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 69a3131651a..157c9d960de 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 33955 2014-05-10 05:37:16Z preining $
+# $Id: tlmgr.pl 34056 2014-05-16 05:12:27Z preining $
 #
 # Copyright 2008-2014 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 33955 $';
-my $datrev = '$Date: 2014-05-10 07:37:16 +0200 (Sat, 10 May 2014) $';
+my $svnrev = '$Revision: 34056 $';
+my $datrev = '$Date: 2014-05-16 07:12:27 +0200 (Fri, 16 May 2014) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -5329,7 +5329,7 @@ sub action_conf {
       $fn || ( chomp ($fn = `kpsewhich updmap.cfg`) ) ;
       $cf = TeXLive::TLConfFile->new($fn, '(#|(Mixed)?Map)', ' ');
     } else {
-      # that cannot happen!
+      die "Should not happen, conf arg=$arg";
     }
     my ($key,$val) = @ARGV;
     if (!defined($key)) {
@@ -5397,15 +5397,19 @@ sub texconfig_conf_mimic {
     info("$cmd: " . TeXLive::TLUtils::which($cmd) . "\n");
   }
   info("=========================== active config files ==========================\n");
-  for my $m (qw/texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf
-                pdftexconfig.tex/) {
+  for my $m (qw/texmf.cnf updmap.cfg/) {
+    for my $f (`kpsewhich -all $m`) {
+      info("$m: $f");
+    }
+  }
+  for my $m (qw/fmtutil.cnf config.ps mktex.cnf pdftexconfig.tex/) {
     info("$m: " . `kpsewhich $m`);
   }
 
   #tlwarn("missing finding of XDvi, config!\n");
 
   info("============================= font map files =============================\n");
-  for my $m (qw/psfonts.map pdftex.map ps2pk.map dvipdfm.map/) {
+  for my $m (qw/psfonts.map pdftex.map ps2pk.map kanjix.map/) {
     info("$m: " . `kpsewhich $m`);
   }
 
@@ -6354,21 +6358,20 @@ With only C<conf>, show general configuration information for TeX Live,
 including active configuration files, path settings, and more.  This is
 like the C<texconfig conf> call, but works on all supported platforms.
 
-With either C<conf texmf>, C<conf tlmgr>, or C<conf updmap> given in 
-addition, shows all key/value pairs (i.e., all settings) as saved in 
-C<ROOT/texmf.cnf>, the tlmgr configuration file (see below), or the first
-found C<updmap.cfg> file (via kpsewhich), respectively.
+With either C<conf texmf>, C<conf tlmgr>, or C<conf updmap> given in
+addition, shows all key/value pairs (i.e., all settings) as saved in
+C<ROOT/texmf.cnf>, the tlmgr configuration file (see below), or the
+first found (via kpsewhich) C<updmap.cfg> file, respectively.
 
-If I<key> is given in addition, shows the value of only that given
-I<key> in the respective file. In case the option I<--delete> is given,
-the respective setting (key value pair) will be removed from the 
-configuration file (note, it is removed, not commented!).
+If I<key> is given in addition, shows the value of only that I<key> in
+the respective file.  If option I<--delete> is also given, the
+configuration file -- it is removed, not just commented out!
 
 If I<value> is given in addition, I<key> is set to I<value> in the 
 respective file.  I<No error checking is done!>
 
-In all cases the used config file can be selected via the option
-C<--conffile I<file>>, in case one wants to edit a different file.
+In all cases the file used can be explicitly specified via the option
+C<--conffile I<file>>, in case one wants to operate on a different file.
 
 Practical application: if the execution of (some or all) system commands
 via C<\write18> was left enabled during installation, you can disable
@@ -6376,9 +6379,16 @@ it afterwards:
   
   tlmgr conf texmf shell_escape 0
 
+A more complicated example: the C<TEXMFHOME> tree (see the main TeX Live
+guide, L<http://tug.org/texlive/doc.html>) can be set to multiple
+directories, but they must be enclosed in braces and separated by
+commas, so quoting the value to the shell is a good idea.  Thus:
+
+  tlmgr conf texmf TEXMFHOME "{~/texmf,~/texmfbis}"
+
 Warning: The general facility is here, but tinkering with settings in
-this way is very strongly discouraged.  Again, no error checking is
-done, so any sort of breakage is possible.
+this way is very strongly discouraged.  Again, no error checking on
+either keys or values is done, so any sort of breakage is possible.
 
 
 =head2 dump-tlpdb [--local|--remote]