Update build system

git-svn-id: svn://tug.org/texlive/trunk@30903 c570f23f-e606-0410-a88d-b1316a301751

24 files changed, 763 insertions, 245 deletions

diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index 2bd6b7b0622..f43959a96c3 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,10 @@
+2013-03-01  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* configure.ac: Added Automake options 'tar-pax' for paths
+	longer than 100 chars and 'no-dist-gzip'.
+	* version.ac: Switch 2013 => 2014/dev'
+	* tardate.ac: Switch to 2013-06-24.
+
 2013-03-26  Karl Berry  <karl@tug.org>
 
 	* Build: use $MAKE rather than $TL_MAKE for the make clean
diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index b7a9c44525c..eee51c72c72 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -501,13 +529,12 @@ distclean-libtool:
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
diff --git a/Build/source/README.hacking b/Build/source/README.hacking
index 293b23f67cb..01824754c9d 100644
--- a/Build/source/README.hacking
+++ b/Build/source/README.hacking
@@ -14,7 +14,7 @@ them with configure --prefix=/usr/local/gnu and having
 
 autoconf (GNU Autoconf) 2.69
 
-automake (GNU automake) 1.13.1
+automake (GNU automake) 1.14
 
 ltmain.sh (GNU libtool) 2.4.2
 
diff --git a/Build/source/aclocal.m4 b/Build/source/aclocal.m4
index fa4f6eb478d..28d8a7be7dc 100644
--- a/Build/source/aclocal.m4
+++ b/Build/source/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.13'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.1], [],
+m4_if([$1], [1.13.4], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.1])dnl
+[AM_AUTOMAKE_VERSION([1.13.4])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -373,7 +373,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
@@ -961,76 +961,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/Build/source/build-aux/README.TL b/Build/source/build-aux/README.TL
index 0a0bf69f6f5..6860b621504 100644
--- a/Build/source/build-aux/README.TL
+++ b/Build/source/build-aux/README.TL
@@ -5,12 +5,12 @@ This directory is the central repository for auxiliary files, mostly
 shell scripts, needed to build the TeX Live (TL) tree.  They are used by
 all packages `owned' by the TL tree, i.e., maintained as part of TL.
 
-missing, test-driver, and ylwrap come from automake; ltmain.sh comes
-from libtool.  Those must be manually updated when new versions of the
-packages are installed.  The Master/tlpkg/dev/srclist.txt file has
-checks for these, but updates are not automatic.  (We generally try to
-use the latest official release, as it is available directly from GNU,
-not any distro version.)
+compile, missing, test-driver, and ylwrap come from automake; ltmain.sh
+comes from libtool.  Those must be manually updated when new versions of the
+packages are installed.  The Master/tlpkg/dev/srclist.txt file has checks
+for these, but updates are not automatic.  (We generally try to use the
+latest official release, as it is available directly from GNU, not any
+distro version.)
 
 relpath is locally written.
 
diff --git a/Build/source/build-aux/compile b/Build/source/build-aux/compile
new file mode 100755
index 00000000000..531136b068e
--- /dev/null
+++ b/Build/source/build-aux/compile
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/Build/source/build-aux/ylwrap b/Build/source/build-aux/ylwrap
index 1c4d77612c5..8f072a8e97c 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=2012-12-21.17; # UTC
+scriptversion=2013-01-12.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 "$1" = "--"; then
+while test $# -ne 0; do
+  if test x"$1" = x"--"; then
     shift
     break
   fi
@@ -153,16 +153,14 @@ 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
@@ -188,7 +186,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
@@ -197,7 +195,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/configure b/Build/source/configure
index 9d3f3b58547..5558bb6fb20 100755
--- a/Build/source/configure
+++ b/Build/source/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 2013-03-01.
+# Generated by GNU Autoconf 2.69 for TeX Live 2013-06-24.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='TeX Live'
 PACKAGE_TARNAME='tex-live'
-PACKAGE_VERSION='2013-03-01'
-PACKAGE_STRING='TeX Live 2013-03-01'
+PACKAGE_VERSION='2013-06-24'
+PACKAGE_STRING='TeX Live 2013-06-24'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1498,7 +1498,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 2013-03-01 to adapt to many kinds of systems.
+\`configure' configures TeX Live 2013-06-24 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1572,7 +1572,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of TeX Live 2013-03-01:";;
+     short | recursive ) echo "Configuration of TeX Live 2013-06-24:";;
    esac
   cat <<\_ACEOF
 
@@ -1880,7 +1880,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-TeX Live configure 2013-03-01
+TeX Live configure 2013-06-24
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2611,7 +2611,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 $as_me 2013-03-01, which was
+It was created by TeX Live $as_me 2013-06-24, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -10315,7 +10315,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tex-live'
- VERSION='2013-03-01'
+ VERSION='2013-06-24'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10355,11 +10355,16 @@ mkdir_p='$(MKDIR_P)'
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -21693,7 +21698,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 $as_me 2013-03-01, which was
+This file was extended by TeX Live $as_me 2013-06-24, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21750,7 +21755,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 config.status 2013-03-01
+TeX Live config.status 2013-06-24
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -22730,7 +22735,7 @@ $as_echo X"$mf" |
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index c9e3833bf41..d5a1730195c 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -56,7 +56,7 @@ dnl
 KPSE_SETUP([])
 
 dnl Common code for all programs using libkpathsea.
-KPSE_COMMON([TeX Live top-level], [dist-xz])
+KPSE_COMMON([TeX Live top-level], [tar-pax dist-xz no-dist-gzip])
 KPSE_CANONICAL_HOST
 
 AC_PROG_MKDIR_P
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index eb964951b2a..77fcdceec0d 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,27 @@
+2013-06-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-pkgs.m4 (KPSE_LIBS_PKGS): Add lua52.
+	* kpse-lua52-flags.m4: New file.
+	* kpse-largefile.m4 (new): CPPFLAGS for largefile support.
+
+2013-06-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-pkgs.m4 (kpse_texk_pkgs): Remove xdv2pdf.
+
+2013-06-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-poppler-flags.m4: Headers installed as for system-poppler.
+
+2013-05-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-pkgs.m4 (KPSE_LIBS_PKGS): Remove t1lib.
+	* kpse-t1lib-flags.m4: Removed.
+
+2013-04-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-pkgs.m4 (KPSE_LIBS_PKGS): Add t1lib.
+	* kpse-potrace-flags.m4: New file.
+
 2013-03-26  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-cairo-flags.m4: Require cairo-1.12 or better (message).
diff --git a/Build/source/m4/kpse-cairo-flags.m4 b/Build/source/m4/kpse-cairo-flags.m4
index c7a6c9bf65b..f9c38f2e588 100644
--- a/Build/source/m4/kpse-cairo-flags.m4
+++ b/Build/source/m4/kpse-cairo-flags.m4
@@ -12,7 +12,7 @@
 # Set the make variables CAIRO_INCLUDES and CAIRO_LIBS to the CPPFLAGS and
 # LIBS required for the `-lcairo' library in libs/cairo/ of the TL tree.
 AC_DEFUN([KPSE_CAIRO_FLAGS],
-[_KPSE_LIB_FLAGS([cairo], [cairo], [lt],
+[_KPSE_LIB_FLAGS([cairo], [cairo], [],
                  [-IBLD/libs/cairo/cairo], [BLD/libs/cairo/libcairo.a], [],
                  [], [${top_builddir}/../../libs/cairo/cairo/cairo.h])[]dnl
 ]) # KPSE_CAIRO_FLAGS
diff --git a/Build/source/m4/kpse-gd-flags.m4 b/Build/source/m4/kpse-gd-flags.m4
index db5213bd751..7703541f834 100644
--- a/Build/source/m4/kpse-gd-flags.m4
+++ b/Build/source/m4/kpse-gd-flags.m4
@@ -1,12 +1,10 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 0
-
 # KPSE_GD_FLAGS
 # -------------
 # Provide the configure options '--with-system-gd' (if in the TL tree),
@@ -14,11 +12,13 @@
 #
 # Set the make variables GD_INCLUDES and GD_LIBS to the CPPFLAGS and
 # LIBS required for the `-lgd' library in libs/gd/ of the TL tree.
-AC_DEFUN([KPSE_GD_FLAGS],
-[AC_REQUIRE([KPSE_LIBPNG_FLAGS])[]dnl
+AC_DEFUN([KPSE_GD_FLAGS], [dnl
+AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AC_REQUIRE([KPSE_LIBPNG_FLAGS])[]dnl
 AC_REQUIRE([KPSE_FREETYPE2_FLAGS])[]dnl
 _KPSE_LIB_FLAGS([gd], [gd], [],
-                [-IBLD/libs/gd/include -DNONDLL], [BLD/libs/gd/libgd.a], [],
+                [-IBLD/libs/gd/include], [BLD/libs/gd/libgd.a],
+                [test "x$kpse_cv_have_win32" = xno || GD_INCLUDES="$GD_INCLUDES -DBGDWIN32 -DNONDLL"],
                 [], [${top_builddir}/../../libs/gd/include/gd.h])[]dnl
 ]) # KPSE_GD_FLAGS
 
diff --git a/Build/source/m4/kpse-largefile.m4 b/Build/source/m4/kpse-largefile.m4
new file mode 100644
index 00000000000..b9af9acee3f
--- /dev/null
+++ b/Build/source/m4/kpse-largefile.m4
@@ -0,0 +1,25 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# KPSE_LARGEFILE(MAKE-VAR,[EXTRA-DEFINE])
+# ---------------------------------------
+# Append -D's required for largefile support to MAKE-VAR.
+AC_DEFUN([KPSE_LARGEFILE], [dnl
+AC_REQUIRE([AC_SYS_LARGEFILE])[]dnl
+AC_REQUIRE([AC_FUNC_FSEEKO])[]dnl
+if test "x$enable_largefile" != xno; then
+  AS_CASE([$ac_cv_sys_file_offset_bits],
+          [no], [],
+          [unknown], [AS_CASE([$ac_cv_sys_large_files],
+                              [no | unknown], [],
+                              [$1="$$1 -D_LARGE_FILES"])],
+          [$1="$$1 m4_ifval([$2], [-D$2 ])-D_FILE_OFFSET_BITS=64"])
+fi
+AS_CASE([$ac_cv_sys_largefile_source],
+        [no | unknown], [],
+        [$1="$$1 -D_LARGEFILE_SOURCE"])
+]) # KPSE_LARGEFILE
diff --git a/Build/source/m4/kpse-lua52-flags.m4 b/Build/source/m4/kpse-lua52-flags.m4
new file mode 100644
index 00000000000..598191f353a
--- /dev/null
+++ b/Build/source/m4/kpse-lua52-flags.m4
@@ -0,0 +1,35 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# KPSE_LUA52_FLAGS
+# ----------------
+# Set the make variables LUA52_INCLUDES and LUA52_LIBS to
+# the CPPFLAGS and LIBS required for the `-llua52' library in
+# libs/luz52/ of the TL tree.
+AC_DEFUN([KPSE_LUA52_FLAGS], [dnl
+_KPSE_LIB_FLAGS([lua52], [lua52], [tree],
+                [-IBLD/libs/lua52/include], [BLD/libs/lua52/liblua52.a], [],
+                [], [${top_builddir}/../../libs/lua52/include/lua.h])[]dnl
+]) # KPSE_LUA52_FLAGS
+
+# KPSE_LUA52_DEFINES
+# ------------------
+# Set the make variable LUA52_DEFINES to the CPPFLAGS required when
+# compiling or using the `-llua52' library.
+AC_DEFUN([KPSE_LUA52_DEFINES], [dnl
+AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AC_SUBST([LUA52_DEFINES], [-DLUA_COMPAT_MODULE])
+if test "x$kpse_cv_have_win32" = xno; then
+  LUA52_DEFINES="$LUA52_DEFINES -DLUA_USE_POSIX"
+  AC_SEARCH_LIBS([dlopen], [dl])
+  if test "x$ac_cv_search_dlopen" != xno; then
+    AC_CHECK_HEADER([dlfcn.h],
+                    [LUA52_DEFINES="$LUA52_DEFINES -DLUA_USE_DLOPEN"],
+                    [], [AC_INCLUDES_DEFAULT])
+  fi
+fi
+]) # KPSE_LUA52_DEFINES
diff --git a/Build/source/m4/kpse-pixman-flags.m4 b/Build/source/m4/kpse-pixman-flags.m4
index d3f93cd1669..08889fe3367 100644
--- a/Build/source/m4/kpse-pixman-flags.m4
+++ b/Build/source/m4/kpse-pixman-flags.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -12,8 +12,8 @@
 # Set the make variables PIXMAN_INCLUDES and PIXMAN_LIBS to the CPPFLAGS and
 # LIBS required for the `-lpixman-1' library in libs/pixman/ of the TL tree.
 AC_DEFUN([KPSE_PIXMAN_FLAGS],
-[_KPSE_LIB_FLAGS([pixman], [pixman], [lt],
-                 [-IBLD/libs/pixman/include], [BLD/libs/pixman/libpixman.la], [],
+[_KPSE_LIB_FLAGS([pixman], [pixman], [],
+                 [-IBLD/libs/pixman/include], [BLD/libs/pixman/libpixman.a], [],
                  [], [${top_builddir}/../../libs/pixman/include/pixman.h])[]dnl
 ]) # KPSE_PIXMAN_FLAGS
 
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index 1ad77724c16..8528c908d5a 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -1,5 +1,5 @@
 # Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -21,9 +21,8 @@
 #   TeX specific libraries, i.e., subdirs 'texk/*', that can only
 #   be used by TeXk sub-packages and can't use generic libraries
 # Each library must precede required other libraries (if any).
-AC_DEFUN([KPSE_LIBS_PKGS],
-[dnl generic libraries 'libs/*'
-m4_define([kpse_libs_pkgs], [
+AC_DEFUN([KPSE_LIBS_PKGS], [dnl
+m4_define([kpse_libs_pkgs], [dnl
 harfbuzz
 icu
 teckit
@@ -33,15 +32,15 @@ xpdf
 poppler
 cairo
 pixman
+potrace
 gd
 freetype2
 freetype
-t1lib
 libpng
+lua52
 zlib
 ])[]dnl
-dnl TeX specific libraries
-m4_define([kpse_texlibs_pkgs], [
+m4_define([kpse_texlibs_pkgs], [dnl
 ptexenc
 kpathsea
 ])]) # KPSE_LIBS_PKGS
@@ -50,20 +49,20 @@ kpathsea
 # -----------------------
 # Generate flags for all potential system libraries available,
 # only used at top-level.
-AC_DEFUN([KPSE_ALL_SYSTEM_FLAGS],
-[AC_REQUIRE([KPSE_LIBS_PREPARE])[]dnl
+AC_DEFUN([KPSE_ALL_SYSTEM_FLAGS], [dnl
+AC_REQUIRE([KPSE_LIBS_PREPARE])[]dnl
 AC_REQUIRE([KPSE_KPATHSEA_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_PTEXENC_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_ZLIB_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_LIBPNG_SYSTEM_FLAGS])[]dnl
-AC_REQUIRE([KPSE_T1LIB_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_FREETYPE_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_FREETYPE2_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_GD_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_POTRACE_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_PIXMAN_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_CAIRO_SYSTEM_FLAGS])[]dnl
-AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_POPPLER_SYSTEM_FLAGS])[]dnl
+AC_REQUIRE([KPSE_XPDF_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_ZZIPLIB_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_GRAPHITE2_SYSTEM_FLAGS])[]dnl
 AC_REQUIRE([KPSE_TECKIT_SYSTEM_FLAGS])[]dnl
@@ -74,8 +73,8 @@ AC_REQUIRE([KPSE_HARFBUZZ_SYSTEM_FLAGS])[]dnl
 # KPSE_UTILS_PKGS()
 # -----------------
 # Define the list of utility sub-packages, i.e., subdirs 'utils/*'.
-AC_DEFUN([KPSE_UTILS_PKGS],
-[m4_define([kpse_utils_pkgs], [
+AC_DEFUN([KPSE_UTILS_PKGS], [dnl
+m4_define([kpse_utils_pkgs], [dnl
 biber
 m-tx
 pmx
@@ -93,8 +92,8 @@ xpdfopen
 # ----------------
 # Define the list of TeXk sub-packages, i.e., subdirs 'texk/*',
 # excluding 'texk/kpathsea'.
-AC_DEFUN([KPSE_TEXK_PKGS],
-[m4_define([kpse_texk_pkgs], [
+AC_DEFUN([KPSE_TEXK_PKGS], [dnl
+m4_define([kpse_texk_pkgs], [dnl
 web2c
 afm2pl
 bibtex-x
@@ -106,7 +105,7 @@ dtl
 dvi2tty
 dvidvi
 dviljk
-dvipdfmx
+dvipdfm-x
 dvipng
 dvipos
 dvipsk
@@ -123,9 +122,7 @@ tex4htk
 ttf2pk
 ttf2pk2
 ttfdump
-xdv2pdf
 xdvik
-xdvipdfmx
 texlive
 ])]) # KPSE_TEXK_PKGS
 
diff --git a/Build/source/m4/kpse-poppler-flags.m4 b/Build/source/m4/kpse-poppler-flags.m4
index c11d727f1d2..6345f9f3146 100644
--- a/Build/source/m4/kpse-poppler-flags.m4
+++ b/Build/source/m4/kpse-poppler-flags.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2011-2013 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holder
 # gives unlimited permission to copy and/or distribute it,
@@ -11,12 +11,12 @@
 #
 # Set the make variables POPPLER_INCLUDES and POPPLER_LIBS to the CPPFLAGS and
 # LIBS required for the `-lpoppler' library in libs/poppler/ of the TL tree.
-AC_DEFUN([KPSE_POPPLER_FLAGS],
-[AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
+AC_DEFUN([KPSE_POPPLER_FLAGS], [dnl
+AC_REQUIRE([KPSE_CHECK_WIN32])[]dnl
 _KPSE_LIB_FLAGS([poppler], [poppler], [],
-                [-IBLD/libs/poppler -IBLD/libs/poppler/goo -IBLD/libs/poppler/poppler],
+                [-IBLD/libs/poppler/include],
                 [BLD/libs/poppler/libpoppler.a], [],
-                [], [${top_builddir}/../../libs/poppler/poppler/Stream.h])[]dnl
+                [], [${top_builddir}/../../libs/poppler/include/Stream.h])[]dnl
 test "x$kpse_cv_have_win32" = xno || POPPLER_LIBS="$POPPLER_LIBS -lgdi32"
 ]) # KPSE_POPPLER_FLAGS
 
diff --git a/Build/source/m4/kpse-potrace-flags.m4 b/Build/source/m4/kpse-potrace-flags.m4
new file mode 100644
index 00000000000..f88936996d2
--- /dev/null
+++ b/Build/source/m4/kpse-potrace-flags.m4
@@ -0,0 +1,27 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holder
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# KPSE_POTRACE_FLAGS
+# ---------------
+# Provide the configure options '--with-system-potrace' (if in the TL tree),
+# '--with-potrace-includes', and '--with-potrace-libdir'.
+#
+# Set the make variables POTRACE_INCLUDES and POTRACE_LIBS to the CPPFLAGS and
+# LIBS required for the `-lpotrace' library in libs/potrace/ of the TL tree.
+AC_DEFUN([KPSE_POTRACE_FLAGS],
+[_KPSE_LIB_FLAGS([potrace], [potrace], [],
+                 [-IBLD/libs/potrace/include], [BLD/libs/potrace/libpotrace.a], [],
+                 [], [${top_builddir}/../../libs/potrace/include/potracelib.h])[]dnl
+]) # KPSE_POTRACE_FLAGS
+
+# KPSE_POTRACE_OPTIONS([WITH-SYSTEM])
+# --------------------------------
+AC_DEFUN([KPSE_POTRACE_OPTIONS], [_KPSE_LIB_OPTIONS([potrace], [$1])])
+
+# KPSE_POTRACE_SYSTEM_FLAGS
+# ----------------------
+AC_DEFUN([KPSE_POTRACE_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([potrace], [potrace])])
diff --git a/Build/source/m4/kpse-t1lib-flags.m4 b/Build/source/m4/kpse-t1lib-flags.m4
deleted file mode 100644
index 5e3a73e9552..00000000000
--- a/Build/source/m4/kpse-t1lib-flags.m4
+++ /dev/null
@@ -1,29 +0,0 @@
-# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
-#
-# This file is free software; the copyright holder
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 0
-
-# KPSE_T1LIB_FLAGS
-# ----------------
-# Provide the configure options '--with-system-t1lib' (if in the TL tree),
-# '--with-t1lib-includes', and '--with-t1lib-libdir'.
-#
-# Set the make variables T1LIB_INCLUDES and T1LIB_LIBS to the CPPFLAGS and
-# LIBS required for the `-lt1' library in libs/t1lib/ of the TL tree.
-AC_DEFUN([KPSE_T1LIB_FLAGS],
-[_KPSE_LIB_FLAGS([t1lib], [t1], [],
-                 [-IBLD/libs/t1lib], [BLD/libs/t1lib/libt1.a], [],
-                 [], [${top_builddir}/../../libs/t1lib/t1lib.h])[]dnl
-]) # KPSE_T1LIB_FLAGS
-
-# KPSE_T1LIB_OPTIONS([WITH-SYSTEM])
-# ---------------------------------
-AC_DEFUN([KPSE_T1LIB_OPTIONS], [_KPSE_LIB_OPTIONS([t1lib], [$1])])
-
-# KPSE_T1LIB_SYSTEM_FLAGS
-# -----------------------
-AC_DEFUN([KPSE_T1LIB_SYSTEM_FLAGS], [_KPSE_LIB_FLAGS_SYSTEM([t1lib], [t1])])
diff --git a/Build/source/m4/kpse-visibility.m4 b/Build/source/m4/kpse-visibility.m4
new file mode 100644
index 00000000000..740fc459a53
--- /dev/null
+++ b/Build/source/m4/kpse-visibility.m4
@@ -0,0 +1,74 @@
+# Public macros for the TeX Live (TL) tree.
+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
+#
+# This file is free software; the copyright holders
+# give unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# KPSE_COMPILER_VISIBILITY
+# ------------------------
+# Set up compiler flags for C and C++ to hide external symbols.
+# This macro determines and substitutes VISIBILITY_CFLAGS for the C compiler
+# and, if applicable, VISIBILITY_CXXFLAGS for the C++ compiler. To activate
+# them a Makefile.am must use them, e.g., in AM_CFLAGS or AM_CXXFLAGS.
+AC_DEFUN([KPSE_COMPILER_VISIBILITY],
+[dnl arrange that AC_PROG_CC uses _KPSE_VISIBILITY_CFLAGS etc.
+AC_PROVIDE_IFELSE([AC_PROG_CC],
+                  [_KPSE_VISIBILITY_CFLAGS],
+                  [m4_define([AC_PROG_CC],
+                             m4_defn([AC_PROG_CC])[_KPSE_VISIBILITY_CFLAGS
+])])
+AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [_KPSE_VISIBILITY_CXXFLAGS],
+                  [m4_define([AC_PROG_CXX],
+                             m4_defn([AC_PROG_CXX])[_KPSE_VISIBILITY_CXXFLAGS
+])])
+]) # KPSE_COMPILER_VISIBILITY
+
+_KPSE_VISIBILITY_CFLAGS
+# ---------------------
+# Internal subroutine.
+# Set up compiler flags for C to hide external symbols.
+AC_DEFUN([_KPSE_VISIBILITY_CFLAGS], [dnl
+AC_REQUIRE([AC_PROG_CC])[]dnl
+_KPSE_VISIBILITY_FLAGS([C], [cflags])
+m4_define([_KPSE_VISIBILITY_CFLAGS], [])[]dnl
+]) # _KPSE_VISIBILITY_CFLAGS
+
+_KPSE_VISIBILITY_CXXFLAGS
+# -----------------------
+# Internal subroutine.
+# Set up compiler flags for C++ to hide external symbols.
+AC_DEFUN([_KPSE_VISIBILITY_CXXFLAGS], [dnl
+AC_REQUIRE([AC_PROG_CXX])[]dnl
+_KPSE_VISIBILITY_FLAGS([C++], [cxxflags])
+m4_define([_KPSE_VISIBILITY_CXXFLAGS], [])[]dnl
+]) # _KPSE_VISIBILITY_CFLAGS
+
+_KPSE_VISIBILITY_FLAGS(LANG, TAG)
+# -------------------------------
+# Internal subroutine.
+# Set up compiler flags for C or C++ to hide external symbols.
+m4_define([_KPSE_VISIBILITY_FLAGS], [dnl
+AC_CACHE_CHECK(AS_TR_CPP($2) [for $1 to hide external symbols],
+               [kpse_cv_visibility_$2],
+               [dnl
+AC_LANG_PUSH([$1])
+kpse_cv_visibility_$2=unknown
+kpse_save_flags=$AS_TR_CPP($2)
+AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <stdio.h>
+                                   extern void foo(void);
+                                   void foo(void){printf("foo\n");}]])])
+# FIXME: Add tests for non-GNU compilers
+for kpse_flag in '-fvisibility=hidden'; do
+  AS_TR_CPP($2)="$kpse_save_flags $kpse_flag"
+  AC_COMPILE_IFELSE([], [kpse_cv_visibility_$2=$kpse_flag; break])
+done
+AC_LANG_POP([$1])
+])
+AS_TR_CPP($2)=$kpse_save_flags
+AS_CASE([$kpse_cv_visibility_$2],
+        [unknown], [],
+        [AC_SUBST([VISIBILITY_]AS_TR_CPP($2), [$kpse_cv_visibility_$2])])
+]) # _KPSE_VISIBILITY_FLAGS
+
diff --git a/Build/source/m4/kpse-warnings.m4 b/Build/source/m4/kpse-warnings.m4
index 34c52844551..782674ef786 100644
--- a/Build/source/m4/kpse-warnings.m4
+++ b/Build/source/m4/kpse-warnings.m4
@@ -1,5 +1,5 @@
 # Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holders
 # give unlimited permission to copy and/or distribute it,
@@ -7,7 +7,7 @@
 
 # KPSE_COMPILER_WARNINGS
 # ----------------------
-# Set up compiler warnings for C and C++.
+# Set up compiler warnings for (Objective) C and (Objective) C++.
 # This macro determines and substitutes WARNING_CFLAGS for the C compiler
 # and, if applicable, WARNING_CXXFLAGS for the C++ compiler. To activate
 # them a Makefile.am must use them, e.g., in AM_CFLAGS or AM_CXXFLAGS.
diff --git a/Build/source/tardate.ac b/Build/source/tardate.ac
index d53f58473a3..3d9f4eac269 100644
--- a/Build/source/tardate.ac
+++ b/Build/source/tardate.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live tarball version
-m4_define([tex_live_tardate], [2013-03-01])
+m4_define([tex_live_tardate], [2013-06-24])
diff --git a/Build/source/texk/kpathsea/win32lib.h.mugica b/Build/source/texk/kpathsea/win32lib.h.mugica
deleted file mode 100644
index 5578aed8770..00000000000
--- a/Build/source/texk/kpathsea/win32lib.h.mugica
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Public domain.  */
-
-#ifndef _WIN32LIB_H_
-#define _WIN32LIB_H_
-
-#include <io.h>
-#include <fcntl.h>
-#include <direct.h>
-
-#if !__STDC__
-#if _MSC_VER>=1200
-   #pragma warning(push)
-#endif
-#pragma warning(disable: 4668)
-#pragma warning(disable: 4255)
-
-#define boolean donotuse_boolean
-#include <windows.h>    /* Somewhere here WIN32 gets defined */
-#undef boolean
-
-#if _MSC_VER>=1200
-   #pragma warning(pop)
-#else
-   #pragma warning(default: 4668)
-   #pragma warning(default: 4255)
-#endif
-
-#else /*__STDC__*/
-/* non-ansi definitions for an ANSI compliation with /Fa */
-#define WIN32
-#define off_t _off_t
-#define putenv _putenv
-#define getcwd _getcwd
-#define getcw _getcw
-#define putenv _putenv
-#define strdup _strdup
-#define vsnprintf _vsnprintf
-#define fileno _fileno
-#define strlwr _strlwr
-#define isascii __isascii
-#define mkdir _mkdir
-#define stat _stat
-#define stricmp _stricmp
-#define MAX_PATH _MAX_PATH
-#define S_IFREG _S_IFREG
-#define S_IFMT _S_IFMT
-
-#endif /*__STDC__*/
-
-/*This is not defined even if !__STDC__*/
-#define snprintf _snprintf
-
-/* The POSIX names are different */
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-
-#endif
diff --git a/Build/source/version.ac b/Build/source/version.ac
index 6b908963880..f6ff421d8bb 100644
--- a/Build/source/version.ac
+++ b/Build/source/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current TeX Live version
-m4_define([tex_live_version], [2013])
+m4_define([tex_live_version], [2014/dev])