summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-06-27 22:42:40 +0000
committerKarl Berry <karl@freefriends.org>2013-06-27 22:42:40 +0000
commit1b913c21141d09d33723f2553b6ee1c3efbdd4ff (patch)
treee835ac670171d26046c6b24d4edb2d12a2128538
parent74e5bb2cc273f132affd669ccf00cf3302e2e10e (diff)
sync
git-svn-id: svn://tug.org/texlive/trunk@30985 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/build-aux/ylwrap26
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm3
-rw-r--r--Build/source/texk/texlive/tl_scripts/fmtutil.cnf6
-rw-r--r--Build/source/utils/biber/TeXLive/TLUtils.pm3
-rw-r--r--[-rwxr-xr-x]Master/texmf-dist/doc/fonts/librecaslon/OFL.txt0
5 files changed, 21 insertions, 17 deletions
diff --git a/Build/source/build-aux/ylwrap b/Build/source/build-aux/ylwrap
index 8f072a8e97c..1c4d77612c5 100755
--- a/Build/source/build-aux/ylwrap
+++ b/Build/source/build-aux/ylwrap
@@ -1,7 +1,7 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
-scriptversion=2013-01-12.17; # UTC
+scriptversion=2012-12-21.17; # UTC
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
@@ -40,7 +40,7 @@ get_dirname ()
# guard FILE
# ----------
# The CPP macro used to guard inclusion of FILE.
-guard ()
+guard()
{
printf '%s\n' "$1" \
| sed \
@@ -96,17 +96,17 @@ esac
# The input.
-input=$1
+input="$1"
shift
# We'll later need for a correct munging of "#line" directives.
input_sub_rx=`get_dirname "$input" | quote_for_sed`
-case $input in
+case "$input" in
[\\/]* | ?:[\\/]*)
# Absolute path; do nothing.
;;
*)
# Relative path. Make it absolute.
- input=`pwd`/$input
+ input="`pwd`/$input"
;;
esac
input_rx=`get_dirname "$input" | quote_for_sed`
@@ -132,8 +132,8 @@ sed_fix_filenames=
# guard in its implementation file.
sed_fix_header_guards=
-while test $# -ne 0; do
- if test x"$1" = x"--"; then
+while test "$#" -ne 0; do
+ if test "$1" = "--"; then
shift
break
fi
@@ -153,14 +153,16 @@ while test $# -ne 0; do
done
# The program to run.
-prog=$1
+prog="$1"
shift
# Make any relative path in $prog absolute.
-case $prog in
+case "$prog" in
[\\/]* | ?:[\\/]*) ;;
- *[\\/]*) prog=`pwd`/$prog ;;
+ *[\\/]*) prog="`pwd`/$prog" ;;
esac
+# FIXME: add hostname here for parallel makes that run commands on
+# other machines. But that might take us over the 14-char limit.
dirname=ylwrap$$
do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret'
trap "ret=129; $do_exit" 1
@@ -186,7 +188,7 @@ if test $ret -eq 0; then
# otherwise prepend '../'.
case $to in
[\\/]* | ?:[\\/]*) target=$to;;
- *) target=../$to;;
+ *) target="../$to";;
esac
# Do not overwrite unchanged header files to avoid useless
@@ -195,7 +197,7 @@ if test $ret -eq 0; then
# output of all other files to a temporary file so we can
# compare them to existing versions.
if test $from != $parser; then
- realtarget=$target
+ realtarget="$target"
target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'`
fi
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index fdc594d2c2c..8710c7b0e2a 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -5,7 +5,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 30367 $';
+my $svnrev = '$Revision: 30935 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -342,6 +342,7 @@ sub platform_desc {
'i386-linux' => 'Intel x86 with GNU/Linux',
'i386-solaris' => 'Intel x86 with Solaris',
'mips-irix' => 'SGI IRIX',
+ 'mipsel-linux' => 'MIPSel with GNU/Linux',
'powerpc-aix' => 'PowerPC with AIX',
'powerpc-darwin' => 'PowerPC with MacOSX/Darwin',
'powerpc-linux' => 'PowerPC with GNU/Linux',
diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
index 16ee26b61cc..895bb98cc36 100644
--- a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
+++ b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
@@ -1,4 +1,4 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Fri May 3 03:37:00 2013
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Wed Jun 26 03:19:14 2013
# Originally written by Thomas Esser, 1998. Public domain.
#
# As of TeX Live 2008, the final fmtutil.cnf is generated by
@@ -57,8 +57,8 @@ pdfcslatex pdftex - -etex cslatex.ini
# from csplain:
csplain pdftex - -etex -enc csplain-utf8.ini
pdfcsplain pdftex - -etex -enc csplain-utf8.ini
-#! pdfcsplain xetex - -etex csplain.ini
-#! pdfcsplain luatex - -etex csplain.ini
+pdfcsplain xetex - -etex csplain.ini
+pdfcsplain luatex - -etex csplain.ini
#
# from eplain:
eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm
index fdc594d2c2c..8710c7b0e2a 100644
--- a/Build/source/utils/biber/TeXLive/TLUtils.pm
+++ b/Build/source/utils/biber/TeXLive/TLUtils.pm
@@ -5,7 +5,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 30367 $';
+my $svnrev = '$Revision: 30935 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -342,6 +342,7 @@ sub platform_desc {
'i386-linux' => 'Intel x86 with GNU/Linux',
'i386-solaris' => 'Intel x86 with Solaris',
'mips-irix' => 'SGI IRIX',
+ 'mipsel-linux' => 'MIPSel with GNU/Linux',
'powerpc-aix' => 'PowerPC with AIX',
'powerpc-darwin' => 'PowerPC with MacOSX/Darwin',
'powerpc-linux' => 'PowerPC with GNU/Linux',
diff --git a/Master/texmf-dist/doc/fonts/librecaslon/OFL.txt b/Master/texmf-dist/doc/fonts/librecaslon/OFL.txt
index d2cee42c74f..d2cee42c74f 100755..100644
--- a/Master/texmf-dist/doc/fonts/librecaslon/OFL.txt
+++ b/Master/texmf-dist/doc/fonts/librecaslon/OFL.txt