summaryrefslogtreecommitdiff
path: root/systems/texlive/tlnet/tlpkg/TeXLive
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-04-02 03:20:54 +0000
committerNorbert Preining <norbert@preining.info>2021-04-02 03:20:54 +0000
commit3f173002d4a4a84e7d1fa5a74755fdd00d08a9c2 (patch)
tree5ed380344702de1f9ab53b68b6c3bcd6b8458087 /systems/texlive/tlnet/tlpkg/TeXLive
parentf78ba658b3ecd56053fe0837a4404d0c6c16a707 (diff)
CTAN sync 202104020320
Diffstat (limited to 'systems/texlive/tlnet/tlpkg/TeXLive')
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm10
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm4
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm4
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm30
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm6
-rw-r--r--systems/texlive/tlnet/tlpkg/TeXLive/trans.pl10
6 files changed, 32 insertions, 32 deletions
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
index d620ef3495..14cfe32053 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLConfig.pm
@@ -1,12 +1,12 @@
-# $Id: TLConfig.pm 58675 2021-03-23 22:36:02Z karl $
+# $Id: TLConfig.pm 57875 2021-02-24 18:27:49Z karl $
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007-2020 Norbert Preining
+# Copyright 2007-2021 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 58675 $';
+my $svnrev = '$Revision: 57875 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -59,7 +59,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 = 2020;
+$ReleaseYear = 2021;
# users can upgrade from this year to the current year; might be the
# same as the release year, or any number of releases earlier.
@@ -167,7 +167,7 @@ our %TLPDBConfigs = (
"container_format" => $DefaultCompressorFormat,
"minrelease" => $MinRelease,
"release" => $ReleaseYear,
- "frozen" => 1,
+ "frozen" => 0,
);
# definition of the option strings and their value types
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
index f62d61591d..d99f36d015 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
@@ -1,4 +1,4 @@
-# $Id: TLPOBJ.pm 58382 2021-03-15 04:20:36Z preining $
+# $Id: TLPOBJ.pm 58384 2021-03-15 04:22:12Z preining $
# TeXLive::TLPOBJ.pm - module for using tlpobj files
# Copyright 2007-2019 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
package TeXLive::TLPOBJ;
-my $svnrev = '$Revision: 58382 $';
+my $svnrev = '$Revision: 58384 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
index 8f8cf248c6..3a5924d050 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
@@ -1,4 +1,4 @@
-# $Id: TLPSRC.pm 58462 2021-03-17 01:25:11Z preining $
+# $Id: TLPSRC.pm 58463 2021-03-17 01:26:23Z preining $
# TeXLive::TLPSRC.pm - module for handling tlpsrc files
# Copyright 2007-2020 Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -12,7 +12,7 @@ use TeXLive::TLUtils;
use TeXLive::TLPOBJ;
use TeXLive::TLTREE;
-my $svnrev = '$Revision: 58462 $';
+my $svnrev = '$Revision: 58463 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
index 76b1c77af5..886553a8cd 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 57772 2021-02-17 19:01:36Z karl $
+# $Id: TLUtils.pm 58139 2021-03-05 00:26:37Z preining $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007-2021 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 57772 $';
+my $svnrev = '$Revision: 58139 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -340,15 +340,15 @@ sub platform_name {
if ($OS eq "darwin") {
# We have two versions of Mac binary sets.
- # 10.x and newer -> x86_64-darwin [MacTeX]
- # 10.6/Snow Leopard through 10.x -> x86_64-darwinlegacy, if 64-bit
- # x changes every year. In 2020 (Big Sur) Apple started with 11.x.
+ # 10.x and newer -> universal-darwin [MacTeX]
+ # 10.6/Snow Leopard through 10.x -> x86_64-darwinlegacy, if 64-bit.
+ # x changes every year. As of TL 2021 (Big Sur) Apple started with 11.x.
#
# (BTW, uname -r numbers are larger by 4 than the Mac minor version.
# We don't use uname numbers here.)
#
# this changes each year, per above:
- my $mactex_darwin = 13; # lowest minor rev supported by x86_64-darwin.
+ my $mactex_darwin = 14; # lowest minor rev supported by x86_64-darwin.
#
# Most robust approach is apparently to check sw_vers (os version,
# returns "10.x" values), and sysctl (processor hardware).
@@ -359,12 +359,11 @@ sub platform_name {
. " (from sw_vers -productVersion: $sw_vers)\n";
return "unknownmac-unknownmac";
}
- if ($os_major >= 11) {
- $CPU = "x86_64";
+ # have to refine after all 10.x become "legacy".
+ if ($os_major >= 11 || $os_minor >= $mactex_darwin) {
+ $CPU = "universal";
$OS = "darwin";
- } elsif ($os_minor >= $mactex_darwin) {
- ; # sufficiently new 10.x, default is ok (x86_64-darwin).
- } elsif ($os_minor >= 6 && $os_minor < $mactex_darwin) {
+ } elsif ($os_major == 10 && 6 <= $os_minor && $os_minor < $mactex_darwin){
# in between, x86 hardware only. On 10.6 only, must check if 64-bit,
# since if later than that, always 64-bit.
my $is64 = $os_minor == 6
@@ -425,10 +424,9 @@ sub platform_desc {
'powerpc-linux' => 'GNU/Linux on PowerPC',
'sparc-linux' => 'GNU/Linux on Sparc',
'sparc-solaris' => 'Solaris on Sparc',
- 'universal-darwin' => 'MacOSX universal binaries',
+ 'universal-darwin' => 'MacOSX current (10.14-) on ARM/x86_64',
'win32' => 'Windows',
'x86_64-cygwin' => 'Cygwin on x86_64',
- 'x86_64-darwin' => 'MacOSX current (10.13-) on x86_64',
'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-) on x86_64',
'x86_64-dragonfly' => 'DragonFlyBSD on x86_64',
'x86_64-linux' => 'GNU/Linux on x86_64',
@@ -1581,9 +1579,11 @@ sub install_packages {
$donesize += $tlpsizes{$package};
}
my $totaltime = time() - $starttime;
- my $totmin = int ($totaltime/60);
+ my $tothour = int ($totaltime/3600);
+ my $totmin = (int ($totaltime/60)) % 60;
my $totsec = $totaltime % 60;
- info(sprintf("Time used for installing the packages: %02d:%02d\n",
+ my $hrstr = ($tothour > 0 ? "$tothour:" : "");
+ info(sprintf("Time used for installing the packages: $hrstr%02d:%02d\n",
$totmin, $totsec));
$totlpdb->save;
return 1;
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm b/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm
index 7476504af2..35e92c7300 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/TLWinGoo.pm
@@ -1,4 +1,4 @@
-# $Id: TLWinGoo.pm 56511 2020-10-02 13:04:56Z siepo $
+# $Id: TLWinGoo.pm 58646 2021-03-23 03:34:22Z preining $
# TeXLive::TLWinGoo.pm - Windows goop.
# Copyright 2008-2018 Siep Kroonenberg, Norbert Preining
# This file is licensed under the GNU General Public License version 2
@@ -11,7 +11,7 @@
package TeXLive::TLWinGoo;
-my $svnrev = '$Revision: 56511 $';
+my $svnrev = '$Revision: 58646 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -1426,7 +1426,7 @@ sub maybe_make_ro {
my $cmd = 'cmd /c "icacls . /reset && icacls . /inheritance:r'.
' /grant:r *S-1-5-32-544:(OI)(CI)F'.
' /grant:r *S-1-5-11:(OI)(CI)RX /grant:r *S-1-5-32-545:(OI)(CI)RX"';
- log "Making read-only\n".`$cmd`."\n";
+ log "Making read-only\n".Encode::decode(console_out,`$cmd`)."\n";
# go back to original directory
chdir $curdir;
diff --git a/systems/texlive/tlnet/tlpkg/TeXLive/trans.pl b/systems/texlive/tlnet/tlpkg/TeXLive/trans.pl
index 0a905254b4..01fd82169f 100644
--- a/systems/texlive/tlnet/tlpkg/TeXLive/trans.pl
+++ b/systems/texlive/tlnet/tlpkg/TeXLive/trans.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: trans.pl 41176 2016-05-16 00:42:28Z preining $
+# $Id: trans.pl 58557 2021-03-20 22:01:24Z siepo $
# Copyright 2009-2016 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -96,16 +96,16 @@ sub __ ($@) {
}
# $ret is already set initially
}
+ $ret =~ s/\\n/\n/g;
+ $ret =~ s/\\"/"/g;
+ $ret =~ s/\\\\/\\/g;
}
# translate back $ret:
- $ret =~ s/\\n/\n/g;
- $ret =~ s/\\"/"/g;
- $ret =~ s/\\\\/\\/g;
return sprintf($ret, @_);
}
sub load_translations() {
- if (($::lang ne "en") && ($::lang ne "C")) {
+ if (defined($::lang) && ($::lang ne "en") && ($::lang ne "C")) {
my $code = $::lang;
my @files_to_check;
if (defined($::area)) {