Merge branch 'master' into build/work000 r71584 #158

source/build-aux/ar-lib

@@ -2,7 +2,7 @@
 # Wrapper for Microsoft lib.exe
 
 me=ar-lib
-scriptversion=2019-07-04.01; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 2010-2024 Free Software Foundation, Inc.
 # Written by Peter Rosin <[email protected]>.
@@ -105,11 +105,15 @@ case $1 in
 Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
 
 Members may be specified in a file named with @FILE.
+
+Report bugs to <[email protected]>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
 EOF
     exit $?
     ;;
   -v | --v*)
-    echo "$me, version $scriptversion"
+    echo "$me (GNU Automake) $scriptversion"
     exit $?
     ;;
 esac

source/build-aux/compile

@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 1999-2024 Free Software Foundation, Inc.
 # Written by Tom Tromey <[email protected]>.
@@ -254,7 +254,7 @@ EOF
     exit $?
     ;;
   -v | --v*)
-    echo "compile $scriptversion"
+    echo "compile (GNU Automake) $scriptversion"
     exit $?
     ;;
   cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \

source/build-aux/depcomp

@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2024-06-07.03; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # Copyright (C) 1999-2024 Free Software Foundation, Inc.
 
@@ -53,7 +53,7 @@ EOF
     exit $?
     ;;
   -v | --v*)
-    echo "depcomp $scriptversion"
+    echo "depcomp (GNU Automake) $scriptversion"
     exit $?
     ;;
 esac

source/build-aux/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2024-06-07.14; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -170,7 +170,7 @@ while test $# -ne 0; do
 
     -T) is_target_a_directory=never;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
 
     --) shift
         break;;

source/libs/icu/icu-src/source/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2024-06-07.14; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -170,7 +170,7 @@ while test $# -ne 0; do
 
     -T) is_target_a_directory=never;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
 
     --) shift
         break;;

source/texk/web2c/ctiedir/ChangeLog

@@ -1,3 +1,7 @@
+2024-06-18  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctie-k.ch: Recreate with 'f-c-l -ph ctie.w ctie-k.ch'.
+
 2023-09-03  TANAKA Takuji  <[email protected]>
 
 	* ctie.test: Make easier to test on Windows.

source/texk/web2c/ctiedir/ctie-k.ch

@@ -65,7 +65,7 @@ permission notice identical to this one.
 @z
 
 @x [1] l.81
-@d copyright 
+@d copyright
     "Copyright 2002,2003 Julian Gilbey.  All rights reserved.  There is no warranty.\n\
 Run with the --version option for other important information."
 @y
@@ -304,7 +304,7 @@ The next piece is simplified using the kpathsea kpse_find_file
 function.
 
 @x [27] l.497
-If the environment variable \.{CWEBINPUTS} is set, or if the compiler flag 
+If the environment variable \.{CWEBINPUTS} is set, or if the compiler flag
 of the same name was defined at compile time,
 \.{CWEB} will look for include files in the directory thus named, if
 it cannot find them in the current directory.
@@ -315,7 +315,7 @@ variable) to search for this [email protected]@>
 @z
 
 @x [27] l.510 Don't need the same variables any longer
-    char temp_file_name[max_file_name_length]; 
+    char temp_file_name[max_file_name_length];
     char *file_name_end;
     char *k, *kk;
     int l; /* length of file name */
@@ -344,7 +344,7 @@ variable) to search for this [email protected]@>
         if ((l=strlen(CWEBINPUTS))>max_file_name_length-2) too_long();
         strcpy(temp_file_name, CWEBINPUTS);
 #else
-        l=0; 
+        l=0;
 #endif /* |CWEBINPUTS| */
     }
     if (l>0) {

source/texk/web2c/cwebdir/twinx.ch

@@ -157,6 +157,8 @@ Section 12.
   } while(fgets(buf,buf_size,f));
 @z
 
+Section 14.
+
 @x l.289 C++17 removed 'register' storage class.
 while (1) {@+register node *p,*q,*r,*s,*t;
 @y
@@ -238,6 +240,8 @@ void collapse(
 {@+node *x;
 @z
 
+Section 21.
+
 @x l.403 C++17 removed 'register' storage class.
 {@+register node *x;
 @y