sync

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

7 files changed, 131 insertions, 96 deletions

diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index bbecba1651e..6eb7755df44 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,11 +1,11 @@
 # TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
+# Copyright 2007-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLConfig;
 
-my $svnrev = '$Revision: 27010 $';
+my $svnrev = '$Revision: 29725 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -53,7 +53,7 @@ BEGIN {
 
 # the year of our release, will be used in the location of the
 # network packages, and in menu names, and other places.
-$ReleaseYear = 2012;
+$ReleaseYear = 2013;
 
 # users can upgrade from this year to the current year; maybe a spread
 # of more than one year will be useful at some point, but not now.
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 6787e2fbc45..f4faeef0d56 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,11 +1,11 @@
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2012 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2013 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 27741 $';
+my $svnrev = '$Revision: 29725 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -269,10 +269,15 @@ sub platform_name {
   my $OS;  # O/S type as reported by config.guess.
   ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
   $CPU =~ s/^alpha(.*)/alpha/;   # alphaev whatever
-  $CPU =~ s/armv\dl/armel/;      # arm whatever
+  $CPU =~ s/mips64el/mipsel/;    # don't distinguish mips64 and 32 el
   $CPU =~ s/powerpc64/powerpc/;  # don't distinguish ppc64
   $CPU =~ s/sparc64/sparc/;      # don't distinguish sparc64
-  $CPU =~ s/mips64el/mipsel/;    # don't distinguish mips64 and 32 el
+
+  # armv6l-unknown-linux-gnueabihf -> armhf-linux (RPi)
+  # armv7l-unknown-linux-gnueabi   -> armel-linux (Android)
+  if ($CPU =~ /^arm/) {
+    $CPU = $guessed_platform =~ /hf$/ ? "armhf" : "armel";
+  }
 
   my @OSs = qw(aix cygwin darwin freebsd hpux irix
                kfreebsd linux netbsd openbsd solaris);
@@ -285,10 +290,18 @@ sub platform_name {
   }
   
   if ($OS eq "darwin") {
-    # We never want to guess x86_64-darwin even if config.guess
-    # does, because Leopard can be 64-bit but our x86_64-darwin
-    # binaries will only run on Snow Leopard.
-    $CPU = "universal";
+    # We want to guess x86_64-darwin on new-enough systems.  
+    # Most robust approach is to check sw_vers (os version)
+    # and sysctl (processor hardware).
+    chomp (my $sw_vers = `sw_vers -productVersion`);
+    my ($os_major,$os_minor) = split (/\./, $sw_vers);
+    #
+    chomp (my $sysctl = `sysctl hw.cpu64bit_capable`);
+    my (undef,$hw_64_bit) = split (" ", $sysctl);
+    #
+    $CPU = ($os_major >= 10 && $os_minor >= 6 && $hw_64_bit >= 1)
+           ? "x86_64" : "universal";
+    
   } elsif ($CPU =~ /^i.86$/) {
     $CPU = "i386";  # 586, 686, whatever
   }
