summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/README12
-rw-r--r--Master/texmf-dist/scripts/texlive/NEWS2
-rwxr-xr-xMaster/tlpkg/bin/cmp-textfiles12
3 files changed, 15 insertions, 11 deletions
diff --git a/Build/source/README b/Build/source/README
index 7c22875b021..6efe9fdac22 100644
--- a/Build/source/README
+++ b/Build/source/README
@@ -33,11 +33,13 @@ aarch64-linux:
./Build --enable-arm-neon=check
i386-netbsd, amd64-netbsd:
- gcc version 4.5.3 (NetBSD nb2 20110806)
- NetBSD/amd64 6.1.3
- TL_MAKE=gmake CC=gcc CXX=g++ CFLAGS=-D_NETBSD_SOURCE \
- LDFLAGS='-L/usr/X11R7/lib -Wl,-rpath,/usr/X11R7/lib' \
- ./Build --enable-xindy CLISP=/usr/local/bin/clisp
+ NetBSD/amd64 9.0
+ gcc version 7.4.0 (nb3 20190319)
+ TL_MAKE=gmake CC=gcc CXX=g++ \
+ CFLAGS=-D_NETBSD_SOURCE \
+ CXXFLAGS='-D_NETBSD_SOURCE -std=c++11' \
+ LDFLAGS='-L/usr/X11R7/lib -Wl,-rpath,/usr/X11R7/lib' \
+ ./Build --enable-xindy CLISP=/usr/local/bin/clisp --disable-dvisvgm
i386-freebsd, amd64-freebsd:
http://anthesphoria.net/FreeBSD/TeXLive-2018/ has details for 2018.
diff --git a/Master/texmf-dist/scripts/texlive/NEWS b/Master/texmf-dist/scripts/texlive/NEWS
index 3e8b7ee5483..377308f73e2 100644
--- a/Master/texmf-dist/scripts/texlive/NEWS
+++ b/Master/texmf-dist/scripts/texlive/NEWS
@@ -1,6 +1,8 @@
(This file public domain. Originally written by Norbert Preining and
Karl Berry, 2010.)
+<li>more specific verification error messages
+
<p><b>tlmgr 53428 (released 17jan20):</b>
<li>automatic retry of packages that fail to download.
<li>rearrange packaging so little-used scripts are not part of
diff --git a/Master/tlpkg/bin/cmp-textfiles b/Master/tlpkg/bin/cmp-textfiles
index d0b3e30a152..053020c2264 100755
--- a/Master/tlpkg/bin/cmp-textfiles
+++ b/Master/tlpkg/bin/cmp-textfiles
@@ -1,7 +1,8 @@
#!/usr/bin/env perl
# $Id$
# Public domain. Originally written 2008, Karl Berry.
-# Compare two files considering CR, LF, and CRLF as equivalent. ,
+# Compare two files considering CR, LF, and CRLF as equivalent,
+# ignoring blank lines,
# and ignoring %% lines (see below).
#
# Used in place and tlpkg-ctan-check in TeX Live.
@@ -12,7 +13,7 @@ sub main {
if (@ARGV != 2) {
warn <<END_USAGE;
Usage: $0 FILE1 FILE2.
-Compare as text files, ignoring line endings.
+Compare as text files, ignoring line endings and %% lines.
Exit status is zero if the same, 1 if different, something else if trouble.
END_USAGE
exit $ARGV[0] eq "--help" ? 0 : 2;
@@ -38,15 +39,14 @@ sub read_file {
my ($fname) = @_;
my $ret = "";
- local *FILE;
- open (FILE, $fname) || die "open($fname) failed: $!";
- while (<FILE>) {
+ open (my $FILE, $fname) || die "open($fname) failed: $!";
+ while (<$FILE>) {
s/\r\n?/\n/g;
next if /^\s*%%\s*$/; # ignore %% lines, see above.
#warn "line is |$_|";
$ret .= $_;
}
- close (FILE) || warn "close($fname) failed: $!";
+ close ($FILE) || warn "close($fname) failed: $!";
# if the file did not have a trailing newline, add one for purposes of
# comparison, since it can slip in if we edit it, etc.