From 2cbd29ed3b10af7d25317dcbec9cbad657592d03 Mon Sep 17 00:00:00 2001
From: Luigi Scarso <luigi.scarso@gmail.com>
Date: Wed, 22 Apr 2015 15:30:54 +0000
Subject: [PATCH] sync with TL36978; fixed Copyright year; jump to 0.80.1
(again)
---
source/ChangeLog | 9 +
source/Makefile.am | 1 +
source/Makefile.in | 1 +
source/README.solaris | 97 +++++++
source/configure | 4 +-
source/libs/README | 4 +-
source/libs/configure | 20 +-
source/texk/README | 12 +-
source/texk/configure | 20 +-
source/texk/kpathsea/ChangeLog | 20 ++
source/texk/kpathsea/c-auto.in | 8 +-
source/texk/kpathsea/c-ctype.h | 8 +-
source/texk/kpathsea/configure | 37 ++-
source/texk/kpathsea/configure.ac | 5 +-
source/texk/kpathsea/mktexlsr | 4 +-
source/texk/kpathsea/texmf.cnf | 12 +-
source/texk/kpathsea/version.ac | 4 +-
source/texk/kpathsea/win32/ChangeLog | 5 +
source/texk/kpathsea/win32/Makefile.am | 10 +-
source/texk/kpathsea/win32/Makefile.in | 37 +--
source/texk/texlive/configure | 20 +-
source/texk/texlive/linked_scripts/ChangeLog | 9 +
.../texk/texlive/linked_scripts/Makefile.am | 7 +-
.../texk/texlive/linked_scripts/Makefile.in | 5 +-
source/texk/texlive/tl_scripts/ChangeLog | 15 +
source/texk/texlive/tl_scripts/Makefile.am | 28 +-
source/texk/texlive/tl_scripts/Makefile.in | 22 +-
source/texk/texlive/tl_scripts/README | 4 +-
source/texk/texlive/tl_scripts/fmtutil.1 | 264 +++++++++++-------
.../texk/texlive/tl_scripts/fmtutil.help2man | 22 ++
source/texk/texlive/tl_scripts/scripts.lst | 3 -
source/texk/texlive/tl_scripts/texlinks.sh | 16 +-
source/texk/texlive/w32_wrapper/runscript.tlu | 21 +-
source/texk/web2c/ChangeLog | 4 +
source/texk/web2c/Makefile.in | 3 +-
source/texk/web2c/configure | 24 +-
source/texk/web2c/synctexdir/am/synctex.am | 3 +-
source/texk/web2c/triptrap/mftrap.diffs | 23 +-
source/texk/web2c/triptrap/mptrap.diffs | 44 ++-
source/texk/web2c/triptrap/trip.diffs | 17 +-
source/texk/web2c/web2c/ChangeLog | 4 +
source/texk/web2c/web2c/c-auto.in | 4 +
source/texk/web2c/web2c/configure | 79 +++++-
source/texk/web2c/web2c/configure.ac | 5 +-
source/utils/configure | 20 +-
source/version.ac | 4 +-
46 files changed, 655 insertions(+), 333 deletions(-)
create mode 100644 source/README.solaris
create mode 100644 source/texk/texlive/tl_scripts/fmtutil.help2man
diff --git a/source/ChangeLog b/source/ChangeLog
index fcfe4247c..12861200a 100644
--- a/source/ChangeLog
+++ b/source/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * README.solaris: New file from Mojca (without very long lines).
+ * Makefile.am: Add the new file.
+
+2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * version.ac (tex_live_version): starting pretest, no more /dev.
+
2015-03-07 Peter Breitenlohner <peb@mppmu.mpg.de>
* tardate.ac: Switch to 2015-03-07.
diff --git a/source/Makefile.am b/source/Makefile.am
index d30d075f4..59a9ec49c 100644
--- a/source/Makefile.am
+++ b/source/Makefile.am
@@ -22,6 +22,7 @@ EXTRA_DIST = \
README.5configure \
README.6cross \
README.7coding \
+ README.solaris \
build-aux/README.TL \
m4/ChangeLog \
m4/README \
diff --git a/source/Makefile.in b/source/Makefile.in
index 84d5e2357..28e61d1f1 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -409,6 +409,7 @@ EXTRA_DIST = \
README.5configure \
README.6cross \
README.7coding \
+ README.solaris \
build-aux/README.TL \
m4/ChangeLog \
m4/README \
diff --git a/source/README.solaris b/source/README.solaris
new file mode 100644
index 000000000..238aa3e28
--- /dev/null
+++ b/source/README.solaris
@@ -0,0 +1,97 @@
+Compiling TeX binaries on Solaris
+
+(The document describes the procedures used on Sparc Solaris binaries, but the same
+rules should apply to i386 and x86_64 as well.)
+
+Solaris 9 has been out of official support for a while and making software compile
+on that platform is challenging, so it hardly make any sense to try to support it.
+
+Solaris 10 reaches end of support in January 2021.
+ http://en.wikipedia.org/wiki/Solaris_(operating_system)#Version_history
+an TeX Live binaries try to stay compatible with that OS version.
+
+Every once in a while a new Update is shipped:
+ U1 2006-01
+ U2 2006-06
+ U3 2006-11
+ U4 2007-08
+ U5 2008-05
+ U6 2008-10
+ U7 2009-05
+ U8 2009-10
+ U9 2010-09
+ U10 2011-08
+ U11 2013-01
+and the problem is that binaries compiled on an updated system might not run on an older one.
+
+You can check the libc version with
+> pvs -no /usr/lib/libc.so
+
+> pvs -d /lib/libc.so.1 | grep SUNW
+ SUNW_1.23;
+ SUNW_1.22.7;
+ SUNW_1.22.6;
+ /.../
+ SUNW_1.1;
+ SUNW_0.9;
+ SUNW_0.8;
+ SUNW_0.7;
+
+Building wget
+=============
+
+Building wget on the latest version of Solaris 10 will make the binary
+useless on older Updates of Solaris 10 as it would depend on SUNW_1.22.7.
+
+One option to build wget in a "compatible way" would be to build it on
+Solaris 9 with "cc". The other hack is the usage of map files.
+
+To make it work on older systems the following hack was used (thanks to the OpenCSW community):
+ https://buildfarm.opencsw.org/source/xref/opencsw/csw/mgar/pkg/wget/trunk/files/map.wget
+
+> cat mapfile
+libc.so - SUNW_1.22.5 SUNWprivate_1.1 $ADDVERS=SUNW_1.22.5;
+
+export LD_OPTIONS="-M $PWD/mapfile"
+
+And the following configuration was used to get rid of dependencies (which
+are not installed on Solaris by default):
+
+> ./configure --enable-ipv6 --disable-iri --disable-nls \
+ --disable-ntlm --disable-pcre --without-libiconv-prefix \
+ --without-libintl-prefix --without-libuuid --without-libpsl \
+ --without-ssl --without-zlib
+
+The binary was built with gcc 4.9.2.
+
+> pvs Master/tlpkg/installer/wget/wget.sparc-solaris
+ libsocket.so.1 (SUNW_1.4);
+ libnsl.so.1 (SUNW_1.7);
+ librt.so.1 (SUNW_1.2);
+ libc.so.1 (SUNW_1.22.5, SUNWprivate_1.1);
+
+> ./Master/tlpkg/installer/wget/wget.sparc-solaris --version
+ GNU Wget 1.16.3 built on solaris2.10.
+ +digest -https +ipv6 -iri +large-file -nls -ntlm +opie -psl -ssl
+
+Building xz
+===========
+
+The version 5.2.1 of xz would likewise depend on SUNW_1.22.6 by default, so
+we used the same hack with a map file to make it work on slightly older
+systems.
+
+> export LD_OPTIONS="-M $PWD/mapfile"
+> ./configure --disable-nls --disable-shared
+
+> pvs Master/tlpkg/installer/xz/xz.sparc-solaris
+ librt.so.1 (SUNW_1.2);
+ libpthread.so.1 (SUNW_1.2);
+ libc.so.1 (SUNW_1.22);
+> pvs Master/tlpkg/installer/xz/xzdec.sparc-solaris
+ libc.so.1 (SUNW_1.22);
+
+
+In case that binaries should run on even older systems, users should report
+problems and we can target even older systems by patching the mapfile.
+
diff --git a/source/configure b/source/configure
index 35ceab35b..3314ebc9b 100755
--- a/source/configure
+++ b/source/configure
@@ -22629,11 +22629,11 @@ msg_compiling="$msg_compiling
test "x$srcdir" = x. || msg_compiling="$msg_compiling
from sources in $kpse_src"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
-** Configuration summary for $PACKAGE_STRING (2015/dev$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2015$with_banner_add):
$msg_compiling" >&5
$as_echo "
-** Configuration summary for $PACKAGE_STRING (2015/dev$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2015$with_banner_add):
$msg_compiling" >&6; }
case $kpse_src$kpse_bld in
diff --git a/source/libs/README b/source/libs/README
index 09e307446..95c4d8ebd 100644
--- a/source/libs/README
+++ b/source/libs/README
@@ -1,4 +1,4 @@
-$Id: README 36643 2015-03-27 09:12:50Z peter $
+$Id: README 36780 2015-04-12 11:50:46Z peter $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -27,7 +27,7 @@ graphite2 1.2.4 - checked 2dec13
harfbuzz 0.9.40 - checked 21mar15
http://www.freedesktop.org/software/harfbuzz/release/
-icu 55.1 (rc) - checked 19mar15
+icu 55.1 (release) - checked 12apr15
http://download.icu-project.org/files/icu4c/
libpaper 1.1.24+nmu2 - checked 24oct13
diff --git a/source/libs/configure b/source/libs/configure
index e437a51d5..c99bca744 100755
--- a/source/libs/configure
+++ b/source/libs/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live libs 2015/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live libs 2015.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='TeX Live libs'
PACKAGE_TARNAME='tex-live-libs'
-PACKAGE_VERSION='2015/dev'
-PACKAGE_STRING='TeX Live libs 2015/dev'
+PACKAGE_VERSION='2015'
+PACKAGE_STRING='TeX Live libs 2015'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1323,7 +1323,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live libs 2015/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live libs 2015 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1393,7 +1393,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live libs 2015/dev:";;
+ short | recursive ) echo "Configuration of TeX Live libs 2015:";;
esac
cat <<\_ACEOF
@@ -1579,7 +1579,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live libs configure 2015/dev
+TeX Live libs configure 2015
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1680,7 +1680,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live libs $as_me 2015/dev, which was
+It was created by TeX Live libs $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4442,7 +4442,7 @@ fi
# Define the identity of the package.
PACKAGE='tex-live-libs'
- VERSION='2015/dev'
+ VERSION='2015'
cat >>confdefs.h <<_ACEOF
@@ -5436,7 +5436,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live libs $as_me 2015/dev, which was
+This file was extended by TeX Live libs $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5493,7 +5493,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live libs config.status 2015/dev
+TeX Live libs config.status 2015
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/source/texk/README b/source/texk/README
index 689986f5a..1bd1fad74 100644
--- a/source/texk/README
+++ b/source/texk/README
@@ -1,5 +1,5 @@
-$Id: README 36426 2015-03-03 13:30:44Z peter $
-Copyright 2006-2012 TeX Users Group.
+$Id: README 36903 2015-04-18 11:14:51Z peter $
+Copyright 2006-2015 TeX Users Group.
You may freely use, modify and/or distribute this file.
This TeX Live directory contains the programs that use the kpathsea
@@ -27,12 +27,12 @@ bibtex-x - maintained here, contains
bibtexu
http://omega.enstb.org/yannis/bibtexu/
-chktex 1.7.2 - checked 30may13
+chktex 1.7.4 - checked 12apr15
http://mirror.ctan.org/support/chktex/
http://download.savannah.gnu.org/releases/chktex/
-cjkutils 4.8.3 - checked 11may12
- http://cjk.ffii.org/cjk-4.8.3.tar.gz
+cjkutils 4.8.4 - checked 18apr15
+ http://cjk.ffii.org/cjk-4.8.4.tar.gz
detex 2.8 - checked 10may12
http://www.cs.purdue.edu/homes/trinkle/detex/
@@ -59,7 +59,7 @@ dvipos - ?
dvipsk - maintained here, by us
-dvisvgm 1.9.1 - checked 1mar15
+dvisvgm 1.9.2 - checked 12apr15
http://downloads.sourceforge.net/dvisvgm/
gsftopk - from Paul Vojta's xdvi?
diff --git a/source/texk/configure b/source/texk/configure
index c9a4b87d9..822043223 100755
--- a/source/texk/configure
+++ b/source/texk/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live texk 2015/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live texk 2015.
#
# Report bugs to <peb@mppmu.mpg.de>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='TeX Live texk'
PACKAGE_TARNAME='tex-live-texk'
-PACKAGE_VERSION='2015/dev'
-PACKAGE_STRING='TeX Live texk 2015/dev'
+PACKAGE_VERSION='2015'
+PACKAGE_STRING='TeX Live texk 2015'
PACKAGE_BUGREPORT='peb@mppmu.mpg.de'
PACKAGE_URL=''
@@ -1315,7 +1315,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live texk 2015/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live texk 2015 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1385,7 +1385,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live texk 2015/dev:";;
+ short | recursive ) echo "Configuration of TeX Live texk 2015:";;
esac
cat <<\_ACEOF
@@ -1571,7 +1571,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live texk configure 2015/dev
+TeX Live texk configure 2015
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1672,7 +1672,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live texk $as_me 2015/dev, which was
+It was created by TeX Live texk $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4434,7 +4434,7 @@ fi
# Define the identity of the package.
PACKAGE='tex-live-texk'
- VERSION='2015/dev'
+ VERSION='2015'
cat >>confdefs.h <<_ACEOF
@@ -5364,7 +5364,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live texk $as_me 2015/dev, which was
+This file was extended by TeX Live texk $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5421,7 +5421,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live texk config.status 2015/dev
+TeX Live texk config.status 2015
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/source/texk/kpathsea/ChangeLog b/source/texk/kpathsea/ChangeLog
index 31cd1d898..b5ec656ae 100644
--- a/source/texk/kpathsea/ChangeLog
+++ b/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,23 @@
+2015-04-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Test if isascii is declared.
+ * c-ctype.h: Correctly define isascii, if not declared.
+
+2015-04-14 Norbert Preining <norbert@preining.info>
+
+ * mktexlsr (treefile): switch back to hard-coded path, as
+ indeed it seems there are several systems without support for
+ mktemp --tmpdir, just mktemp. TL2015 pretest emails.
+
+2015-04-12 Karl Berry <karl@tug.org>
+
+ * texmf.cnf: update for TL'15.
+ (shell_escape_commands): include extractbb, fingers crossed.
+
+2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * version.ac: 6.2.1 (without the dev) for 2015 pretest.
+
2015-03-25 Karl Berry <karl@tug.org>
* mktexlsr (treefile): use shell mktemp; patch from Debian
diff --git a/source/texk/kpathsea/c-auto.in b/source/texk/kpathsea/c-auto.in
index 00e20cb02..aa8a1d58e 100644
--- a/source/texk/kpathsea/c-auto.in
+++ b/source/texk/kpathsea/c-auto.in
@@ -2,7 +2,7 @@
/* c-auto.h: defines for kpathsea, as determined by configure.
- Copyright 1994-97, 2008, 2009, 2010 Karl Berry.
+ Copyright 1994-97, 2008-2015 Karl Berry.
Copyright 1997-99, 2002, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -23,7 +23,7 @@
#define KPATHSEA_C_AUTO_H
/* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.2.1dev"
+#define KPSEVERSION "kpathsea version 6.2.1"
/* Define to 1 if the `closedir' function returns void instead of `int'. */
#undef CLOSEDIR_VOID
@@ -35,6 +35,10 @@
/* Define to 1 if you have the <assert.h> header file. */
#undef HAVE_ASSERT_H
+/* Define to 1 if you have the declaration of `isascii', and to 0 if you
+ don't. */
+#undef HAVE_DECL_ISASCII
+
/* Define to 1 if you have the declaration of `putenv', and to 0 if you don't.
*/
#undef HAVE_DECL_PUTENV
diff --git a/source/texk/kpathsea/c-ctype.h b/source/texk/kpathsea/c-ctype.h
index 72fbf370a..5e453e08f 100644
--- a/source/texk/kpathsea/c-ctype.h
+++ b/source/texk/kpathsea/c-ctype.h
@@ -1,6 +1,6 @@
/* c-ctype.h: ASCII-safe versions of the <ctype.h> macros.
- Copyright 1992, 1994, 2008, 2010, 2011 Karl Berry.
+ Copyright 1992, 1994, 2008, 2010, 2011, 2015 Karl Berry.
Copyright 1998, 2000, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -21,10 +21,10 @@
#include <ctype.h>
-/* Be sure we have `isascii', even if wrong. */
+/* Be sure we have `isascii'. */
#ifndef WIN32
-#ifndef isascii
-#define isascii(c) 1
+#if !(defined(HAVE_DECL_ISASCII) && HAVE_DECL_ISASCII)
+#define isascii(c) (((c) & ~0x7f) == 0)
#endif
#endif
diff --git a/source/texk/kpathsea/configure b/source/texk/kpathsea/configure
index deac639ba..da88554ef 100755
--- a/source/texk/kpathsea/configure
+++ b/source/texk/kpathsea/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Kpathsea 6.2.1dev.
+# Generated by GNU Autoconf 2.69 for Kpathsea 6.2.1.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Kpathsea'
PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.2.1dev'
-PACKAGE_STRING='Kpathsea 6.2.1dev'
+PACKAGE_VERSION='6.2.1'
+PACKAGE_STRING='Kpathsea 6.2.1'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1339,7 +1339,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Kpathsea 6.2.1dev to adapt to many kinds of systems.
+\`configure' configures Kpathsea 6.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1409,7 +1409,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Kpathsea 6.2.1dev:";;
+ short | recursive ) echo "Configuration of Kpathsea 6.2.1:";;
esac
cat <<\_ACEOF
@@ -1537,7 +1537,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Kpathsea configure 6.2.1dev
+Kpathsea configure 6.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2376,7 +2376,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Kpathsea $as_me 6.2.1dev, which was
+It was created by Kpathsea $as_me 6.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2757,14 +2757,14 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-KPSEVERSION=6.2.1dev
+KPSEVERSION=6.2.1
KPSE_LT_VERSINFO=8:1:2
- WEB2CVERSION=2015/dev
+ WEB2CVERSION=2015
am__api_version='1.15'
@@ -8071,7 +8071,7 @@ fi
# Define the identity of the package.
PACKAGE='kpathsea'
- VERSION='6.2.1dev'
+ VERSION='6.2.1'
cat >>confdefs.h <<_ACEOF
@@ -13873,6 +13873,19 @@ _ACEOF
+ac_fn_c_check_decl "$LINENO" "isascii" "ac_cv_have_decl_isascii" "#include <ctype.h>
+"
+if test "x$ac_cv_have_decl_isascii" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISASCII $ac_have_decl
+_ACEOF
+
+
ac_fn_c_check_decl "$LINENO" "putenv" "ac_cv_have_decl_putenv" "$ac_includes_default"
if test "x$ac_cv_have_decl_putenv" = xyes; then :
ac_have_decl=1
@@ -14683,7 +14696,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Kpathsea $as_me 6.2.1dev, which was
+This file was extended by Kpathsea $as_me 6.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14749,7 +14762,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Kpathsea config.status 6.2.1dev
+Kpathsea config.status 6.2.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/source/texk/kpathsea/configure.ac b/source/texk/kpathsea/configure.ac
index d2e08afa4..97ebdc23d 100644
--- a/source/texk/kpathsea/configure.ac
+++ b/source/texk/kpathsea/configure.ac
@@ -35,6 +35,9 @@ AC_PROG_AWK
AC_CHECK_SIZEOF([long])
+dnl Check if <ctype.h> declares isascii.
+AC_CHECK_DECLS([isascii], [], [], [[#include <ctype.h>]])
+
dnl Replacement functions that may be required on ancient broken system.
AC_CHECK_DECLS([putenv])
AC_REPLACE_FUNCS([putenv])
@@ -117,7 +120,7 @@ AC_CONFIG_HEADERS([c-auto.h:c-auto.in],
AH_TOP([/* c-auto.h: defines for kpathsea, as determined by configure.
- Copyright 1994-97, 2008, 2009, 2010 Karl Berry.
+ Copyright 1994-97, 2008-2015 Karl Berry.
Copyright 1997-99, 2002, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
diff --git a/source/texk/kpathsea/mktexlsr b/source/texk/kpathsea/mktexlsr
index d0b774178..3161a5317 100644
--- a/source/texk/kpathsea/mktexlsr
+++ b/source/texk/kpathsea/mktexlsr
@@ -10,7 +10,7 @@
# Originally written as `texhash' by Thomas Esser, Okt., 1994.
# Public domain.
-version='$Id: mktexlsr 36626 2015-03-25 22:51:45Z karl $'
+version='$Id: mktexlsr 36855 2015-04-14 12:15:08Z preining $'
progname=`echo $0 | sed 's%.*/%%'`
usage="Usage: $progname [OPTION]... [DIR]...
@@ -73,7 +73,7 @@ if tty -s; then verbose=true; else verbose=false; fi
dry_run=false
trees=
-treefile=`mktemp --tmpdir mktexlsrtrees.XXXXXXXXXX` || exit 1
+treefile="${TMPDIR-/tmp}/mktexlsrtrees$$.tmp"
trap 'cd /; rm -f $treefile; test -z "$db_dir_tmp" || rm -rf "$db_dir_tmp";
exit' 0 1 2 3 7 13 15
diff --git a/source/texk/kpathsea/texmf.cnf b/source/texk/kpathsea/texmf.cnf
index 3951d211b..1b0df4b50 100644
--- a/source/texk/kpathsea/texmf.cnf
+++ b/source/texk/kpathsea/texmf.cnf
@@ -4,8 +4,8 @@
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated. Instead, put your changes -- and only your changes, not an
% entire copy! -- in ../../texmf.cnf. That is, if this file is
-% installed in /some/path/to/texlive/2014/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2014/texmf.cnf.
+% installed in /some/path/to/texlive/2015/texmf-dist/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2015/texmf.cnf.
%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
@@ -76,10 +76,10 @@ TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
TEXMFHOME = ~/texmf
% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2014/texmf-var
+TEXMFVAR = ~/.texlive2015/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2014/texmf-config
+TEXMFCONFIG = ~/.texlive2015/texmf-config
% List all the texmf trees. For an explanation of what they are, see the
% TeX Live manual.
@@ -561,6 +561,7 @@ shell_escape = p
%
shell_escape_commands = \
bibtex,bibtex8,\
+extractbb,\
kpsewhich,\
makeindex,\
mpost,\
@@ -647,6 +648,9 @@ file_line_error_style = f
% Used by makempx to run TeX. We use "etex" because MetaPost is
% expecting DVI, and not "tex" because we want first line parsing.
TEX = etex
+#
+# Use Japanese eptex for Japanese pmpost.
+TEX.pmpost = eptex
% These variables specify the external program called for the
% interactive `e' option. %d is replaced by the line number and %s by
diff --git a/source/texk/kpathsea/version.ac b/source/texk/kpathsea/version.ac
index 9038e5345..c6f8594f9 100644
--- a/source/texk/kpathsea/version.ac
+++ b/source/texk/kpathsea/version.ac
@@ -1,4 +1,4 @@
-dnl Copyright 2011-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright 2011-2015 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -18,4 +18,4 @@ dnl append "dev", to distinguish binaries built between releases.
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current kpathsea version
-m4_define([kpse_version], [6.2.1dev])
+m4_define([kpse_version], [6.2.1])
diff --git a/source/texk/kpathsea/win32/ChangeLog b/source/texk/kpathsea/win32/ChangeLog
index 1fd84adbd..d0419ee6e 100644
--- a/source/texk/kpathsea/win32/ChangeLog
+++ b/source/texk/kpathsea/win32/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (bin_PROGRAMS): Drop fmtutil, now a perl script.
+ * fmtutil.c: Removed.
+
2014-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* mktexfmt.c, mktexpk.c, mktextfm.c: Replace the deprecated
diff --git a/source/texk/kpathsea/win32/Makefile.am b/source/texk/kpathsea/win32/Makefile.am
index 4edf1d1a0..f8a8296ba 100644
--- a/source/texk/kpathsea/win32/Makefile.am
+++ b/source/texk/kpathsea/win32/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/kpathsea/win32/
##
-## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
@@ -9,7 +9,6 @@ AM_CFLAGS = $(WARNING_CFLAGS)
# Build WIN32 replacements for Unix shell scripts.
bin_PROGRAMS = \
- fmtutil \
mktexfmt \
mktexlsr \
mktexmf \
@@ -17,13 +16,6 @@ bin_PROGRAMS = \
mktextfm \
mktexupd
-fmtutil_SOURCES = \
- dirutil.c \
- dirutil.h \
- fmtutil.c \
- mktexupd.c \
- mktexupd.h
-
mktexfmt_SOURCES = \
mktexfmt.c
diff --git a/source/texk/kpathsea/win32/Makefile.in b/source/texk/kpathsea/win32/Makefile.in
index 50663a581..bb10aee6f 100644
--- a/source/texk/kpathsea/win32/Makefile.in
+++ b/source/texk/kpathsea/win32/Makefile.in
@@ -88,9 +88,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = fmtutil$(EXEEXT) mktexfmt$(EXEEXT) mktexlsr$(EXEEXT) \
- mktexmf$(EXEEXT) mktexpk$(EXEEXT) mktextfm$(EXEEXT) \
- mktexupd$(EXEEXT)
+bin_PROGRAMS = mktexfmt$(EXEEXT) mktexlsr$(EXEEXT) mktexmf$(EXEEXT) \
+ mktexpk$(EXEEXT) mktextfm$(EXEEXT) mktexupd$(EXEEXT)
subdir = win32
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \
@@ -114,19 +113,14 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
-am_fmtutil_OBJECTS = dirutil.$(OBJEXT) fmtutil.$(OBJEXT) \
- mktexupd.$(OBJEXT)
-fmtutil_OBJECTS = $(am_fmtutil_OBJECTS)
-fmtutil_LDADD = $(LDADD)
-fmtutil_DEPENDENCIES = ../libkpathsea.la
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
am_mktexfmt_OBJECTS = mktexfmt.$(OBJEXT)
mktexfmt_OBJECTS = $(am_mktexfmt_OBJECTS)
mktexfmt_LDADD = $(LDADD)
mktexfmt_DEPENDENCIES = ../libkpathsea.la
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 =
am_mktexlsr_OBJECTS = dirutil.$(OBJEXT) mktexlsr.$(OBJEXT)
mktexlsr_OBJECTS = $(am_mktexlsr_OBJECTS)
mktexlsr_LDADD = $(LDADD)
@@ -184,12 +178,11 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(fmtutil_SOURCES) $(mktexfmt_SOURCES) $(mktexlsr_SOURCES) \
+SOURCES = $(mktexfmt_SOURCES) $(mktexlsr_SOURCES) $(mktexmf_SOURCES) \
+ $(mktexpk_SOURCES) $(mktextfm_SOURCES) $(mktexupd_SOURCES)
+DIST_SOURCES = $(mktexfmt_SOURCES) $(mktexlsr_SOURCES) \
$(mktexmf_SOURCES) $(mktexpk_SOURCES) $(mktextfm_SOURCES) \
$(mktexupd_SOURCES)
-DIST_SOURCES = $(fmtutil_SOURCES) $(mktexfmt_SOURCES) \
- $(mktexlsr_SOURCES) $(mktexmf_SOURCES) $(mktexpk_SOURCES) \
- $(mktextfm_SOURCES) $(mktexupd_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -343,13 +336,6 @@ AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/.. \
-DWEB2C_KPSE_VERSION='"Web2C-$(WEB2CVERSION) \
Kpathsea-$(KPSEVERSION)"'
AM_CFLAGS = $(WARNING_CFLAGS)
-fmtutil_SOURCES = \
- dirutil.c \
- dirutil.h \
- fmtutil.c \
- mktexupd.c \
- mktexupd.h
-
mktexfmt_SOURCES = \
mktexfmt.c
@@ -475,10 +461,6 @@ clean-binPROGRAMS:
echo " rm -f" $$list; \
rm -f $$list
-fmtutil$(EXEEXT): $(fmtutil_OBJECTS) $(fmtutil_DEPENDENCIES) $(EXTRA_fmtutil_DEPENDENCIES)
- @rm -f fmtutil$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(fmtutil_OBJECTS) $(fmtutil_LDADD) $(LIBS)
-
mktexfmt$(EXEEXT): $(mktexfmt_OBJECTS) $(mktexfmt_DEPENDENCIES) $(EXTRA_mktexfmt_DEPENDENCIES)
@rm -f mktexfmt$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(mktexfmt_OBJECTS) $(mktexfmt_LDADD) $(LIBS)
@@ -510,7 +492,6 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirutil.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fmtutil.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdestdir.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktexfmt.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktexlsr.Po@am__quote@
diff --git a/source/texk/texlive/configure b/source/texk/texlive/configure
index 2731e246a..80a26c5ac 100755
--- a/source/texk/texlive/configure
+++ b/source/texk/texlive/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live Scripts 2015/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live Scripts 2015.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='TeX Live Scripts'
PACKAGE_TARNAME='tex-live-scripts'
-PACKAGE_VERSION='2015/dev'
-PACKAGE_STRING='TeX Live Scripts 2015/dev'
+PACKAGE_VERSION='2015'
+PACKAGE_STRING='TeX Live Scripts 2015'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1238,7 +1238,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live Scripts 2015/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live Scripts 2015 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1305,7 +1305,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live Scripts 2015/dev:";;
+ short | recursive ) echo "Configuration of TeX Live Scripts 2015:";;
esac
cat <<\_ACEOF
@@ -1400,7 +1400,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live Scripts configure 2015/dev
+TeX Live Scripts configure 2015
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1455,7 +1455,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live Scripts $as_me 2015/dev, which was
+It was created by TeX Live Scripts $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2322,7 +2322,7 @@ fi
# Define the identity of the package.
PACKAGE='tex-live-scripts'
- VERSION='2015/dev'
+ VERSION='2015'
cat >>confdefs.h <<_ACEOF
@@ -4224,7 +4224,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live Scripts $as_me 2015/dev, which was
+This file was extended by TeX Live Scripts $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4281,7 +4281,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live Scripts config.status 2015/dev
+TeX Live Scripts config.status 2015
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/source/texk/texlive/linked_scripts/ChangeLog b/source/texk/texlive/linked_scripts/ChangeLog
index a48f9ca73..3f95aec0c 100644
--- a/source/texk/texlive/linked_scripts/ChangeLog
+++ b/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,3 +1,12 @@
+2015-04-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (texmf_other_scripts): Add fmtutil-sys.sh and
+ updmap-sys.sh (maintained under Master).
+
+2015-04-12 Norbert Preining <norbert@preining.info>
+
+ * Makefile.am (texmf_other_scripts): add fmtutil
+
2014-11-17 Karl Berry <karl@tug.org>
* Makefile.am: Use WIN_WRAPPER (w32_wrapper or w64_wrapper).
diff --git a/source/texk/texlive/linked_scripts/Makefile.am b/source/texk/texlive/linked_scripts/Makefile.am
index dd9cf08d2..1f113ca89 100644
--- a/source/texk/texlive/linked_scripts/Makefile.am
+++ b/source/texk/texlive/linked_scripts/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/texlive/linked_scripts/
##
-## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
## TeX Live's extra scripts.
@@ -164,9 +164,12 @@ texmf_other_scripts = \
texdiff/texdiff \
texdirflatten/texdirflatten \
texfot/texfot.pl \
+ texlive/fmtutil.pl \
+ texlive/fmtutil-sys.sh \
texlive/rungs.tlu \
texlive/tlmgr.pl \
texlive/updmap.pl \
+ texlive/updmap-sys.sh \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
thumbpdf/thumbpdf.pl \
@@ -230,7 +233,7 @@ if WIN32
done
$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.dll $(DESTDIR)$(bindir)
$(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe $(DESTDIR)$(bindir)
- $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.tlu $(DESTDIR)$(bindir)
+ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.tlu $(DESTDIR)$(bindir)
@for s in $(texmf_context_scripts); do \
t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
echo "$(INSTALL_SCRIPT) '$(ctxscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
diff --git a/source/texk/texlive/linked_scripts/Makefile.in b/source/texk/texlive/linked_scripts/Makefile.in
index e8bec9350..4c282ba36 100644
--- a/source/texk/texlive/linked_scripts/Makefile.in
+++ b/source/texk/texlive/linked_scripts/Makefile.in
@@ -382,9 +382,12 @@ texmf_other_scripts = \
texdiff/texdiff \
texdirflatten/texdirflatten \
texfot/texfot.pl \
+ texlive/fmtutil.pl \
+ texlive/fmtutil-sys.sh \
texlive/rungs.tlu \
texlive/tlmgr.pl \
texlive/updmap.pl \
+ texlive/updmap-sys.sh \
texliveonfly/texliveonfly.py \
texloganalyser/texloganalyser \
thumbpdf/thumbpdf.pl \
@@ -672,7 +675,7 @@ install-data-hook: installdirs-local
@WIN32_TRUE@ done
@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.dll $(DESTDIR)$(bindir)
@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.exe $(DESTDIR)$(bindir)
-@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/$(WIN_WRAPPER)/runscript.tlu $(DESTDIR)$(bindir)
+@WIN32_TRUE@ $(INSTALL_SCRIPT) $(top_srcdir)/w32_wrapper/runscript.tlu $(DESTDIR)$(bindir)
@WIN32_TRUE@ @for s in $(texmf_context_scripts); do \
@WIN32_TRUE@ t=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
@WIN32_TRUE@ echo "$(INSTALL_SCRIPT) '$(ctxscript)' '$(DESTDIR)$(bindir)/$$t.exe'"; \
diff --git a/source/texk/texlive/tl_scripts/ChangeLog b/source/texk/texlive/tl_scripts/ChangeLog
index 29d74589b..51c03ad9c 100644
--- a/source/texk/texlive/tl_scripts/ChangeLog
+++ b/source/texk/texlive/tl_scripts/ChangeLog
@@ -1,3 +1,18 @@
+2015-04-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Remove fmtutil-sys.sh and updmap-sys.sh, they are
+ maintained under Master and now handled via linked_scripts.
+
+2015-04-19 Karl Berry <karl@tug.org>
+
+ * texlinks.sh (install_link): use $exeext for pdfcsplain too,
+ for Cygwin. From Ken Brown.
+
+2015-04-12 Norbert Preining <norbert@preining.info>
+
+ * Makefile.am: remove fmtutil.sh, it is now handled via
+ linked_scripts and fmtutil.pl
+
2014-11-20 Karl Berry <karl@tug.org>
* fmtutil.sh: (init_log_warnings, log_warning): remove.
diff --git a/source/texk/texlive/tl_scripts/Makefile.am b/source/texk/texlive/tl_scripts/Makefile.am
index f52d94471..7e508d348 100644
--- a/source/texk/texlive/tl_scripts/Makefile.am
+++ b/source/texk/texlive/tl_scripts/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/texlive/tl_scripts/
##
-## Copyright 2013-2014 Karl Berry <tex-live@tug.org>
+## Copyright 2013-2015 Karl Berry <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## Build lists of scripts.
@@ -24,13 +24,11 @@ EXTRA_DIST = scripts.lst
# These first variable definitions are what scripts_links.am requires.
perl_scripts = e2pall
-shell_scripts = fmtutil-sys updmap-sys
sh_scripts = \
allcm \
allneeded \
dvi2fax \
dvired \
- fmtutil \
fontinst \
kpsetool \
kpsewhere \
@@ -48,9 +46,9 @@ scriptsdir = texmf-dist/scripts/texlive
include $(top_srcdir)/../../am/script_links.am
#
texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(sh_scripts:=.sh)
+dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh)
-install-data-hook: install-bin-links install-man1-links install-perl-links install-shell-links install-sh-links
+install-data-hook: install-bin-links install-man1-links install-perl-links install-sh-links
uninstall-hook: uninstall-bin-links uninstall-man1-links uninstall-links
dist_man_MANS = \
@@ -100,16 +98,19 @@ dist_texconfig_DATA = tcfmgr.map
web2cdir = $(datarootdir)/texmf-dist/web2c
dist_web2c_DATA = fmtutil.cnf
-## Generate the updmap man page using help2man plus a bit of
-## handwritten material. But don't actually update updmap.1,
+## Generate the updmap/fmtutil man page using help2man plus a bit of
+## handwritten material. But don't actually update updmap/fmtutil.1,
## we don't want to require help2man for an install. Leave that to be
## done by hand.
-.PHONY: xupdmap.1
-updmap_dir = $(top_srcdir)/linked_scripts/texlive
-xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl
+.PHONY: xupdmap.1 xfmtutil.1
+linked_scripts_dir = $(top_srcdir)/linked_scripts/texlive
+xupdmap.1: updmap.help2man $(linked_scripts_dir)/updmap.pl
help2man --include=$< --source="TeX Live" --no-info \
- $(updmap_dir)/updmap.pl >/tmp/$@
-EXTRA_DIST += updmap.help2man
+ $(linked_scripts_dir)/updmap.pl >/tmp/$@
+xfmtutil.1: fmtutil.help2man $(linked_scripts_dir)/fmtutil.pl
+ help2man --include=$< --source="TeX Live" --no-info \
+ $(linked_scripts_dir)/fmtutil.pl >/tmp/$@
+EXTRA_DIST += updmap.help2man fmtutil.help2man
##
@@ -139,6 +140,5 @@ $(DESTDIR)$(web2cdir)/fmtutil.cnf:
##
## This target is invoked by check-wrapper-consistency (run from cron).
.PHONY: echo-shell-scripts
-all_shell_scripts = $(shell_scripts) $(sh_scripts)
echo-shell-scripts:
- @echo $(all_shell_scripts)
+ @echo $(sh_scripts)
diff --git a/source/texk/texlive/tl_scripts/Makefile.in b/source/texk/texlive/tl_scripts/Makefile.in
index ea263ed8b..90d560390 100644
--- a/source/texk/texlive/tl_scripts/Makefile.in
+++ b/source/texk/texlive/tl_scripts/Makefile.in
@@ -253,17 +253,15 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
DISTCLEANFILES = scripts-list
EXTRA_DIST = scripts.lst $(top_builddir)/../../build-aux/relpath \
- updmap.help2man
+ updmap.help2man fmtutil.help2man
# These first variable definitions are what scripts_links.am requires.
perl_scripts = e2pall
-shell_scripts = fmtutil-sys updmap-sys
sh_scripts = \
allcm \
allneeded \
dvi2fax \
dvired \
- fmtutil \
fontinst \
kpsetool \
kpsewhere \
@@ -284,7 +282,7 @@ all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
#
#
texmfdir = $(datarootdir)/$(scriptsdir)
-dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh) $(sh_scripts:=.sh)
+dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(sh_scripts:=.sh)
dist_man_MANS = \
allcm.1 \
allec.1 \
@@ -325,7 +323,7 @@ dist_texconfig_SCRIPTS = tcfmgr
dist_texconfig_DATA = tcfmgr.map
web2cdir = $(datarootdir)/texmf-dist/web2c
dist_web2c_DATA = fmtutil.cnf
-updmap_dir = $(top_srcdir)/linked_scripts/texlive
+linked_scripts_dir = $(top_srcdir)/linked_scripts/texlive
#
texlinks_prog = $(DESTDIR)$(bindir)/texlinks
#
@@ -333,7 +331,6 @@ run_texlinks = $(texlinks_prog) -v \
-f $(DESTDIR)$(web2cdir)/fmtutil.cnf \
-e "$(EXEEXT)" $(DESTDIR)$(bindir)
-all_shell_scripts = $(shell_scripts) $(sh_scripts)
all: all-am
.SUFFIXES:
@@ -825,7 +822,7 @@ uninstall-links:
@WIN32_FALSE@ rm -f "$(DESTDIR)$(bindir)/$$f"; \
@WIN32_FALSE@ done
-install-data-hook: install-bin-links install-man1-links install-perl-links install-shell-links install-sh-links
+install-data-hook: install-bin-links install-man1-links install-perl-links install-sh-links
uninstall-hook: uninstall-bin-links uninstall-man1-links uninstall-links
.PHONY: install-bin-links uninstall-bin-links
@@ -862,10 +859,13 @@ uninstall-man1-links:
rm -f $(DESTDIR)$(man1dir)/$$link.1; \
done
-.PHONY: xupdmap.1
-xupdmap.1: updmap.help2man $(updmap_dir)/updmap.pl
+.PHONY: xupdmap.1 xfmtutil.1
+xupdmap.1: updmap.help2man $(linked_scripts_dir)/updmap.pl
help2man --include=$< --source="TeX Live" --no-info \
- $(updmap_dir)/updmap.pl >/tmp/$@
+ $(linked_scripts_dir)/updmap.pl >/tmp/$@
+xfmtutil.1: fmtutil.help2man $(linked_scripts_dir)/fmtutil.pl
+ help2man --include=$< --source="TeX Live" --no-info \
+ $(linked_scripts_dir)/fmtutil.pl >/tmp/$@
.PHONY: run-texlinks
#
@@ -878,7 +878,7 @@ $(DESTDIR)$(web2cdir)/fmtutil.cnf:
.PHONY: echo-shell-scripts
echo-shell-scripts:
- @echo $(all_shell_scripts)
+ @echo $(sh_scripts)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/source/texk/texlive/tl_scripts/README b/source/texk/texlive/tl_scripts/README
index 48e903993..6de2db22c 100644
--- a/source/texk/texlive/tl_scripts/README
+++ b/source/texk/texlive/tl_scripts/README
@@ -1,8 +1,8 @@
-$Id: README 28922 2013-01-24 01:12:02Z karl $
+$Id: README 36772 2015-04-12 03:31:16Z preining $
Copyright 2013 TeX Users Group.
You may freely use, modify and/or distribute this file.
This directory contains scripts which originated in teTeX, but with
teTeX's demise, are now maintained as part of TeX Live. Some have been
significantly or completely rewritten from the teTeX versions; most
-notably, updmap is now implemented in Perl.
+notably, updmap and fmtutil are now implemented in Perl.
diff --git a/source/texk/texlive/tl_scripts/fmtutil.1 b/source/texk/texlive/tl_scripts/fmtutil.1
index c97449986..1b4357cdf 100644
--- a/source/texk/texlive/tl_scripts/fmtutil.1
+++ b/source/texk/texlive/tl_scripts/fmtutil.1
@@ -1,126 +1,196 @@
-.TH FMTUTIL 1 "July 2014" "TeX Live" "TeX Live"
-.SH "NAME"
-fmtutil \- utility for maintaining TeX format files
-.PP
-fmtutil-sys \- utility for maintaining TeX format files system\-wide
-.SH "SYNOPSIS"
-.B fmtutil\fP
-.RI [ OPTION .\|.\|.]
-.I COMMAND
-.PP
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.46.5.
+.TH FMTUTIL "1" "April 2015" "TeX Live" "User Commands"
+.SH NAME
+fmtutil \- manage TeX formats, Metafont bases and Metapost mems, per-user
+.br
+fmtutil-sys \- manage TeX formats, Metafont bases and Metapost mems, system-wide
+.br
+mktexfmt \- create a TeX format, Metafont base, or Metapost mem
+.SH SYNOPSIS
+.B fmtutil
+[\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
+.br
.B fmtutil-sys
-.RI [ OPTION .\|.\|.]
-.I COMMAND
-.SH "DESCRIPTION"
-\fBfmtutil\fP is used to create or recreate format and hyphenation
-files or show information about format files\&. The directory in which
-\fBfmtutil\fP is found is also preferentially used to find subprograms.
+[\fI\,OPTION\/\fR] ... [\fI\,COMMAND\/\fR]
+.br
+.B mktexfmt
+\fI\,FORMAT.fmt|BASE.base|MEM.mem|FMTNAME.EXT\/\fR
+.SH DESCRIPTION
+fmtutil version svn36788 (2015\-04\-13 00:53:26 +0900)
+.PP
+Rebuild and manage TeX formats, Metafont bases and MetaPost mems.
.PP
-\fICOMMAND\fP is one of:
+If the command name ends in mktexfmt, only one format can be created.
+The only options supported are \fB\-\-help\fR and \fB\-\-version\fR, and the command
+line must consist of either a format name, with its extension, or a
+plain name that is passed as the argument to \fB\-\-byfmt\fR (see below). The
+full name of the generated file (if any) is written to stdout, and
+nothing else.
.PP
+If not operating in mktexfmt mode, the command line can be more general,
+and multiple formats can be generated, as follows.
+.SH OPTIONS
.TP
-.B --all
-recreate all format files
+\fB\-\-cnffile\fR FILE
+read FILE instead of fmtutil.cnf
+(can be given multiple times, in which case
+all the files are used)
+.HP
+\fB\-\-fmtdir\fR DIRECTORY
.TP
-.BI --byengine \ enginename
-(re)create formats that depend on the
-engine \fIenginename\fP
+\fB\-\-no\-engine\-subdir\fR
+don't use engine\-specific subdir of the fmtdir
.TP
-.BI --byfmt \ formatname
-(re)create the format for
-format \fIformatname\fP
+\fB\-\-no\-error\-if\-no\-format\fR
+exit successfully if no format is selected
.TP
-.BI --byhyphen \ hyphenfile
-(re)create formats that depend on the
-hyphenation file \fIhyphenfile\fP
+\fB\-\-no\-error\-if\-no\-engine\fR=\fI\,ENGINE1\/\fR,ENGINE2,...
+exit successfully even if the required engine
+.IP
+is missing, if it is included in the list.
.TP
-.B --catcfg
-output the content of the config file
-.TP
-.BI --disablefmt \ formatname
-disable
-.I formatname
-in config file
+\fB\-\-quiet\fR
+be silent
.TP
-.B --edit
-no-op in TeX Live
+\fB\-\-test\fR
+(not implemented, just for compatibility)
.TP
-.BI --enablefmt \ formatname
-ensable
-.I formatname
-in config file
+\fB\-\-dolinks\fR
+(not implemented, just for compatibility)
.TP
-.B --help
-print a summary of commands and options
+\fB\-\-force\fR
+(not implemented, just for compatibility)
+.SS "Commands:"
.TP
-.B --listcfg
-list (enabled and disabled) configurations, filtered to available formats
+\fB\-\-all\fR
+recreate all format files
.TP
-.B --missing
+\fB\-\-missing\fR
create all missing format files
.TP
-.B --refresh
+\fB\-\-refresh\fR
recreate only existing format files
.TP
-.BI --showhyphen \ formatname
-print the name of the
-hyphenation file for the format
-\fIformatname\fP
-.TP
-.B --version
-show version info
-.SH "OPTIONS"
-.TP
-.BI --cnffile \ file
-specify the configuration
-\fIfile\fP \fBfmtutil\fP should use
+\fB\-\-byengine\fR ENGINENAME
+(re)create formats using ENGINENAME
.TP
-.B --dolinks
-(not implemented, just for compatibility)
+\fB\-\-byfmt\fR FORMATNAME
+(re)create format for FORMATNAME
.TP
-.BI --fmtdir \ directory
-set the destination
-directory for format files generated by
-\fBfmtutil\fP to \fIdirectory\fP
+\fB\-\-byhyphen\fR HYPHENFILE
+(re)create formats that depend on HYPHENFILE
.TP
-.B --force
-(not implemented, just for compatibility)
+\fB\-\-enablefmt\fR FORMATNAME
+enable formatname in config file
.TP
-.B --no-engine-subdir
-don't use engine-specific subdir of the fmtdir
+\fB\-\-disablefmt\fR FORMATNAME
+disable formatname in config file
.TP
-.BI --no-error-if-no-engine \ engine1,engine2,...
-exit successfully even if the required engine is missing, if that engine
-is included in the list here.
+\fB\-\-listcfg\fR
+list (enabled and disabled) configurations,
+filtered to available formats
.TP
-.B --no-error-if-no-format
-exit successfully if no format is selected
+\fB\-\-catcfg\fR
+output the content of the config file
.TP
-.B --quiet
-be silent
+\fB\-\-showhyphen\fR FORMATNAME
+print name of hyphenfile for format FORMATNAME
.TP
-.B --test
-(not implemented, just for compatibility)
-.SH "FILES"
+\fB\-\-version\fR
+show version information and exit
.TP
-.I fmtutil\&.cnf
-default configuration file; run \fIkpsewhich fmtutil.cnf\fP to see the
-active file.
+\fB\-\-help\fR
+show this message and exit
+.SH ENVIRONMENT
+.PP
+Explanation of trees and files normally used:
+.IP
+If \fB\-\-cnffile\fR is specified on the command line (possibly multiple
+times), its value(s) are used. Otherwise, fmtutil reads all the
+fmtutil.cnf files found by running `kpsewhich \fB\-all\fR fmtutil.cnf', in the
+order returned by kpsewhich.
+.IP
+In any case, if multiple fmtutil.cnf files are found, all the format
+definitions found in all the fmtutil.cnf files are merged.
+.IP
+Thus, if fmtutil.cnf files are present in all trees, and the default
+layout is used as shipped with TeX Live, the following files are
+read, in the given order.
+.nf
+.IP
+For fmtutil\-sys:
+TEXMFSYSCONFIG \fI\,$TEXLIVE/YYYY/texmf\-config/web2c/fmtutil.cnf\/\fP
+TEXMFSYSVAR \fI\,$TEXLIVE/YYYY/texmf\-var/web2c/fmtutil.cnf\/\fP
+TEXMFLOCAL \fI\,$TEXLIVE/texmf\-local/web2c/fmtutil.cnf\/\fP
+TEXMFDIST \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/fmtutil.cnf\/\fP
+.IP
+For fmtutil:
+TEXMFCONFIG $HOME/.texliveYYYY/texmf\-config/web2c/fmtutil.cnf
+TEXMFVAR $HOME/.texliveYYYY/texmf\-var/web2c/fmtutil.cnf
+TEXMFHOME \fI\,$HOME/texmf/web2c/fmtutil.cnf\/\fP
+TEXMFSYSCONFIG \fI\,$TEXLIVE/YYYY/texmf\-config/web2c/fmtutil.cnf\/\fP
+TEXMFSYSVAR \fI\,$TEXLIVE/YYYY/texmf\-var/web2c/fmtutil.cnf\/\fP
+TEXMFLOCAL \fI\,$TEXLIVE/texmf\-local/web2c/fmtutil.cnf\/\fP
+TEXMFDIST \fI\,$TEXLIVE/YYYY/texmf\-dist/web2c/fmtutil.cnf\/\fP
+.IP
+(where YYYY is the TeX Live release version).
+.fi
+.IP
+According to the actions, fmtutil might write to one of the given files
+or create a new fmtutil.cnf, described further below.
+.PP
+Where changes are saved:
+.IP
+If config files are given on the command line, then the first one
+given will be used to save any changes from \fB\-\-enable\fR or \fB\-\-disable\fR.
+If the config files are taken from kpsewhich output, then the
+algorithm is more complex:
+.IP
+1) If \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP or \fI\,$TEXMFHOME/web2c/fmtutil.cnf\/\fP
+appears in the list of used files, then the one listed first by
+kpsewhich \fB\-\-all\fR (equivalently, the one returned by kpsewhich
+fmtutil.cnf), is used.
+.IP
+2) If neither of the above two are present and changes are made, a
+new config file is created in \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP.
+.IP
+In general, the idea is that if a given config file is not writable, a
+higher\-level one can be used. That way, the distribution's settings
+can be overridden for system\-wide using TEXMFLOCAL, and then system
+settings can be overridden again for a particular using using TEXMFHOME.
.PP
-The command \fIkpsewhich --engine=/ --all foo.fmt\fP should show the
-locations of any and all \fIfoo.fmt\fP files.
+Resolving multiple definitions of a format:
+.IP
+If a format is defined in more than one config file, then the definition
+coming from the first\-listed fmtutil.cnf is used.
.PP
-For more information about fmt generation in TeX Live, try
-"tlmgr --help" or see http://tug.org/texlive/doc/tlmgr.html.
-The "generate" action in tlmgr does the work.
-.SH "SEE ALSO"
-.BR kpsewhich (1)
-.SH "BUGS"
-Please send bug reports to <tex-k@tug.org> (public mailing list).
-.SH "AUTHOR"
-\fBfmtutil\fP was originally written by Thomas Esser
-and is in the public domain. It is now maintained as part of TeX Live.
+Disabling formats:
+.IP
+fmtutil.cnf files with higher priority (listed earlier) can disable
+formats mentioned in lower priority (listed later) fmtutil.cnf files by
+writing, e.g.,
+.IP
+#! <fmtname> <enginename> <hyphen> <args>
+.IP
+in the higher\-priority fmtutil.cnf file.
+.IP
+As an example, suppose you have want to disable the luajitlatex format.
+You can create the file \fI\,$TEXMFCONFIG/web2c/fmtutil.cnf\/\fP with the content
+.IP
+#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini
+.IP
+and call fmtutil.
.PP
-This manual page was written by C\&.M\&. Connelly <c@eskimo\&.com>, for
-the Debian GNU/Linux system and later slightly adapted for the teTeX 3
-release\&.
+fmtutil vs. fmtutil\-sys (fmtutil \fB\-\-sys\fR):
+.IP
+When fmtutil\-sys is run or the command line option \fB\-\-sys\fR is used,
+TEXMFSYSCONFIG and TEXMFSYSVAR are used instead of TEXMFCONFIG and
+TEXMFVAR, respectively. This is the primary difference between
+fmtutil\-sys and fmtutil.
+.IP
+Other locations may be used if you give them on the command line, or
+these trees don't exist, or you are not using the original TeX Live.
+.SH "REPORTING BUGS"
+Report bugs to: tex\-k@tug.org
+.br
+TeX Live home page: <http://tug.org/texlive/>
diff --git a/source/texk/texlive/tl_scripts/fmtutil.help2man b/source/texk/texlive/tl_scripts/fmtutil.help2man
new file mode 100644
index 000000000..2f3cad6d7
--- /dev/null
+++ b/source/texk/texlive/tl_scripts/fmtutil.help2man
@@ -0,0 +1,22 @@
+# $Id: fmtutil.help2man 31440 2013-08-15 22:39:10Z karl $
+# This help2man auxiliary file is in the public domain.
+# Originally created by Karl Berry.
+# See the Makefile for the help2man invocation.
+# do not fill the long TEXMF* tables.
+
+[NAME]
+fmtutil \- manage TeX formats, Metafont bases and Metapost mems, per-user
+.br
+fmtutil-sys \- manage TeX formats, Metafont bases and Metapost mems, system-wide
+.br
+mktexfmt \- create a TeX format, Metafont base, or Metapost mem
+
+/show this message and exit/
+.SH ENVIRONMENT
+
+/in the given order/
+.nf
+
+/where YYYY is/
+.fi
+
diff --git a/source/texk/texlive/tl_scripts/scripts.lst b/source/texk/texlive/tl_scripts/scripts.lst
index affb7e9b9..190f0fd3e 100644
--- a/source/texk/texlive/tl_scripts/scripts.lst
+++ b/source/texk/texlive/tl_scripts/scripts.lst
@@ -1,12 +1,9 @@
tl_scripts='
e2pall.pl
-fmtutil-sys.sh
-updmap-sys.sh
allcm.sh
allneeded.sh
dvi2fax.sh
dvired.sh
-fmtutil.sh
fontinst.sh
kpsetool.sh
kpsewhere.sh
diff --git a/source/texk/texlive/tl_scripts/texlinks.sh b/source/texk/texlive/tl_scripts/texlinks.sh
index 028b50be9..91540eac1 100755
--- a/source/texk/texlive/tl_scripts/texlinks.sh
+++ b/source/texk/texlive/tl_scripts/texlinks.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: texlinks.sh 33924 2014-05-09 00:31:04Z karl $
+# $Id: texlinks.sh 36938 2015-04-19 21:15:06Z karl $
# Thomas Esser, 1999, 2002, 2003. public domain.
@@ -39,7 +39,7 @@ export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-version='$Id: texlinks.sh 33924 2014-05-09 00:31:04Z karl $'
+version='$Id: texlinks.sh 36938 2015-04-19 21:15:06Z karl $'
progname=texlinks
cnf=fmtutil.cnf # name of the config file
@@ -69,10 +69,7 @@ Report bugs to: tex-k@tug.org
TeX Live home page: <http://tug.org/texlive/>
'
-###############################################################################
-# abort(errmsg)
-# print `errmsg' to stderr and exit with error code 1
-###############################################################################
+# print `errmsg' to stderr and exit with error code 1:
abort() { errmsg "texlinks: $1."; cleanup 1; }
# error message to stderr:
@@ -84,10 +81,7 @@ verbose_echo() { $verbose && errmsg "$@"; }
# in verbose mode: show command that is executed:
verbose_do() { verbose_echo "$@"; "$@"; }
-###############################################################################
-# cleanup()
-# clean up the temp area and exit with proper exit status
-###############################################################################
+# clean up the temp area and exit with proper exit status:
cleanup()
{
rc=$1
@@ -177,7 +171,7 @@ install_link()
# fmtutil.cnf with different engines, but the executable link
# must point to pdftex.
verbose_echo "forcing pdfcsplain destination to be pdftex"
- dest=pdftex
+ dest=pdftex$exeext
fi
verbose_do ln -s "$dest" "$src"
fi
diff --git a/source/texk/texlive/w32_wrapper/runscript.tlu b/source/texk/texlive/w32_wrapper/runscript.tlu
index daa1d4f6d..526120e2a 100644
--- a/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -1,7 +1,7 @@
-local svnrevision = string.match("$Revision: 33766 $", "%d+") or "0"
-local svndate = string.match("$Date: 2014-04-30 18:03:08 +0200 (Wed, 30 Apr 2014) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 36823 $", "%d+") or "0"
+local svndate = string.match("$Date: 2015-04-13 08:30:56 +0200 (Mon, 13 Apr 2015) $", "[-%d]+") or "2009-12-04"
local bannerstr = "runscript wrapper utility (rev. " ..
svnrevision .. ", " .. svndate .. ")\n" ..
"usage: runscript script-name [arguments]\n" ..
@@ -77,8 +77,9 @@ local helpstr = [[
runscript <script-name> [script arguments]
If you prefer to call the script program simply by its name, copy
- and rename bin/win32/runscript.exe to <script-name>.exe and put it
- somewhere on the search path.]]
+ and rename bin/win32/runscript.exe (or bin/win64/runscript.exe for
+ 64-bit Windows) to <script-name>.exe and put it somewhere on the
+ search path.]]
local docstr = [[
@@ -246,6 +247,8 @@ local docstr = [[
- add TEXMFDIST/fonts to the GS_LIB path. Patch by Yusuke KUROKI
2014/04/30
- fix for argument duplication in fmtutil
+ 2015/04/12
+ - handle fmtutil-sys via fmtutil --sys
]]
-- HELPER SUBROUTINES --
@@ -457,7 +460,9 @@ end
local scripts4tlperl = {
tlperl = true,
updmap = true,
+ fmtutil = true,
['updmap-sys'] = true,
+ ['fmtutil-sys'] = true,
}
local try_extern_perl = (kpse.var_value('TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL') == '1') and
not (guimode or is_restricted_progname or scripts4tlperl[progname])
@@ -523,7 +528,7 @@ PATH = prepend_path(PATH, GSDIR, BINDIR)
os.setenv('PATH', PATH);
-- sys stuff
-if (sysprog and not (progname == 'updmap')) then
+if (sysprog and not (progname == 'updmap') and not (progname == 'fmtutil')) then
os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
end
@@ -571,6 +576,10 @@ elseif progname == 'updmap' then
if sysprog then
argline = progname .. ' --sys ' .. argline
end
+elseif progname == 'fmtutil' then
+ if sysprog then
+ argline = progname .. ' --sys ' .. argline
+ end
elseif progname == 'asy' then
os.setenv('ASYMPTOTE_GS', GSEXE)
os.setenv('CYGWIN', 'nodosfilewarning')
@@ -593,8 +602,6 @@ elseif progname == 'dviout' then
[[\tlpkg\dviout\gen_pk'" "-TEXROOT=']] ..
table.concat(texrt, ';') .. [['" "-gsx=']] .. GSEXE .. [['"]];
ARGV = {[0]=TEXDIR..'/tlpkg/dviout/dviout.exe', 'dviout', par}
-elseif progname == 'fmtutil' and sysprog then
- ARGV = {[0]=BINDIR..'/fmtutil.exe', 'fmtutil'}
elseif progname == 'mkluatexfontdb' then
progname = 'luaotfload-tool'
table.insert(arg, '--alias=mkluatexfontdb')
diff --git a/source/texk/web2c/ChangeLog b/source/texk/web2c/ChangeLog
index 634a8bd00..2ed8bc52e 100644
--- a/source/texk/web2c/ChangeLog
+++ b/source/texk/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-12 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * triptrap/{mftrap,mptrap,trip}.diffs: Updated for TL 2015.
+
2015-03-31 Peter Breitenlohner <peb@mppmu.mpg.de>
* mftalk.h (removed): Moved from here to window/mftalk.h.
diff --git a/source/texk/web2c/Makefile.in b/source/texk/web2c/Makefile.in
index 667f35a35..71505f8ee 100644
--- a/source/texk/web2c/Makefile.in
+++ b/source/texk/web2c/Makefile.in
@@ -3644,9 +3644,10 @@ pkgconfigdir = ${libdir}/pkgconfig
@XETEX_SYNCTEX_TRUE@xetex_ch_synctex = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-def.ch0 \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch1 \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
-@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-rec.ch0
+@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0
@XETEX_SYNCTEX_TRUE@xetex_post_ch_synctex = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xe-rec.ch3
diff --git a/source/texk/web2c/configure b/source/texk/web2c/configure
index 7990a821e..be1a02dae 100755
--- a/source/texk/web2c/configure
+++ b/source/texk/web2c/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C 2015/dev.
+# Generated by GNU Autoconf 2.69 for Web2C 2015.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Web2C'
PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2015/dev'
-PACKAGE_STRING='Web2C 2015/dev'
+PACKAGE_VERSION='2015'
+PACKAGE_STRING='Web2C 2015'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1596,7 +1596,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Web2C 2015/dev to adapt to many kinds of systems.
+\`configure' configures Web2C 2015 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1670,7 +1670,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C 2015/dev:";;
+ short | recursive ) echo "Configuration of Web2C 2015:";;
esac
cat <<\_ACEOF
@@ -1887,7 +1887,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C configure 2015/dev
+Web2C configure 2015
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2976,7 +2976,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C $as_me 2015/dev, which was
+It was created by Web2C $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3357,7 +3357,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-WEB2CVERSION=2015/dev
+WEB2CVERSION=2015
am__api_version='1.15'
@@ -8664,7 +8664,7 @@ fi
# Define the identity of the package.
PACKAGE='web2c'
- VERSION='2015/dev'
+ VERSION='2015'
cat >>confdefs.h <<_ACEOF
@@ -22315,7 +22315,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-Web2C config.lt 2015/dev
+Web2C config.lt 2015
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -25416,7 +25416,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C $as_me 2015/dev, which was
+This file was extended by Web2C $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25486,7 +25486,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Web2C config.status 2015/dev
+Web2C config.status 2015
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/source/texk/web2c/synctexdir/am/synctex.am b/source/texk/web2c/synctexdir/am/synctex.am
index af9a5bd6a..4859c4695 100644
--- a/source/texk/web2c/synctexdir/am/synctex.am
+++ b/source/texk/web2c/synctexdir/am/synctex.am
@@ -315,9 +315,10 @@ xetex_CPPFLAGS += -I$(srcdir)/synctexdir
xetex_ch_synctex = \
synctexdir/synctex-xe-def.ch0 \
synctexdir/synctex-mem.ch0 \
+ synctexdir/synctex-e-mem.ch0 \
synctexdir/synctex-e-mem.ch1 \
synctexdir/synctex-rec.ch0 \
- synctexdir/synctex-xe-rec.ch0
+ synctexdir/synctex-e-rec.ch0
xetex_post_ch_synctex = \
synctexdir/synctex-xe-rec.ch3
diff --git a/source/texk/web2c/triptrap/mftrap.diffs b/source/texk/web2c/triptrap/mftrap.diffs
index 7930f033f..35b00ea2c 100644
--- a/source/texk/web2c/triptrap/mftrap.diffs
+++ b/source/texk/web2c/triptrap/mftrap.diffs
@@ -2,12 +2,13 @@
>>> See SRCDIR/triptrap/mftrap.diffs for example of acceptable diffs.
+ ln -s SRCDIR/triptrap/trap.mf .
+ ./mf --progname=inimf
++ test '!' -s trap.base
+ mv trap.log mftrapin.log
+ diff SRCDIR/triptrap/mftrapin.log mftrapin.log
1c1
< This is METAFONT, Version 2.7182818 (INIMF) 7 JAN 2014 17:51
---
-> This is METAFONT, Version 2.7182818 (TeX Live 2014) (INIMF) 1 MAY 2014 13:44
+> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF) 12 APR 2015 16:22
150c150
< String usage 26&83 (891&11438 still untouched)
---
@@ -16,8 +17,8 @@
< (preloaded base=trap 2014.1.7)
< 1117 strings of total length 20614
---
-> (preloaded base=trap 2014.5.1)
-> 1123 strings of total length 20612
+> (preloaded base=trap 2015.4.12)
+> 1123 strings of total length 20613
+ ./mf --progname=inimf
+ mv trap.log mftrap.log
+ mv trap.tfm mftrap.tfm
@@ -27,21 +28,21 @@
< ** &trap trap
< (trap.mf
---
-> This is METAFONT, Version 2.7182818 (TeX Live 2014) (INIMF)
+> This is METAFONT, Version 2.7182818 (TeX Live 2015) (INIMF)
> **(trap.mf
39c38
< String usage 41&161 (815&7634 still untouched)
---
-> String usage 50&202 (6300&75595 still untouched)
+> String usage 50&202 (6300&75594 still untouched)
+ diff SRCDIR/triptrap/mftrap.log mftrap.log
1c1
< This is METAFONT, Version 2.7182818 (preloaded base=trap 2014.1.7) 7 JAN 2014 18:11
---
-> This is METAFONT, Version 2.7182818 (TeX Live 2014) (preloaded base=trap 2014.5.1) 1 MAY 2014 13:44
+> This is METAFONT, Version 2.7182818 (TeX Live 2015) (preloaded base=trap 2015.4.12) 12 APR 2015 16:22
1825c1825
< String usage 24&92 (858&11309 still untouched)
---
-> String usage 30&119 (6346&79263 still untouched)
+> String usage 30&119 (6346&79262 still untouched)
3693,3695c3693,3695
< xpart %CAPSULE1359=xx
< %CAPSULE1367=2yy-2
@@ -141,13 +142,13 @@
4235c4235
< String usage 41&161 (815&7634 still untouched)
---
-> String usage 50&202 (6300&75595 still untouched)
+> String usage 50&202 (6300&75594 still untouched)
4251,4252c4251,4252
< 68 strings out of 883
< 3752 string characters out of 11386
---
> 77 strings out of 6377
-> 3793 string characters out of 79388
+> 3793 string characters out of 79387
4254,4255c4254,4255
< 289 symbolic tokens out of 2100
< 8i,43n,14r,8p,167b stack positions out of 30i,100n,300r,150p,500b
@@ -165,11 +166,11 @@
1c1
< This is GFtype, Version 3.1
---
-> This is GFtype, Version 3.1 (TeX Live 2014)
+> This is GFtype, Version 3.1 (TeX Live 2015)
3c3
< ' METAFONT output 2014.01.07:1811'
---
-> ' METAFONT output 2014.05.01:1344'
+> ' METAFONT output 2015.04.12:1622'
+ for f in mftrapin.log mftrap.fot mftrap.log trap.typ
+ sed SRCDIR/triptrap/mftrapin.log -f filter
+ sed mftrapin.log -f filter
diff --git a/source/texk/web2c/triptrap/mptrap.diffs b/source/texk/web2c/triptrap/mptrap.diffs
index 4c72157bd..870e2be60 100644
--- a/source/texk/web2c/triptrap/mptrap.diffs
+++ b/source/texk/web2c/triptrap/mptrap.diffs
@@ -3,13 +3,13 @@
+ ./pltotf SRCDIR/triptrap/trapf.pl trapf.tfm
+ ln -s SRCDIR/triptrap/mtrap.mp .
+ ./mpost --ini mtrap
-This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
+This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1)
(./mtrap.mp
+ diff SRCDIR/triptrap/mtrap.log mtrap.log
1c1
< This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47
---
-> This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) 1 MAY 2014 13:44
+> This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) 12 APR 2015 16:22
4,5c4,5
< Memory usage 19&13 (3972 still untouched)
< String usage 3&12 (101&7774 now untouched)
@@ -185,7 +185,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
929c929
< >> "%%Creator: MetaPost 1.203"
---
-> >> "%%Creator: MetaPost 1.902"
+> >> "%%Creator: MetaPost 1.999"
931c931
< >> "%*Font: trapf 9.9628 9.96265 35:c008"
---
@@ -227,7 +227,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
978c978
< >> "%%CreationDate: 2009.05.25:1247"
---
-> >> "%%CreationDate: 2014.05.01:1344"
+> >> "%%CreationDate: 2015.04.12:1622"
982,984c982,984
< >> "%*Font: trapf 9.9628 9.96265 35:c008"
< Memory usage 359&13 (2867 still untouched)
@@ -278,7 +278,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
---
> 173 strings using 2917 characters
> 18856 bytes of node memory
-> 315 symbolic tokens
+> 317 symbolic tokens
> 6i,48n,6p,99b,2f stack positions out of 16i,96n,7p,200b,4f
1082a1081
>
@@ -287,8 +287,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
< %%Creator: MetaPost 1.203
< %%CreationDate: 2009.05.25:1247
---
-> %%Creator: MetaPost 1.902
-> %%CreationDate: 2014.05.01:1344
+> %%Creator: MetaPost 1.999
+> %%CreationDate: 2015.04.12:1622
7c7
< %*Font: trapf 9.9628 9.96265 35:c008
---
@@ -308,8 +308,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
< %%Creator: MetaPost 1.203
< %%CreationDate: 2009.05.25:1247
---
-> %%Creator: MetaPost 1.902
-> %%CreationDate: 2014.05.01:1344
+> %%Creator: MetaPost 1.999
+> %%CreationDate: 2015.04.12:1622
23,25c23,24
< 0 0 0 setrgbcolor 1
< 0 dtransform exch truncate exch idtransform pop setlinewidth [] 0 setdash
@@ -337,14 +337,8 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
1c1
< This is MetaPost, version 1.203 (kpathsea version 3.5.7dev) (INIMP) 25 MAY 2009 12:47
---
-> This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0) 1 MAY 2014 13:44
-32,34c32
-< << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}(([][]))=numeric
-< << == >> ::: ||`` ''--!! ??## && @@ $$[[]]{{ }}((5.5 0.5))=<< == >> ::: ||`` ''
-< --!! ??## && @@ $$[[]]{{ }}((5.5 0.5))
----
-> > <<=tag
-40,60c38,45
+> This is MetaPost, version 1.999 (TeX Live 2015) (kpathsea version 6.2.1) 12 APR 2015 16:22
+40,60c40,47
< ! Missing `:' has been inserted.
< <to be read again>
< ;
@@ -373,13 +367,13 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
> I'm not currently working on a for loop,
> so I had better not try to end anything.
>
-> Memory usage 14048
+> Memory usage 14128
> String usage 6&49
-62c47
+62c49
< l.9 ... tracingcommands>2 endfor; showtoken |=:|>;
---
> l.17 ...gspecs step 1 until $:fi endfor showstats;
-65,98c50,52
+65,98c52,54
< ! Arithmetic overflow.
< l.10 tracinglostchars:=1/.00001
< ; tracingequations:=$+1; p~=tracinglostchar...
@@ -418,7 +412,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
> >> unknown path p~
> >> (0
> ! Equation cannot be performed (unknown path=numeric).
-100,148c54,58
+100,148c56,60
< ;
< l.12 ...utput:=tracingmacros:=1; $:=ASCII""; $:=x;
< p~:=p~;
@@ -474,12 +468,12 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
> 0)..controls (15,4) and (-15,-12)..(4,0);
> I'm sorry, but I don't know how to make such things equal.
> (See the two expressions just above the error message.)
-150,151c60
+150,151c62
< >> 4
< ! OK.
---
> ! Extra tokens will be flushed.
-153,165c62,71
+153,165c64,73
< endgroup
< l.17 ),2+2endtext
< ; for n=tracingspecs step 1 until $:fi endfor showstats;
@@ -504,7 +498,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
> now in front of anything that you don't want me to delete.
> (See Chapter 27 of The METAFONTbook for an example.)
>
-167,191d72
+167,191d74
< {let}
< {path}
< {-(15)}
@@ -530,7 +524,7 @@ This is MetaPost, version 1.902 (TeX Live 2014) (kpathsea version 6.2.0)
< {elseif}
< {endinput}
< {\}
-194,198c75
+194,198c77
< Beginning to dump on file trap.mem
< (mem=trap 2009.05.25)
< at most 553 strings of total length 2302
diff --git a/source/texk/web2c/triptrap/trip.diffs b/source/texk/web2c/triptrap/trip.diffs
index b9be8885c..e5b0d45dd 100644
--- a/source/texk/web2c/triptrap/trip.diffs
+++ b/source/texk/web2c/triptrap/trip.diffs
@@ -5,12 +5,13 @@
+ diff SRCDIR/triptrap/trip.pl trip.pl
+ ln -s SRCDIR/triptrap/trip.tex .
+ ./tex --progname=initex --ini
++ test '!' -s trip.fmt
+ mv trip.log tripin.log
+ diff SRCDIR/triptrap/tripin.log tripin.log
1c1
< This is TeX, Version 3.14159265 (INITEX) 7 JAN 2014 09:09
---
-> This is TeX, Version 3.14159265 (TeX Live 2014) (INITEX) 1 MAY 2014 13:44
+> This is TeX, Version 3.14159265 (TeX Live 2015) (INITEX) 12 APR 2015 16:22
3c3
< (trip.tex
---
@@ -19,8 +20,8 @@
< (preloaded format=trip 2014.1.7)
< 1326 strings of total length 23646
---
-> (preloaded format=trip 2014.5.1)
-> 1371 strings of total length 24605
+> (preloaded format=trip 2015.4.12)
+> 1371 strings of total length 24606
461c461
< Hyphenation trie of length 273 has 9 ops out of 500
---
@@ -32,13 +33,13 @@
< ** &trip trip
< (trip.tex ##
---
-> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=tex)
+> This is TeX, Version 3.14159265 (TeX Live 2015) (preloaded format=tex)
> **(./trip.tex ##
+ diff SRCDIR/triptrap/trip.log trip.log
1c1
< This is TeX, Version 3.14159265 (preloaded format=trip 2014.1.7) 7 JAN 2014 09:59
---
-> This is TeX, Version 3.14159265 (TeX Live 2014) (preloaded format=trip 2014.5.1) 1 MAY 2014 13:44
+> This is TeX, Version 3.14159265 (TeX Live 2015) (preloaded format=trip 2015.4.12) 12 APR 2015 16:22
3c3
< (trip.tex ##
---
@@ -93,7 +94,7 @@
< 253 string characters out of 8354
---
> 44 strings out of 1629
-> 261 string characters out of 15395
+> 261 string characters out of 15394
7299c7303
< 372 multiletter control sequences out of 2100
---
@@ -108,11 +109,11 @@
1c1
< This is DVItype, Version 3.6
---
-> This is DVItype, Version 3.6 (TeX Live 2014)
+> This is DVItype, Version 3.6 (TeX Live 2015)
9c9
< ' TeX output 2014.01.07:0959'
---
-> ' TeX output 2014.05.01:1344'
+> ' TeX output 2015.04.12:1622'
419c419
< 1121: down4 639342208
---
diff --git a/source/texk/web2c/web2c/ChangeLog b/source/texk/web2c/web2c/ChangeLog
index 3972f5eab..e43657a3a 100644
--- a/source/texk/web2c/web2c/ChangeLog
+++ b/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Test if isascii is declared.
+
2015-01-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* common.defines: Remove intcast.
diff --git a/source/texk/web2c/web2c/c-auto.in b/source/texk/web2c/web2c/c-auto.in
index e198ab430..1659ea715 100644
--- a/source/texk/web2c/web2c/c-auto.in
+++ b/source/texk/web2c/web2c/c-auto.in
@@ -6,6 +6,10 @@
/* Define to 1 if you have the <assert.h> header file. */
#undef HAVE_ASSERT_H
+/* Define to 1 if you have the declaration of `isascii', and to 0 if you
+ don't. */
+#undef HAVE_DECL_ISASCII
+
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
diff --git a/source/texk/web2c/web2c/configure b/source/texk/web2c/web2c/configure
index 7b42263ef..37613c177 100755
--- a/source/texk/web2c/web2c/configure
+++ b/source/texk/web2c/web2c/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Web2C Tools 2015/dev.
+# Generated by GNU Autoconf 2.69 for Web2C Tools 2015.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Web2C Tools'
PACKAGE_TARNAME='web2c-tools'
-PACKAGE_VERSION='2015/dev'
-PACKAGE_STRING='Web2C Tools 2015/dev'
+PACKAGE_VERSION='2015'
+PACKAGE_STRING='Web2C Tools 2015'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1328,7 +1328,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Web2C Tools 2015/dev to adapt to many kinds of systems.
+\`configure' configures Web2C Tools 2015 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1398,7 +1398,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C Tools 2015/dev:";;
+ short | recursive ) echo "Configuration of Web2C Tools 2015:";;
esac
cat <<\_ACEOF
@@ -1521,7 +1521,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C Tools configure 2015/dev
+Web2C Tools configure 2015
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2310,11 +2310,57 @@ rm -f conftest.val
as_fn_set_status $ac_retval
} # ac_fn_c_compute_int
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C Tools $as_me 2015/dev, which was
+It was created by Web2C Tools $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7999,7 +8045,7 @@ fi
# Define the identity of the package.
PACKAGE='web2c-tools'
- VERSION='2015/dev'
+ VERSION='2015'
cat >>confdefs.h <<_ACEOF
@@ -13963,6 +14009,19 @@ fi
+ac_fn_c_check_decl "$LINENO" "isascii" "ac_cv_have_decl_isascii" "#include <ctype.h>
+"
+if test "x$ac_cv_have_decl_isascii" = xyes; then :
+ ac_have_decl=1
+else
+ ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ISASCII $ac_have_decl
+_ACEOF
+
+
ac_config_headers="$ac_config_headers kpathsea/c-auto.h:c-auto.in"
@@ -14503,7 +14562,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C Tools $as_me 2015/dev, which was
+This file was extended by Web2C Tools $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14569,7 +14628,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Web2C Tools config.status 2015/dev
+Web2C Tools config.status 2015
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/source/texk/web2c/web2c/configure.ac b/source/texk/web2c/web2c/configure.ac
index 56dc0e6d5..3beca4688 100644
--- a/source/texk/web2c/web2c/configure.ac
+++ b/source/texk/web2c/web2c/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with Autoconf to produce a configure script for Web2c.
dnl
-dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -35,6 +35,9 @@ AC_CHECK_SIZEOF([long])
AC_CHECK_SIZEOF([void *])
AC_TYPE_UINTPTR_T
+dnl Check if <ctype.h> declares isascii.
+AC_CHECK_DECLS([isascii], [], [], [[#include <ctype.h>]])
+
dnl Write output here, instead of putting a zillion -D's on the command line.
AC_CONFIG_HEADERS([kpathsea/c-auto.h:c-auto.in])
diff --git a/source/utils/configure b/source/utils/configure
index fd81bfe17..45b86ea8c 100755
--- a/source/utils/configure
+++ b/source/utils/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for TeX Live utils 2015/dev.
+# Generated by GNU Autoconf 2.69 for TeX Live utils 2015.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='TeX Live utils'
PACKAGE_TARNAME='tex-live-utils'
-PACKAGE_VERSION='2015/dev'
-PACKAGE_STRING='TeX Live utils 2015/dev'
+PACKAGE_VERSION='2015'
+PACKAGE_STRING='TeX Live utils 2015'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures TeX Live utils 2015/dev to adapt to many kinds of systems.
+\`configure' configures TeX Live utils 2015 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1382,7 +1382,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live utils 2015/dev:";;
+ short | recursive ) echo "Configuration of TeX Live utils 2015:";;
esac
cat <<\_ACEOF
@@ -1568,7 +1568,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live utils configure 2015/dev
+TeX Live utils configure 2015
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1669,7 +1669,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live utils $as_me 2015/dev, which was
+It was created by TeX Live utils $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -4431,7 +4431,7 @@ fi
# Define the identity of the package.
PACKAGE='tex-live-utils'
- VERSION='2015/dev'
+ VERSION='2015'
cat >>confdefs.h <<_ACEOF
@@ -5343,7 +5343,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live utils $as_me 2015/dev, which was
+This file was extended by TeX Live utils $as_me 2015, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5400,7 +5400,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-TeX Live utils config.status 2015/dev
+TeX Live utils config.status 2015
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/source/version.ac b/source/version.ac
index 311962422..226b4c18a 100644
--- a/source/version.ac
+++ b/source/version.ac
@@ -1,4 +1,4 @@
-dnl Copyright 2010-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright 2010-2015 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -7,4 +7,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2015/dev])
+m4_define([tex_live_version], [2015])
--
GitLab