@@ -312,10 +325,10 @@ sub platform_desc {
 
   my %platform_name = (
     'alpha-linux'      => 'DEC Alpha with GNU/Linux',
-    'alphaev5-osf'     => 'DEC Alphaev5 OSF',
     'amd64-freebsd'    => 'x86_64 with FreeBSD',
     'amd64-kfreebsd'   => 'x86_64 with GNU/kFreeBSD',
     'armel-linux'      => 'ARM with GNU/Linux',
+    'armhf-linux'      => 'ARMhf with GNU/Linux',
     'hppa-hpux'        => 'HP-UX',
     'i386-cygwin'      => 'Intel x86 with Cygwin',
     'i386-darwin'      => 'Intel x86 with MacOSX/Darwin',
@@ -413,7 +426,7 @@ C<which> does the same as the UNIX command C<which(1)>, but it is
 supposed to work on Windows too.  On Windows we have to try all the
 extensions given in the C<PATHEXT> environment variable.  We also try
 without appending an extension because if C<$string> comes from an
-environment variable, an extension might aleady be present.
+environment variable, an extension might already be present.
 
 =cut
 
@@ -1890,6 +1903,7 @@ sub announce_execute_actions {
 =pod
 
 =item C<add_symlinks($root, $arch, $sys_bin, $sys_man, $sys_info)>
+
 =item C<remove_symlinks($root, $arch, $sys_bin, $sys_man, $sys_info)>
 
 These two functions try to create/remove symlinks for binaries, man pages,
@@ -1963,24 +1977,26 @@ sub add_remove_symlinks {
   return if win32();
   if ($mode eq "add") {
     $errors++ unless add_link_dir_dir($plat_bindir, $sys_bin);
-    if (-d "$Master/texmf/doc/info") {
-      $errors++ unless add_link_dir_dir("$Master/texmf/doc/info", $sys_info);
+    if (-d "$Master/texmf-dist/doc/info") {
+      $errors++
+        unless add_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info);
     }
   } elsif ($mode eq "remove") {
     $errors++ unless remove_link_dir_dir($plat_bindir, $sys_bin);
-    if (-d "$Master/texmf/doc/info") {
-      $errors++ unless remove_link_dir_dir("$Master/texmf/doc/info", $sys_info);
+    if (-d "$Master/texmf-dist/doc/info") {
+      $errors++
+        unless remove_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info);
     }
   } else {
     die ("should not happen, unknown mode $mode in add_remove_symlinks!");
   }
   mkdirhier $sys_man if ($mode eq "add");
-  if (-w  $sys_man && -d "$Master/texmf/doc/man") {
+  if (-w  $sys_man && -d "$Master/texmf-dist/doc/man") {
     debug("$mode symlinks for man pages in $sys_man\n");
-    my $foo = `(cd "$Master/texmf/doc/man" && echo *)`;
+    my $foo = `(cd "$Master/texmf-dist/doc/man" && echo *)`;
     chomp (my @mans = split (' ', $foo));
     foreach my $m (@mans) {
-      my $mandir = "$Master/texmf/doc/man/$m";
+      my $mandir = "$Master/texmf-dist/doc/man/$m";
       next unless -d $mandir;
       if ($mode eq "add") {
         $errors++ unless add_link_dir_dir($mandir, "$sys_man/$m");
@@ -2478,13 +2494,14 @@ sub download_file {
     $url = "$TeXLiveURL/$relpath";
   }
   if (defined($::tldownload_server) && $::tldownload_server->enabled) {
-    debug("persistent connection set up, trying to get file.\n");
-    if (($ret = $::tldownload_server->get_file($url, $dest))) {
-      debug("downloading file via permanent connection succeeded\n");
+    debug("persistent connection set up, trying to get $url (for $dest)\n");
+    $ret = $::tldownload_server->get_file($url, $dest);
+    if ($ret) {
+      debug("downloading file via persistent connection succeeded\n");
       return $ret;
     } else {
-      tlwarn("permanent server connection set up, but downloading did not succeed!");
-      tlwarn("Retrying with wget.\n");
+      tlwarn("tlmgr: persistent connection ok, but download failed: $url\n");
+      tlwarn("tlmgr: retrying with wget.\n");
     }
   } else {
     if (!defined($::tldownload_server)) {
@@ -2673,7 +2690,7 @@ sub create_fmtutil {
   my ($tlpdb,$dest,$localconf) = @_;
   my @lines = $tlpdb->fmtutil_cnf_lines(
                          get_disabled_local_configs($localconf, '#'));
-  _create_config_files($tlpdb, "texmf/web2c/fmtutil-hdr.cnf", $dest,
+  _create_config_files($tlpdb, "texmf-dist/web2c/fmtutil-hdr.cnf", $dest,
                        $localconf, 0, '#', \@lines);
 }
 
@@ -2681,7 +2698,7 @@ sub create_updmap {
   my ($tlpdb,$dest) = @_;
   check_for_old_updmap_cfg();
   my @tlpdblines = $tlpdb->updmap_cfg_lines();
-  _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest,
+  _create_config_files($tlpdb, "texmf-dist/web2c/updmap-hdr.cfg", $dest,
                        undef, 0, '#', \@tlpdblines);
 }
 
@@ -2771,8 +2788,8 @@ sub create_language_dat {
   # no checking for disabled stuff for language.dat and .def
   my @lines = $tlpdb->language_dat_lines(
                          get_disabled_local_configs($localconf, '%'));
-  _create_config_files($tlpdb, "texmf/tex/generic/config/language.us", $dest,
-                       $localconf, 0, '%', \@lines);
+  _create_config_files($tlpdb, "texmf-dist/tex/generic/config/language.us",
+                       $dest, $localconf, 0, '%', \@lines);
 }
 
 sub create_language_def {
@@ -2784,7 +2801,8 @@ sub create_language_def {
   push @postlines, "%%% No changes may be made beyond this point.\n";
   push @postlines, "\n";
   push @postlines, "\\uselanguage {USenglish}             %%% This MUST be the last line of the file.\n";
-  _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.def", $dest, $localconf, 1, '%', \@lines, @postlines);
+  _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.def",
+                        $dest, $localconf, 1, '%', \@lines, @postlines);
 }
 
 sub create_language_lua {
@@ -2793,8 +2811,8 @@ sub create_language_lua {
   my @lines = $tlpdb->language_lua_lines(
                          get_disabled_local_configs($localconf, '--'));
   my @postlines = ("}\n");
-  _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.lua",
-    $dest, $localconf, 0, '--', \@lines, @postlines);
+  _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.lua",
+                        $dest, $localconf, 0, '--', \@lines, @postlines);
 }
 
 sub _create_config_files {
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/rungs.tlu b/Build/source/texk/texlive/linked_scripts/texlive/rungs.tlu
index 7ac0587b397..277657731ec 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/rungs.tlu
+++ b/Build/source/texk/texlive/linked_scripts/texlive/rungs.tlu
@@ -1,6 +1,6 @@
 #!/usr/bin/env texlua
 --*-Lua-*-
--- $Id: rungs.tlu 7698 2008-04-28 14:23:31Z reinhardk $
+-- $Id: rungs.tlu 29719 2013-04-07 18:42:53Z karl $
 
 -- Copyright (C) 2008 Reinhard Kotucha.
 -- You may freely use, modify and/or distribute this file.
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 9e5b31deb96..b32db227997 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 29609 2013-04-02 17:54:54Z karl $
+# $Id: tlmgr.pl 29747 2013-04-08 18:19:33Z karl $
 #
 # Copyright 2008-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 29609 $';
-my $datrev = '$Date: 2013-04-02 19:54:54 +0200 (Tue, 02 Apr 2013) $';
+my $svnrev = '$Revision: 29747 $';
+my $datrev = '$Date: 2013-04-08 20:19:33 +0200 (Mon, 08 Apr 2013) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -41,7 +41,7 @@ BEGIN {
     $Master = __FILE__;
     $Master =~ s!\\!/!g;
     $Master =~ s![^/]*$!../../..!
-      unless ($Master =~ s!/texmf/scripts/texlive/tlmgr\.pl$!!i);
+      unless ($Master =~ s!/texmf-dist/scripts/texlive/tlmgr\.pl$!!i);
     $bindir = "$Master/bin/win32";
     $kpsewhichname = "kpsewhich.exe";
     # path already set by wrapper batchfile
@@ -69,7 +69,7 @@ BEGIN {
   #
   # make Perl find our packages first:
   unshift (@INC, "$Master/tlpkg");
-  unshift (@INC, "$Master/texmf/scripts/texlive");
+  unshift (@INC, "$Master/texmf-dist/scripts/texlive");
 }
 
 use Cwd qw/abs_path/;
@@ -1379,7 +1379,7 @@ sub load_taxonomy_datafile {
   init_local_db();
   my $taxonomy;
   my $fpath = $localtlpdb->root
-              . "/texmf/scripts/texlive/var/texcatalogue.keywords";
+              . "/texmf-dist/scripts/texlive/var/texcatalogue.keywords";
   if (! -r $fpath) {
     tlwarn("tlmgr: taxonomy file $fpath not readable: $!\n");
     return;
@@ -3135,7 +3135,7 @@ sub action_update {
             }
           }
           if ($bad_file) {
-            tlwarn("The file $k has disappeared from the critical" .
+            tlwarn("$prg: The file $k has disappeared from the critical" .
                    "package $pkg but is still present in @found_pkgs\n");
           } else {
             push @infra_files_to_be_removed, $k;
@@ -3178,14 +3178,14 @@ sub action_update {
 
   # infra update and tlmgr restart on w32 is done by the updater batch script
   if (win32() && !$opts{"list"} && @critical) {
-    info("Preparing TeX Live infrastructure update...\n");
+    info("$prg: Preparing TeX Live infrastructure update...\n");
     for my $f (@infra_files_to_be_removed) {
       debug("file scheduled for removal $f\n");
     }
     my $ret = write_w32_updater($restart_tlmgr, 
                                 \@infra_files_to_be_removed, @critical);
     if ($ret) {
-      tlwarn ("Aborting infrastructure update.\n");
+      tlwarn ("$prg: Aborting infrastructure update.\n");
       $restart_tlmgr = 0 if ($opts{"dry-run"});
     }
   }
@@ -3866,7 +3866,7 @@ sub action_option {
                 $localtlpdb->option($o) . "\n");
         }
       } else {
-        tlwarn ("option $o not supported\n");
+        tlwarn ("$prg: option $o not supported\n");
       }
     }
   } elsif ($what =~ m/^showall$/i) {
@@ -3900,13 +3900,13 @@ sub action_option {
             if ($val =~ m/^ctan$/i) {
               $val = "$TeXLive::TLConfig::TeXLiveURL";
             }
-            info("tlmgr: setting default package repository to $val\n");
+            info("$prg: setting default package repository to $val\n");
             $localtlpdb->option($opt, $val);
           } elsif ($what eq $TLPDBOptions{"backupdir"}->[2]) {
-            info("tlmgr: setting option $what to $val.\n");
+            info("$prg: setting option $what to $val.\n");
             if (! -d $val) {
-              info("tlmgr: the directory $val does not exists, it has to be created\n");
-              info("tlmgr: before backups can be done automatically.\n");
+              info("$prg: the directory $val does not exists, it has to be created\n");
+              info("$prg: before backups can be done automatically.\n");
             }
             $localtlpdb->option($opt, $val);
           } elsif ($what eq $TLPDBOptions{"w32_multi_user"}->[2]) {
@@ -3919,7 +3919,7 @@ sub action_option {
               } else {
                 if ($val) {
                   # non admin and tries to set to true, warn
-                  tlwarn("tlmgr: non-admin user cannot set $TLPDBOptions{'w32_multi_user'}->[2] option to true\n");
+                  tlwarn("$prg: non-admin user cannot set $TLPDBOptions{'w32_multi_user'}->[2] option to true\n");
                 } else {
                   $do_it = 1;
                 }
@@ -3929,10 +3929,10 @@ sub action_option {
             }
             if ($do_it) {
               if ($val) {
-                info("tlmgr: setting option $what to 1.\n");
+                info("$prg: setting option $what to 1.\n");
                 $localtlpdb->option($opt, 1);
               } else {
-                info("tlmgr: setting option $what to 0.\n");
+                info("$prg: setting option $what to 0.\n");
                 $localtlpdb->option($opt, 0);
               }
             }
@@ -3940,17 +3940,17 @@ sub action_option {
             # default case, switch for different types
             if ($TLPDBOptions{$opt}->[0] eq "b") {
               if ($val) {
-                info("tlmgr: setting option $what to 1.\n");
+                info("$prg: setting option $what to 1.\n");
                 $localtlpdb->option($opt, 1);
               } else {
-                info("tlmgr: setting option $what to 0.\n");
+                info("$prg: setting option $what to 0.\n");
                 $localtlpdb->option($opt, 0);
               }
             } elsif ($TLPDBOptions{$opt}->[0] eq "p") {
-              info("tlmgr: setting option $what to $val.\n");
+              info("$prg: setting option $what to $val.\n");
               $localtlpdb->option($opt, $val);
             } elsif ($TLPDBOptions{$opt}->[0] eq "u") {
-              info("tlmgr: setting option $what to $val.\n");
+              info("$prg: setting option $what to $val.\n");
               $localtlpdb->option($opt, $val);
             } elsif ($TLPDBOptions{$opt}->[0] =~ m/^n(:((-)?\d+)?..((-)?\d+)?)?$/) {
               my $isgood = 1;
@@ -3975,7 +3975,7 @@ sub action_option {
                 }
               }
               if ($isgood) {
-                info("tlmgr: setting option $what to $n.\n");
+                info("$prg: setting option $what to $n.\n");
                 $localtlpdb->option($opt, $n);
               }
             } else {
@@ -4006,7 +4006,7 @@ sub action_option {
       }
     }
     if (!$found) {
-      tlwarn("tlmgr: option $what not supported!\n");
+      tlwarn("$prg: option $what not supported!\n");
     }
   }
   return;
@@ -4590,7 +4590,7 @@ sub check_files {
   #
   my @IgnorePatterns = qw!
     support/ source/ setuptl/
-    texmf-dist/ls-R$ texmf-doc/ls-R$ texmf/ls-R$
+    texmf-dist/ls-R$ texmf-doc/ls-R$
     tlpkg/tlpsrc tlpkg/bin tlpkg/lib/ tlpkg/libexec tlpkg/tests/ tlpkg/etc
     tlpkg/texlive.tlpdb
     tlpkg/tlpobj
@@ -4771,7 +4771,7 @@ sub check_executes {
         foreach my $k (keys %mapfn) {
           my @bla = @{$mapfn{$k}};
           if ($#bla > 0) {
-            tlwarn ("map file $mf occurs multiple times (in pkg @bla)!\n");
+            tlwarn ("map file $mf occurs multiple times (in pkgs: @bla)!\n");
           }
         }
       } else {
@@ -5116,7 +5116,7 @@ sub action_conf {
       $cf->save;
     }
   } else {
-    warn "tlmgr: unknown conf arg: $arg (try tlmgr or texmf)\n";
+    warn "$prg: unknown conf arg: $arg (try tlmgr or texmf)\n";
   }
 }
 
@@ -5296,7 +5296,7 @@ sub init_tlmedia
   # this "location-url" line should not be changed since GUI programs
   # depend on it:
   print "location-url\t$locstr\n" if $::machinereadable;
-  info("tlmgr: package repositories:\n");
+  info("$prg: package repositories:\n");
   info("\tmain = " . $repos{'main'} . "\n");
   for my $t (@tags) {
     if ($t ne 'main') {
@@ -5340,7 +5340,7 @@ sub _init_tlmedia
   # this "location-url" line should not be changed since GUI programs
   # depend on it:
   print "location-url\t$location\n" if $::machinereadable;
-  info("tlmgr: package repository $location\n");
+  info("$prg: package repository $location\n");
   return 1;
 }
 
@@ -5520,7 +5520,7 @@ sub finish
   my ($ret) = @_;
 
   if ($ret > 0) {
-    print "tlmgr: exiting unsuccessfully (status $ret).\n";
+    print "$prg: exiting unsuccessfully (status $ret).\n";
   }
 
   if ($opts{"pause"}) {
diff --git a/Build/source/utils/biber/TeXLive/TLConfig.pm b/Build/source/utils/biber/TeXLive/TLConfig.pm
index bbecba1651e..6eb7755df44 100644
--- a/Build/source/utils/biber/TeXLive/TLConfig.pm
+++ b/Build/source/utils/biber/TeXLive/TLConfig.pm
@@ -1,11 +1,11 @@
 # TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
+# Copyright 2007-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLConfig;
 
-my $svnrev = '$Revision: 27010 $';
+my $svnrev = '$Revision: 29725 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -53,7 +53,7 @@ BEGIN {
 
 # the year of our release, will be used in the location of the
 # network packages, and in menu names, and other places.
-$ReleaseYear = 2012;
+$ReleaseYear = 2013;
 
 # users can upgrade from this year to the current year; maybe a spread
 # of more than one year will be useful at some point, but not now.
diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm
index a2f9f7fd536..f4faeef0d56 100644
--- a/Build/source/utils/biber/TeXLive/TLUtils.pm
+++ b/Build/source/utils/biber/TeXLive/TLUtils.pm
@@ -1,11 +1,11 @@
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2012 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2013 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 29199 $';
+my $svnrev = '$Revision: 29725 $';
 my $_modulerevision;
 if ($svnrev =~ m/: ([0-9]+) /) {
   $_modulerevision = $1;
@@ -269,10 +269,15 @@ sub platform_name {
   my $OS;  # O/S type as reported by config.guess.
   ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
   $CPU =~ s/^alpha(.*)/alpha/;   # alphaev whatever
-  $CPU =~ s/armv\dl/armel/;      # arm whatever
+  $CPU =~ s/mips64el/mipsel/;    # don't distinguish mips64 and 32 el
   $CPU =~ s/powerpc64/powerpc/;  # don't distinguish ppc64
   $CPU =~ s/sparc64/sparc/;      # don't distinguish sparc64
-  $CPU =~ s/mips64el/mipsel/;    # don't distinguish mips64 and 32 el
+
+  # armv6l-unknown-linux-gnueabihf -> armhf-linux (RPi)
+  # armv7l-unknown-linux-gnueabi   -> armel-linux (Android)
+  if ($CPU =~ /^arm/) {
+    $CPU = $guessed_platform =~ /hf$/ ? "armhf" : "armel";
+  }
 
   my @OSs = qw(aix cygwin darwin freebsd hpux irix
                kfreebsd linux netbsd openbsd solaris);
@@ -285,10 +290,18 @@ sub platform_name {
   }
   
   if ($OS eq "darwin") {
-    # We never want to guess x86_64-darwin even if config.guess
-    # does, because Leopard can be 64-bit but our x86_64-darwin
-    # binaries will only run on Snow Leopard.
-    $CPU = "universal";
+    # We want to guess x86_64-darwin on new-enough systems.  
+    # Most robust approach is to check sw_vers (os version)
+    # and sysctl (processor hardware).
+    chomp (my $sw_vers = `sw_vers -productVersion`);
+    my ($os_major,$os_minor) = split (/\./, $sw_vers);
+    #
+    chomp (my $sysctl = `sysctl hw.cpu64bit_capable`);
+    my (undef,$hw_64_bit) = split (" ", $sysctl);
+    #
+    $CPU = ($os_major >= 10 && $os_minor >= 6 && $hw_64_bit >= 1)
+           ? "x86_64" : "universal";
+    
   } elsif ($CPU =~ /^i.86$/) {
     $CPU = "i386";  # 586, 686, whatever
   }
@@ -312,10 +325,10 @@ sub platform_desc {
 
   my %platform_name = (
     'alpha-linux'      => 'DEC Alpha with GNU/Linux',
-    'alphaev5-osf'     => 'DEC Alphaev5 OSF',
     'amd64-freebsd'    => 'x86_64 with FreeBSD',
     'amd64-kfreebsd'   => 'x86_64 with GNU/kFreeBSD',
     'armel-linux'      => 'ARM with GNU/Linux',
+    'armhf-linux'      => 'ARMhf with GNU/Linux',
     'hppa-hpux'        => 'HP-UX',
     'i386-cygwin'      => 'Intel x86 with Cygwin',
     'i386-darwin'      => 'Intel x86 with MacOSX/Darwin',
@@ -1964,24 +1977,26 @@ sub add_remove_symlinks {
   return if win32();
   if ($mode eq "add") {
     $errors++ unless add_link_dir_dir($plat_bindir, $sys_bin);
-    if (-d "$Master/texmf/doc/info") {
-      $errors++ unless add_link_dir_dir("$Master/texmf/doc/info", $sys_info);
+    if (-d "$Master/texmf-dist/doc/info") {
+      $errors++
+        unless add_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info);
     }
   } elsif ($mode eq "remove") {
     $errors++ unless remove_link_dir_dir($plat_bindir, $sys_bin);
-    if (-d "$Master/texmf/doc/info") {
-      $errors++ unless remove_link_dir_dir("$Master/texmf/doc/info", $sys_info);
+    if (-d "$Master/texmf-dist/doc/info") {
+      $errors++
+        unless remove_link_dir_dir("$Master/texmf-dist/doc/info", $sys_info);
     }
   } else {
     die ("should not happen, unknown mode $mode in add_remove_symlinks!");
   }
   mkdirhier $sys_man if ($mode eq "add");
-  if (-w  $sys_man && -d "$Master/texmf/doc/man") {
+  if (-w  $sys_man && -d "$Master/texmf-dist/doc/man") {
     debug("$mode symlinks for man pages in $sys_man\n");
-    my $foo = `(cd "$Master/texmf/doc/man" && echo *)`;
+    my $foo = `(cd "$Master/texmf-dist/doc/man" && echo *)`;
     chomp (my @mans = split (' ', $foo));
     foreach my $m (@mans) {
-      my $mandir = "$Master/texmf/doc/man/$m";
+      my $mandir = "$Master/texmf-dist/doc/man/$m";
       next unless -d $mandir;
       if ($mode eq "add") {
         $errors++ unless add_link_dir_dir($mandir, "$sys_man/$m");
@@ -2479,13 +2494,14 @@ sub download_file {
     $url = "$TeXLiveURL/$relpath";
   }
   if (defined($::tldownload_server) && $::tldownload_server->enabled) {
-    debug("persistent connection set up, trying to get file.\n");
-    if (($ret = $::tldownload_server->get_file($url, $dest))) {
-      debug("downloading file via permanent connection succeeded\n");
+    debug("persistent connection set up, trying to get $url (for $dest)\n");
+    $ret = $::tldownload_server->get_file($url, $dest);
+    if ($ret) {
+      debug("downloading file via persistent connection succeeded\n");
       return $ret;
     } else {
-      tlwarn("permanent server connection set up, but downloading did not succeed!");
-      tlwarn("Retrying with wget.\n");
+      tlwarn("tlmgr: persistent connection ok, but download failed: $url\n");
+      tlwarn("tlmgr: retrying with wget.\n");
     }
   } else {
     if (!defined($::tldownload_server)) {
@@ -2674,7 +2690,7 @@ sub create_fmtutil {
   my ($tlpdb,$dest,$localconf) = @_;
   my @lines = $tlpdb->fmtutil_cnf_lines(
                          get_disabled_local_configs($localconf, '#'));
-  _create_config_files($tlpdb, "texmf/web2c/fmtutil-hdr.cnf", $dest,
+  _create_config_files($tlpdb, "texmf-dist/web2c/fmtutil-hdr.cnf", $dest,
                        $localconf, 0, '#', \@lines);
 }
 
@@ -2682,7 +2698,7 @@ sub create_updmap {
   my ($tlpdb,$dest) = @_;
   check_for_old_updmap_cfg();
   my @tlpdblines = $tlpdb->updmap_cfg_lines();
-  _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest,
+  _create_config_files($tlpdb, "texmf-dist/web2c/updmap-hdr.cfg", $dest,
                        undef, 0, '#', \@tlpdblines);
 }
 
@@ -2772,8 +2788,8 @@ sub create_language_dat {
   # no checking for disabled stuff for language.dat and .def
   my @lines = $tlpdb->language_dat_lines(
                          get_disabled_local_configs($localconf, '%'));
-  _create_config_files($tlpdb, "texmf/tex/generic/config/language.us", $dest,
-                       $localconf, 0, '%', \@lines);
+  _create_config_files($tlpdb, "texmf-dist/tex/generic/config/language.us",
+                       $dest, $localconf, 0, '%', \@lines);
 }
 
 sub create_language_def {
@@ -2785,7 +2801,8 @@ sub create_language_def {
   push @postlines, "%%% No changes may be made beyond this point.\n";
   push @postlines, "\n";
   push @postlines, "\\uselanguage {USenglish}             %%% This MUST be the last line of the file.\n";
-  _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.def", $dest, $localconf, 1, '%', \@lines, @postlines);
+  _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.def",
+                        $dest, $localconf, 1, '%', \@lines, @postlines);
 }
 
 sub create_language_lua {
@@ -2794,8 +2811,8 @@ sub create_language_lua {
   my @lines = $tlpdb->language_lua_lines(
                          get_disabled_local_configs($localconf, '--'));
   my @postlines = ("}\n");
-  _create_config_files ($tlpdb, "texmf/tex/generic/config/language.us.lua",
-    $dest, $localconf, 0, '--', \@lines, @postlines);
+  _create_config_files ($tlpdb,"texmf-dist/tex/generic/config/language.us.lua",
+                        $dest, $localconf, 0, '--', \@lines, @postlines);
 }
 
 sub _create_config_files {
diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt
index a8d883be3cd..ea11327f481 100644
--- a/Master/tlpkg/dev/srclist.txt
+++ b/Master/tlpkg/dev/srclist.txt
@@ -14,8 +14,8 @@
 # The output will be diffs for any files that are not up to date.
 
 # Basic config files.
-##(until needed) Master/texmf/web2c/texmf.cnf  Build/source/texk/kpathsea/
-Master/texmf/web2c/fmtutil.cnf Build/source/texk/texlive/linked_scripts/tetex/fmtutil.cnf
+Master/texmf-dist/web2c/texmf.cnf  Build/source/texk/kpathsea/
+Master/texmf-dist/web2c/fmtutil.cnf Build/source/texk/texlive/linked_scripts/tetex/fmtutil.cnf
 #
 # Platform detection for biber and tests:
 Master/tlpkg/TeXLive/TLUtils.pm  Build/source/utils/biber/TeXLive/
@@ -25,7 +25,7 @@ Master/tlpkg/TeXLive/TLUtils.pm  Build/source/texk/tests/TeXLive/
 Master/tlpkg/TeXLive/TLConfig.pm Build/source/texk/tests/TeXLive/
 #
 # Glyph lists used by pdftex, now maintained in lcdf-typetools:
-Build/source/texk/lcdf-typetools/lcdf-typetools-*/glyphtounicode.tex Master/texmf/tex/generic/pdftex/glyphtounicode.tex
+Build/source/texk/lcdf-typetools/lcdf-typetools-*/glyphtounicode.tex Master/texmf-dist/tex/generic/pdftex/glyphtounicode.tex
 Build/source/texk/lcdf-typetools/lcdf-typetools-*/glyphlist.txt Master/texmf-dist/fonts/map/glyphlist/glyphlist.txt
 Build/source/texk/lcdf-typetools/lcdf-typetools-*/texglyphlist.txt Master/texmf-dist/fonts/map/glyphlist/texglyphlist.txt
 #