chktex 1.7.2

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

53 files changed, 510 insertions, 1546 deletions

diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog
index 847f6de7362..b22459b702d 100644
--- a/Build/source/texk/chktex/ChangeLog
+++ b/Build/source/texk/chktex/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import chktex-1.7.2.
+	version.ac, chktex.test: Adapted.
+
 2013-02-08  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am (configdir, pdfdocdir, scriptsdir):
diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in
index f4952e564fa..0d01cd174d9 100644
--- a/Build/source/texk/chktex/Makefile.in
+++ b/Build/source/texk/chktex/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.1 from Makefile.am.
+# Makefile.in generated by automake 1.14 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,
@@ -17,23 +17,51 @@
 
 
 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; \
-    test $$am__dry = yes; \
-  }
+  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; \
+  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@
@@ -60,13 +88,15 @@ bin_PROGRAMS = chktex$(EXEEXT)
 DIST_COMMON = $(srcdir)/../../texk/am/script_links.am \
 	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(top_srcdir)/chktex-1.7.1/deweb.in \
+	$(srcdir)/config.h.in $(top_srcdir)/chktex-1.7.2/deweb.in \
 	$(top_srcdir)/../../build-aux/depcomp $(dist_pdfdoc_DATA) \
 	$(top_srcdir)/../../build-aux/test-driver ChangeLog \
-	../../build-aux/config.guess ../../build-aux/config.sub \
-	../../build-aux/depcomp ../../build-aux/install-sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ../../build-aux/ltmain.sh \
+	../../build-aux/compile ../../build-aux/config.guess \
+	../../build-aux/config.sub ../../build-aux/depcomp \
+	../../build-aux/install-sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap \
+	../../build-aux/ltmain.sh \
+	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/config.guess \
 	$(top_srcdir)/../../build-aux/config.sub \
 	$(top_srcdir)/../../build-aux/install-sh \
@@ -623,8 +653,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -636,7 +666,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-deweb.pl: $(top_builddir)/config.status $(top_srcdir)/chktex-1.7.1/deweb.in
+deweb.pl: $(top_builddir)/config.status $(top_srcdir)/chktex-1.7.2/deweb.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -717,6 +747,7 @@ regex/regex_internal.$(OBJEXT): regex/$(am__dirstamp) \
 	regex/$(DEPDIR)/$(am__dirstamp)
 regex/regexec.$(OBJEXT): regex/$(am__dirstamp) \
 	regex/$(DEPDIR)/$(am__dirstamp)
+
 chktex$(EXEEXT): $(chktex_OBJECTS) $(chktex_DEPENDENCIES) $(EXTRA_chktex_DEPENDENCIES) 
 	@rm -f chktex$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(chktex_OBJECTS) $(chktex_LDADD) $(LIBS)
@@ -1030,7 +1061,7 @@ distclean-tags:
 	$(MAKE) $(AM_MAKEFLAGS) $<
 
 # Leading 'am--fnord' is there to ensure the list of targets does not
-# exand to empty, as could happen e.g. with make check TESTS=''.
+# expand to empty, as could happen e.g. with make check TESTS=''.
 am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
 am--force-recheck:
 	@:
@@ -1236,10 +1267,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
diff --git a/Build/source/texk/chktex/aclocal.m4 b/Build/source/texk/chktex/aclocal.m4
index ef3e5a8a49e..c55e4d52d15 100644
--- a/Build/source/texk/chktex/aclocal.m4
+++ b/Build/source/texk/chktex/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- 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,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.14'
 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.14], [],
       [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.14])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
@@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -752,6 +798,70 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
@@ -961,76 +1071,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/texk/chktex/chktex-1.7.1-PATCHES/TL-Changes b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/TL-Changes
deleted file mode 100644
index 57b92396f19..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/TL-Changes
+++ /dev/null
@@ -1,13 +0,0 @@
-Changes applied to the chktex-1.7.1 tree as obtained from:
-	http://mirror.ctan.org/support/chktex/chktex-1.7.1.tar.gz
-	http://download.savannah.gnu.org/releases/chktex/chktex-1.7.1.tar.gz
-
-Remove:
-	config.h.in
-	configure
-	install-sh
-	stamp-h.in
-
-Rename:
-	chkweb -> chkweb.sh
-
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-07-kpathsea b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-07-kpathsea
deleted file mode 100644
index bbe955aaf09..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-07-kpathsea
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur chktex-1.7.1.orig/ChkTeX.c chktex-1.7.1/ChkTeX.c
---- chktex-1.7.1.orig/ChkTeX.c	2012-07-26 12:44:22.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.c	2012-10-10 11:34:16.000000000 +0200
-@@ -27,8 +27,12 @@
-  */
- 
- 
--#include "getopt.h"
- #include "ChkTeX.h"
-+#ifdef KPATHSEA
-+#include <kpathsea/getopt.h>
-+#else
-+#include <getopt.h>
-+#endif
- #include "OpSys.h"
- #include "Utility.h"
- #include "FindErrs.h"
-diff -ur chktex-1.7.1.orig/ChkTeX.h chktex-1.7.1/ChkTeX.h
---- chktex-1.7.1.orig/ChkTeX.h	2012-08-04 21:28:49.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.h	2012-10-10 11:32:49.000000000 +0200
-@@ -38,6 +38,10 @@
- #  include CONFIG_H_NAME
- #endif
- 
-+#ifdef KPATHSEA
-+#include <kpathsea/config.h>
-+#endif
-+
- #include <ctype.h>
- #include <math.h>
- #include <stdio.h>
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-08-stpcpy b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-08-stpcpy
deleted file mode 100644
index bb4904e9411..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-08-stpcpy
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur chktex-1.7.1.orig/FindErrs.c chktex-1.7.1/FindErrs.c
---- chktex-1.7.1.orig/FindErrs.c	2012-08-08 22:27:57.000000000 +0200
-+++ chktex-1.7.1/FindErrs.c	2012-10-10 11:24:26.000000000 +0200
-@@ -33,6 +33,14 @@
- #include "Utility.h"
- #include "Resource.h"
- 
-+#if !(defined HAVE_DECL_STPCPY && HAVE_DECL_STPCPY)
-+static inline char *
-+stpcpy(char *dest, const char *src)
-+{
-+    return strcpy(dest, src) + strlen(src);
-+}
-+#endif
-+
- #if HAVE_PCRE || HAVE_POSIX_ERE
- 
- #if HAVE_PCRE
-diff -ur chktex-1.7.1.orig/configure.in chktex-1.7.1/configure.in
---- chktex-1.7.1.orig/configure.in	2012-08-22 16:27:32.000000000 +0200
-+++ chktex-1.7.1/configure.in	2012-10-10 11:24:37.000000000 +0200
-@@ -164,6 +164,8 @@
- AC_CHECK_FUNCS(access closedir fileno isatty opendir readdir stat dnl
- strcasecmp strdup strlwr strtol)
- 
-+dnl Checks for declarations.
-+AC_CHECK_DECLS([stpcpy])
- 
- dnl Check for PCRE regular expression support
- AC_MSG_CHECKING(whether PCRE regular expressions are enabled)
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-09-test-output b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-09-test-output
deleted file mode 100644
index 8206114742c..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-09-test-output
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur chktex-1.7.1.orig/Test.out chktex-1.7.1/Test.out
---- chktex-1.7.1.orig/Test.out	2012-08-09 17:11:32.000000000 +0200
-+++ chktex-1.7.1/Test.out	2012-09-27 10:56:14.000000000 +0200
-@@ -418,9 +418,9 @@
- Message 22 in Test.tex: Comment displayed.
- % Warning 44 -- user regex -- default message  
- ^
--Message 44 in Test.tex: User Regex: intro.
-+Message 44 in Test.tex: User Regex:  intro..
- You should always write a good intro.  
--                               ^^^^^
-+                              ^^^^^^^
- Message 22 in Test.tex: Comment displayed.
- % Warning 44 -- user regex -- user message  
- ^
-@@ -457,9 +457,9 @@
- Message 36 in Test.tex: You should put a space after parenthesis.
- Here(on this line only)is a warning $sin(x)$ suppressed. % CHKTEX 35 36  
-                        ^
--Message 44 in Test.tex: User Regex: -1:Capitalize before references.
-+Message 44 in Test.tex: User Regex: 1:Capitalize before references.
- In section~\ref{sec:3} we have a warning.  
--   ^^^^^^^^^^^^
-+  ^^^^^^^^^^^^^
- Message 22 in Test.tex: Comment displayed.
- In section~\ref{sec:4} it is suppressed. % chktex -1  
-                                          ^
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-10-semicolon b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-10-semicolon
deleted file mode 100644
index dd0adeabef3..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-10-semicolon
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -ur chktex-1.7.1.orig/ChkTeX.c chktex-1.7.1/ChkTeX.c
---- chktex-1.7.1.orig/ChkTeX.c	2012-10-10 11:34:16.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.c	2012-10-21 14:42:07.000000000 +0200
-@@ -195,7 +195,7 @@
- 
- char VerbNormal[] = "%k %n in %f line %l: %m\n" "%r%s%t\n" "%u\n";
- 
--#define DEF(type, name, value)  type name = value;
-+#define DEF(type, name, value)  type name = value
- OPTION_DEFAULTS;
- STATE_VARS;
- #undef DEF
-@@ -426,7 +426,7 @@
-                     for (Count = 0; Count < NUMBRACKETS; Count++)
-                         Brackets[Count] = 0L;
- 
--#define DEF(type, name, value) name = value;
-+#define DEF(type, name, value) name = value
-                     STATE_VARS;
- #undef DEF
-                     if (UsingStdIn)
-@@ -687,7 +687,7 @@
- static void ResetSettings(void)
- {
- 
--#define DEF(type, name, value)  name = value;
-+#define DEF(type, name, value)  name = value
-     OPTION_DEFAULTS;
- #undef DEF
-     if (OutputFile != stdout)
-@@ -855,11 +855,13 @@
-                 nextc = ShiftArg(&optarg);
-                 break;
- 
--            LOOP(warntype, case 'w':
--            ErrType = etWarn; InUse = iuOK; LAST(warntype); case 'e':
--            ErrType = etErr; InUse = iuOK; LAST(warntype); case 'm':
--            ErrType = etMsg; InUse = iuOK; LAST(warntype); case 'n':
--            ErrType = etMsg; InUse = iuNotUser; LAST(warntype);) if (isdigit((unsigned char)*optarg))
-+            LOOP(warntype,
-+            case 'w': ErrType = etWarn; InUse = iuOK; LAST(warntype);
-+            case 'e': ErrType = etErr; InUse = iuOK; LAST(warntype);
-+            case 'm': ErrType = etMsg; InUse = iuOK; LAST(warntype);
-+            case 'n': ErrType = etMsg; InUse = iuNotUser; LAST(warntype);
-+                ) 
-+                if (isdigit((unsigned char)*optarg))
-                 {
-                     nextc = ParseNumArg(&Err, -1, &optarg);
-                     if (betw(emMinFault, Err, emMaxFault))
-diff -ur chktex-1.7.1.orig/ChkTeX.h chktex-1.7.1/ChkTeX.h
---- chktex-1.7.1.orig/ChkTeX.h	2012-10-10 11:32:49.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.h	2012-10-21 14:33:01.000000000 +0200
-@@ -286,38 +286,39 @@
- extern FILE *OutputFile, *InputFile;
- 
- #define OPTION_DEFAULTS \
--  DEF(int, GlobalRC,    TRUE) \
--  DEF(int, WipeVerb,    TRUE) \
--  DEF(int, BackupOut,   TRUE) \
--  DEF(int, Quiet,       FALSE) \
--  DEF(int, LicenseOnly, FALSE) \
--  DEF(int, UsingStdIn,  FALSE) \
--  DEF(int, InputFiles,  TRUE) \
--  DEF(int, HeadErrOut,  TRUE) \
--  DEF(const char *, OutputName, "") \
--  DEF(const char *, PseudoInName, NULL) \
--  DEF(char *, OutputFormat, VerbNormal) \
--  DEF(char *, PipeOutputFormat, NULL) \
--  DEF(const char *, Delimit, ":") \
--  DEF(long,  DebugLevel, 0) \
-+  DEF(int, GlobalRC,    TRUE); \
-+  DEF(int, WipeVerb,    TRUE); \
-+  DEF(int, BackupOut,   TRUE); \
-+  DEF(int, Quiet,       FALSE); \
-+  DEF(int, LicenseOnly, FALSE); \
-+  DEF(int, UsingStdIn,  FALSE); \
-+  DEF(int, InputFiles,  TRUE); \
-+  DEF(int, HeadErrOut,  TRUE); \
-+  DEF(const char *, OutputName, ""); \
-+  DEF(const char *, PseudoInName, NULL); \
-+  DEF(char *, OutputFormat, VerbNormal); \
-+  DEF(char *, PipeOutputFormat, NULL); \
-+  DEF(const char *, Delimit, ":"); \
-+  DEF(long,  DebugLevel, 0); \
-   DEF(int,  NoLineSupp, FALSE)
- 
- #define STATE_VARS \
--  DEF(enum ItState, ItState, itOff) /* Are we doing italics? */ \
--  DEF(int, AtLetter, FALSE) /* Whether `@' is a letter or not. */ \
--  DEF(int, InHeader, TRUE)  /* Whether we're in the header */ \
--  DEF(int, VerbMode, FALSE) /* Whether we're in complete ignore-mode */ \
--  DEF(long, MathMode, 0)    /* Whether we're in math mode or not */ \
--  DEF(const char *, VerbStr, "")     /* String we'll terminate verbmode upon */ \
--  DEF(unsigned long, ErrPrint, 0)    /* # errors printed */ \
--  DEF(unsigned long, WarnPrint, 0)   /* # warnings printed */ \
--  DEF(unsigned long, UserSupp, 0)    /* # user suppressed warnings */ \
--  DEF(unsigned long, LineSupp, 0)    /* # warnings suppressed on a single line */ \
--  DEF(unsigned long long, FileSuppressions, 0)     /* # warnings suppressed in a file */ \
--  DEF(unsigned long long, UserFileSuppressions, 0) /* # User warnings suppressed in a file */
-+  DEF(enum ItState, ItState, itOff); /* Are we doing italics? */ \
-+  DEF(int, AtLetter, FALSE); /* Whether `@' is a letter or not. */ \
-+  DEF(int, InHeader, TRUE);  /* Whether we're in the header */ \
-+  DEF(int, VerbMode, FALSE); /* Whether we're in complete ignore-mode */ \
-+  DEF(long, MathMode, 0);    /* Whether we're in math mode or not */ \
-+  DEF(const char *, VerbStr, "");     /* String we'll terminate verbmode upon */ \
-+  DEF(unsigned long, ErrPrint, 0);    /* # errors printed */ \
-+  DEF(unsigned long, WarnPrint, 0);   /* # warnings printed */ \
-+  DEF(unsigned long, UserSupp, 0);    /* # user suppressed warnings */ \
-+  DEF(unsigned long, LineSupp, 0);    /* # warnings suppressed on a single line */ \
-+  DEF(unsigned long long, FileSuppressions, 0);     /* # warnings suppressed in a file */ \
-+  DEF(unsigned long long, UserFileSuppressions, 0); /* # User warnings suppressed in a file */
- 
--#define DEF(type, name, value) extern type name;
--OPTION_DEFAULTS STATE_VARS
-+#define DEF(type, name, value) extern type name
-+OPTION_DEFAULTS;
-+STATE_VARS;
- #undef DEF
- extern struct Stack CharStack, InputStack, EnvStack;
- 
-diff -ur chktex-1.7.1.orig/Resource.c chktex-1.7.1/Resource.c
---- chktex-1.7.1.orig/Resource.c	2012-04-23 22:22:26.000000000 +0200
-+++ chktex-1.7.1/Resource.c	2012-10-21 14:45:14.000000000 +0200
-@@ -75,7 +75,7 @@
-   BIT(Equal),    /* = */ \
-   BIT(Word),     /* Keyword */ \
-   BIT(Item)      /* List item */ \
--};
-+}
- 
- #undef BIT
- #define BIT BITDEF1
-@@ -323,7 +323,7 @@
- 
- #define DONEKEY (FLG_Open | FLG_Equal | FLG_BrOpen)
- #define DONELIST (FLG_Close | FLG_BrClose)
--#define TOKEN(c, ctxt, tk) case c: if(Expect & (ctxt)) Retval = tk; LAST(token);
-+#define TOKEN(c, ctxt, tk) case c: if(Expect & (ctxt)) Retval = tk; LAST(token)
- 
-                     LOOP(token,
-                          TOKEN('{', DONEKEY, FLG_Open);
-@@ -331,7 +331,7 @@
-                          TOKEN('=', DONEKEY, FLG_Equal);
-                          TOKEN(']', DONELIST, FLG_BrClose);
-                          TOKEN('}', DONELIST, FLG_Close);
--                        );
-+                        )
-                     if (Retval != FLG_Eof)
-                     {
-                         OnceMore = FALSE;
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-11-TL b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-11-TL
deleted file mode 100644
index 6ef6b935ae4..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-11-TL
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -ur chktex-1.7.1.orig/ChkTeX.c chktex-1.7.1/ChkTeX.c
---- chktex-1.7.1.orig/ChkTeX.c	2012-10-21 14:42:07.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.c	2012-10-21 16:00:08.000000000 +0200
-@@ -334,7 +334,15 @@
- #endif
- 
-     OutputFile = stdout;
-+#ifdef KPATHSEA
-+    kpse_set_program_name(argv[0], "chktex");
-+    PrgName = kpse_program_name;
-+#ifdef WIN32
-+    setmode(fileno(stdout), _O_BINARY);
-+#endif
-+#else
-     PrgName = argv[0];
-+#endif
- 
- #undef KEY
- #undef LCASE
-@@ -512,7 +520,11 @@
- 
-         if (Success)
-         {
-+#ifdef KPATHSEA
-+            if (!(OutputFile = fopen(OutputName, "wb")))
-+#else
-             if (!(OutputFile = fopen(OutputName, "w")))
-+#endif
-             {
-                 PrintPrgErr(pmOutOpen);
-                 Success = FALSE;
-diff -ur chktex-1.7.1.orig/OpSys.c chktex-1.7.1/OpSys.c
---- chktex-1.7.1.orig/OpSys.c	2010-12-18 22:12:10.000000000 +0100
-+++ chktex-1.7.1/OpSys.c	2012-10-21 15:56:54.000000000 +0200
-@@ -37,6 +37,10 @@
- #include "OpSys.h"
- #include "Utility.h"
- 
-+#ifdef KPATHSEA
-+#include <kpathsea/variable.h>
-+#endif
-+
- #ifdef HAVE_SYS_STAT_H
- #  include <sys/stat.h>
- #endif
-@@ -105,6 +109,8 @@
- 
- #ifdef __MSDOS__
- #  define LOCALRCFILE             RCBASENAME
-+#elif defined(WIN32)
-+#  define LOCALRCFILE             RCBASENAME
- #else
- #  define LOCALRCFILE             "." RCBASENAME
- #endif
-@@ -173,6 +179,8 @@
- #ifdef __MSDOS__
- 
-             if ((Env = getenv("CHKTEXRC")) || (Env = getenv("CHKTEX_HOME")))
-+#elif defined(TEX_LIVE)
-+            if ((Env = kpse_var_value("CHKTEXRC")))
- #else
- 
-             if ((Env = getenv("CHKTEXRC")))
-@@ -181,6 +189,9 @@
-             {
-                 strcpy(ConfigFile, Env);
-                 tackon(ConfigFile, LOCALRCFILE);
-+#ifdef TEX_LIVE
-+                free(Env);
-+#endif
-             }
-             else
- #ifdef __MSDOS__
-@@ -217,24 +228,20 @@
-             break;
-         case liSysDir:         /* System dir for resource files */
- #ifdef TEX_LIVE
--            if ((Env = getenv("CHKTEX_CONFIG")))
-+            if ((Env = kpse_var_value("CHKTEX_CONFIG")))
-             {
-                 strcpy(ConfigFile, Env);
-+                free(Env);
-             }
--            else
-+            else if ((Env = kpse_var_value("TEXMFMAIN")))
-             {
--                FILE *f;
--                *ConfigFile = 0;
--                if ((f = popen("kpsewhich -expand-var='$TEXMFMAIN'", "r")))
--                {
--                    if (1 == fscanf(f, "%1024s", ConfigFile))
--                    {
--                        tackon(ConfigFile, "chktex");
--                        tackon(ConfigFile, RCBASENAME);
--                    }
--                    (void)pclose(f);
--                }
-+                strcpy(ConfigFile, Env);
-+                tackon(ConfigFile, "chktex");
-+                tackon(ConfigFile, RCBASENAME);
-+                free(Env);
-             }
-+            else
-+                *ConfigFile = 0;
- #else /* TEX_LIVE */
- #if defined(__unix__) || defined(__MSDOS__)
-             strcpy(ConfigFile, SYSCONFDIR);
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-12-uint64_t b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-12-uint64_t
deleted file mode 100644
index 298ec44dfee..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-12-uint64_t
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -ur chktex-1.7.1.orig/ChkTeX.h chktex-1.7.1/ChkTeX.h
---- chktex-1.7.1.orig/ChkTeX.h	2012-10-21 14:33:01.000000000 +0200
-+++ chktex-1.7.1/ChkTeX.h	2012-10-22 10:26:21.000000000 +0200
-@@ -72,6 +72,14 @@
- #  include <strings.h>
- #endif
- 
-+#ifdef HAVE_INTTYPES_H
-+#  include <inttypes.h>
-+#endif
-+
-+#ifdef HAVE_STDINT_H
-+#  include <stdint.h>
-+#endif
-+
- #include "types.h"
- 
- #ifndef LONG_MAX
-@@ -313,8 +321,8 @@
-   DEF(unsigned long, WarnPrint, 0);   /* # warnings printed */ \
-   DEF(unsigned long, UserSupp, 0);    /* # user suppressed warnings */ \
-   DEF(unsigned long, LineSupp, 0);    /* # warnings suppressed on a single line */ \
--  DEF(unsigned long long, FileSuppressions, 0);     /* # warnings suppressed in a file */ \
--  DEF(unsigned long long, UserFileSuppressions, 0); /* # User warnings suppressed in a file */
-+  DEF(uint64_t, FileSuppressions, 0);     /* # warnings suppressed in a file */ \
-+  DEF(uint64_t, UserFileSuppressions, 0); /* # User warnings suppressed in a file */
- 
- #define DEF(type, name, value) extern type name
- OPTION_DEFAULTS;
-diff -ur chktex-1.7.1.orig/FindErrs.c chktex-1.7.1/FindErrs.c
---- chktex-1.7.1.orig/FindErrs.c	2012-10-10 11:24:26.000000000 +0200
-+++ chktex-1.7.1/FindErrs.c	2012-10-22 10:34:58.000000000 +0200
-@@ -75,7 +75,7 @@
-    return(func(c)); \
- }
- 
--#define SUPPRESSED_ON_LINE(c)  (LineSuppressions & (1LL<<c))
-+#define SUPPRESSED_ON_LINE(c)  (LineSuppressions & ((uint64_t)1<<c))
- 
- #define INUSE(c) \
-     ((LaTeXMsgs[(enum ErrNum) c].InUse == iuOK) && !SUPPRESSED_ON_LINE(c))
-@@ -146,12 +146,12 @@
- /*
-  * A bit field used to hold the suppressions for the current line.
-  */
--static unsigned long long LineSuppressions;
-+static uint64_t LineSuppressions;
- /*
-  * A bit field used to hold the suppressions of numbered user warnings
-  * for the current line.
-  */
--static unsigned long long UserLineSuppressions;
-+static uint64_t UserLineSuppressions;
- 
- static unsigned long Line;
- 
-@@ -344,7 +344,7 @@
-             if (!NoLineSupp)
-             {
-                 int error;
--                const int MaxSuppressionBits = sizeof(unsigned long long)*8-1;
-+                const int MaxSuppressionBits = 63;
- 
-                 /* Convert to lowercase to compare with LineSuppDelim */
-                 EscapePtr = ++TmpPtr; /* move past NUL terminator */
-@@ -365,13 +365,13 @@
-                     }
-                     if (error > 0)
-                     {
--                        FileSuppressions |= (1LL << error);
--                        LineSuppressions |= (1LL << error);
-+                        FileSuppressions |= ((uint64_t)1 << error);
-+                        LineSuppressions |= ((uint64_t)1 << error);
-                     }
-                     else
-                     {
--                        UserFileSuppressions |= (1LL << (-error));
--                        UserLineSuppressions |= (1LL << (-error));
-+                        UserFileSuppressions |= ((uint64_t)1 << (-error));
-+                        UserLineSuppressions |= ((uint64_t)1 << (-error));
-                     }
-                 }
-                 TmpPtr = EscapePtr;
-@@ -388,11 +388,11 @@
- 
-                     if (error > 0)
-                     {
--                        LineSuppressions |= (1LL << error);
-+                        LineSuppressions |= ((uint64_t)1 << error);
-                     }
-                     else
-                     {
--                        UserLineSuppressions |= (1LL << (-error));
-+                        UserLineSuppressions |= ((uint64_t)1 << (-error));
-                     }
-                 }
-             }
-@@ -882,11 +882,11 @@
-             while (offset < len)
-             {
-                 /* Check if this warning should be suppressed. */
--                if (UserLineSuppressions != 0LL && NamedWarning)
-+                if (UserLineSuppressions && NamedWarning)
-                 {
-                     /* The warning can be named with positive or negative numbers. */
-                     int UserWarningNumber = abs(atoi(ErrMessage));
--                    if (UserLineSuppressions & (1LL << UserWarningNumber))
-+                    if (UserLineSuppressions & ((uint64_t)1 << UserWarningNumber))
-                     {
-                         break;
-                     }
-diff -ur chktex-1.7.1.orig/configure.in chktex-1.7.1/configure.in
---- chktex-1.7.1.orig/configure.in	2012-10-10 11:24:37.000000000 +0200
-+++ chktex-1.7.1/configure.in	2012-10-22 10:24:01.000000000 +0200
-@@ -158,6 +158,7 @@
- AC_C_CONST
- AC_C_INLINE
- AC_TYPE_SIZE_T
-+AC_TYPE_UINT64_T
- 
- dnl Checks for library functions.
- AC_FUNC_VPRINTF
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char
deleted file mode 100644
index fac30b29996..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-13-char
+++ /dev/null
@@ -1,60 +0,0 @@
-	Modify a function parameter and a few local variables
-	int => char in order to avois MSVC warnings.
-
-	Replace 'char const' => 'const char'.
-
-diff -ur chktex-1.7.1.orig/FindErrs.c chktex-1.7.1/FindErrs.c
---- chktex-1.7.1.orig/FindErrs.c	2012-10-22 10:34:58.000000000 +0200
-+++ chktex-1.7.1/FindErrs.c	2012-10-23 17:58:04.000000000 +0200
-@@ -1027,11 +1027,11 @@
-  *
-  */
- 
--static void HandleBracket(int Char)
-+static void HandleBracket(char Char)
- {
-     unsigned long BrOffset;     /* Offset into BrOrder array */
-     struct ErrInfo *ei;
--    int TmpC, Match;
-+    char TmpC, Match;
-     char ABuf[2], BBuf[2];
-     char *TmpPtr;
- 
-@@ -1235,7 +1235,7 @@
-     char *TmpPtr;               /* Temporary pointer */
-     char *ErrPtr;               /* Ptr to where an error started */
- 
--    int TmpC,                   /* Just a temp var used throughout the proc. */
-+    char TmpC,                  /* Just a temp var used throughout the proc. */
-       MatchC, Char;             /* Char. currently processed */
-     unsigned long CmdLen;       /* Length of misc. things */
-     int MixingQuotes;
-@@ -1505,11 +1505,7 @@
-                 HERE(1, emUseQuoteLiga);
-                 break;
- 
--                /* One of these are unnecessary, but what the heck... */
--            case 180:          /* ´. NOTE: '\xb4' gets converted to - something */
--            case ~(0xff & (~180)):     /* This yields 0xff...fb4 in */
--                /* arbitrary precision. */
--
-+            case '\264':          /* '´' */
-                 HERE(1, emUseOtherQuote);
-                 break;
- 
-diff -ur chktex-1.7.1.orig/Utility.h chktex-1.7.1/Utility.h
---- chktex-1.7.1.orig/Utility.h	2012-08-04 18:40:33.000000000 +0200
-+++ chktex-1.7.1/Utility.h	2012-10-22 20:53:20.000000000 +0200
-@@ -150,9 +150,9 @@
- struct ErrInfo *PopErr(struct Stack *Stack);
- struct ErrInfo *TopMatch(struct Stack *Stack, char *String);
- 
--long BrackIndex(char const c);
--void AddBracket(char const c);
--char MatchBracket(char const);
-+long BrackIndex(const char c);
-+void AddBracket(const char c);
-+char MatchBracket(const char c);
- 
- 
- 
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-14-finderrs b/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-14-finderrs
deleted file mode 100644
index 16ba4c47b5e..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/patch-14-finderrs
+++ /dev/null
@@ -1,11 +0,0 @@
---- FindErrs.c	(revision 242)
-+++ FindErrs.c	(working copy)
-@@ -918,7 +918,7 @@
-                         /* Default -- show the match */
-                         PSERR2(offset + MATCH.rm_so, MATCH.rm_eo - MATCH.rm_so,
-                                emUserWarnRegex,
--                               MATCH.rm_eo - MATCH.rm_so,
-+                               (int)(MATCH.rm_eo - MATCH.rm_so),
-                                TmpBuffer + offset + MATCH.rm_so);
-                     }
-                     offset += MATCH.rm_eo;
diff --git a/Build/source/texk/chktex/chktex-1.7.1/Makefile.in b/Build/source/texk/chktex/chktex-1.7.1/Makefile.in
deleted file mode 100644
index ee8dda3eead..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1/Makefile.in
+++ /dev/null
@@ -1,322 +0,0 @@
-#
-#  Makefile for ChkTeX project, creates the stuff.
-#  Copyright (C) 1996 Jens T. Berger Thielemann
-#
-#  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 of the License, 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, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-#  Contact the author at:
-#		Jens Berger
-#		Spektrumvn. 4
-#		N-0666 Oslo
-#		Norway
-#		E-mail: <jensthi@ifi.uio.no>
-#
-
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-datarootdir=@datarootdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-srcdir=@srcdir@
-mandir=@mandir@
-INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
-INSTALL_DATA=@INSTALL_DATA@
-MKDIR_P=@MKDIR_P@
-ELISPDIR=@ELISPDIR@
-CLEAN=@CLEAN@
-
-CC=@CC@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I$(srcdir) -I. $(DEFS) $(USRDEFS)
-DEFS=@DEFS@
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@
-LN_S=@LN_S@
-LATEX=@LATEX@
-DVIPS=@DVIPS@
-PS2PDF=ps2pdf
-PERL5=@PERL5@
-LATEX2HTML=@LATEX2HTML@
-LYNX=@LYNX@
-GROFF=@GROFF@
-SHELL=/bin/sh
-
-BUILT_SCRIPTS=@BUILT_SCRIPTS@
-SCRIPTS=@SCRIPTS@
-
-USRDEFS=-DSYSCONFDIR=\"$(sysconfdir)\" -D__unix__
-
-VPATH=$(srcdir)
-
-#####################################################################
-
-EXTRA_DIST=configure.in Makefile.in stamp-h.in config.h.in rmeheader.in \
-	MakeHTML.pl ChkTeX.tex.in aclocal.m4 NEWS \
-	chktex.el chkweb deweb.in COPYING chktex.1 chkweb.1 deweb.1 \
-	Test.tex input.tex Test.out configure install-sh lacheck chktexrc \
-	$(wildcard m4/*.m4)
-
-# created by configure
-CONFIG_DIST=ChkTeX.tex
-
-# created at make time
-BUILT_DIST=chktex.doc chkweb.doc deweb.doc README ChkTeX.dvi
-
-CSOURCES=ChkTeX.c FindErrs.c OpSys.c Resource.c Utility.c
-
-# The sources are the C sources and possibly the files with the same base name
-# but ending with .h
-SOURCEFILES=$(CSOURCES) $(wildcard $(CSOURCES:.c=.h)) types.h
-
-DISTFILES=$(EXTRA_DIST) $(SOURCEFILES)
-
-all: chktex
-
-DISTDIR:=chktex-@PACKAGE_VERSION@
-dist: $(DISTDIR).tar.gz
-$(DISTDIR).tar.gz: $(DISTFILES) $(CONFIG_DIST) $(BUILT_DIST) html
-	rm -r $(DISTDIR) 2>/dev/null ; true
-	$(MKDIR_P) $(DISTDIR)
-	for f in $(DISTFILES) ; do \
-	  cp $(srcdir)/$$f $(DISTDIR) ; \
-	done
-	cp $(CONFIG_DIST) $(BUILT_DIST) $(DISTDIR)
-	$(MKDIR_P) $(DISTDIR)/html
-	cp HTML/ChkTeX/*.{html,css} $(DISTDIR)/html
-	rm -f $(DISTDIR).tar.gz
-	tar --owner=0 --group=0 -chzf $@ $(DISTDIR)
-	rm -rf $(DISTDIR)
-
-########################################################################
-
-.c.o:
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
-CLEAN+=$(CSOURCES:.c=.o)
-
-.%.d: %.c
-	$(CC) -M $(CPPFLAGS) $< > $@.tmp
-	sed 's,\($*\)\.o *:,\1.o $@ : Makefile,g' $@.tmp > $@
-	-rm -f $@.tmp 2>/dev/null
-
-DEPFILES=$(patsubst %.c,.%.d,$(CSOURCES))
-CLEAN+=$(DEPFILES)
-
-ifeq ($(findstring clean,$(MAKECMDGOALS)),)
-include $(DEPFILES)
-endif
-
-###################### MAIN DEPENDENCIES ################################
-
-OBJS= ChkTeX.o FindErrs.o OpSys.o Resource.o Utility.o
-
-MAKETEST= (builddir=`pwd` ; cd $(srcdir) ; $${builddir}/chktex -mall -r -g0 -lchktexrc -v5 Test.tex)
-
-$(srcdir)/Test.out: $(srcdir)/Test.tex
-	-rm -f $(srcdir)/Test.out
-	@echo ""
-	@echo "***Warning: creating Test.out***"
-	@echo ""
-	$(MAKETEST) 1> $(srcdir)/Test.out
-
-check: chktex $(srcdir)/Test.out
-	@echo ">>> Testing that checking algorithms work correctly..."
-	@-rm -f chktest
-	$(MAKETEST) 1> chktest
-	@if cmp -s chktest $(srcdir)/Test.out; then \
-		echo ">>> OK!"; \
-		rm -f chktest; \
-	else \
-		echo "***WARNING***"; \
-		echo "Problems when checking compilation. This may or may not"; \
-		echo "be a problem; anyway, I'm giving you a diff from what the"; \
-		echo "results were *supposed* to be..."; \
-		diff -u $(srcdir)/Test.out chktest; \
-	fi
-
-
-chktex: $(OBJS)
-	$(CC) $(LDFLAGS) -o chktex $(OBJS) $(LIBS)
-
-install: chktex ChkTeX.dvi
-	$(MKDIR_P) $(DESTDIR)$(bindir)
-	for program in chktex $(BUILT_SCRIPTS); do \
-		$(INSTALL_PROGRAM) $$program $(DESTDIR)$(bindir); \
-	done
-	for program in $(SCRIPTS); do \
-		$(INSTALL_PROGRAM) $(srcdir)/$$program $(DESTDIR)$(bindir); \
-	done
-	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
-	$(INSTALL_DATA) $(srcdir)/chktexrc $(DESTDIR)$(sysconfdir)
-	if (eval echo "$(BUILT_SCRIPTS)") | egrep deweb >/dev/null 2>&1; then \
-		$(MKDIR_P) $(DESTDIR)$(mandir)/man1; \
-                cp $(srcdir)/deweb.1 $(DESTDIR)$(mandir)/man1; \
-	fi
-	if (eval echo "$(ELISPDIR)") | egrep "/" >/dev/null 2>&1; then \
-		$(INSTALL_DATA) $(srcdir)/chktex.el $(DESTDIR)$(ELISPDIR); \
-	fi
-
-
-
-uninstall:
-	for program in chktex $(SCRIPTS) $(BUILT_SCRIPTS); do \
-		rm -f $(DESTDIR)$(bindir)/$$program; \
-	done
-	rm -f $(DESTDIR)$(sysconfdir)/chktexrc  $(DESTDIR)$(mandir)/man1/deweb.1
-	if (eval echo "$(ELISPDIR)") | egrep "/" >/dev/null 2>&1; then \
-		rm -f $(DESTDIR)$(ELISPDIR)/chktex.el ; \
-	fi
-
-test:
-	chktex -v2 -mall $(srcdir)/Test.tex | less -r
-
-indent:
-	indent -npsl -bli0 -npcs -nut -i4 $(SOURCEFILES)
-
-mostlyclean: clean
-
-clean:
-	rm -rf $(CLEAN) $(BUILT_DIST) $(DISTDIR).tar.gz \
-	  *.aux *.log *.pdf *.dvi *.ps \
-	  chktex HTML rme chktest
-
-distclean: clean
-	rm -rf $(CONFIG_DIST) *.cache *.status *.log *.tar.gz \
-	  deweb Makefile autom4te.cache config.h
-
-maintainer-clean: distclean
-	rm -rf *.rme install-sh config.guess config.sub aclocal.m4 \
-	  configure missing rmeheader stamp-h mkinstalldirs tags
-
-dvi: ChkTeX.dvi
-
-pdf: ChkTeX.pdf
-
-ifneq ($(LATEX2HTML),)
-html: ChkTeX.tex MakeHTML.pl
-	-rm -r HTML
-	$(MKDIR_P) HTML
-	$(PERL5) $(srcdir)/MakeHTML.pl ChkTeX.tex > HTML/ChkTeX.tex
-	cd HTML; $(LATEX2HTML) ChkTeX.tex
-	$(PERL5) -i -pe 's%</code> %</code>%gi;s%\s+([.,?!])%$$1%g;' HTML/ChkTeX/*.html
-
-README: ChkTeX.tex rmeheader MakeHTML.pl
-	rm -rf rme
-	$(MKDIR_P) rme
-	$(PERL5) $(srcdir)/MakeHTML.pl ChkTeX.tex > rme/ChkTeX.tex
-	cd rme; $(LATEX2HTML) -split 0 ChkTeX.tex
-	$(PERL5) -i -pe 's%L<SUP><SMALL>A</SMALL></SUP>%La%g;s%T<SMALL>E</SMALL>X%TeX%g;s%<SUB>(.*)</SUB>%$$1%g' rme/ChkTeX/*.html
-	$(PERL5) -i -pe 's%</code> %</code>%gi;s%\s+([.,?!])%$$1%g;' rme/ChkTeX/*.html
-	$(LYNX) -dump rme/ChkTeX/ChkTeX.html > rme/ChkTeX.rme
-	cp rmeheader README
-	$(PERL5) -e 'undef $$/;$$_=<>;($$_)=/(.*INTRODUCTION(.|\n)*?)[ \t]+ABOUT THIS DOCUMENT/i;s/[ \t]+\n/\n/g;s/\n\n\n/\n/g;s/\[\d+\]//g;print;' rme/ChkTeX.rme >> README
-	rm -rf rme
-else
-html README:
-	@echo "latex2html is unavailable on this system, cant create target $@."; exit 1
-endif
-
-###################### AUTOCONF REMAKING ################################
-
-$(srcdir)/configure: configure.in aclocal.m4
-	cd $(srcdir) && autoconf
-
-#autoheader might not change config.h.in, so touch a stamp file.
-$(srcdir)/config.h.in: stamp-h.in
-$(srcdir)/stamp-h.in: configure.in aclocal.m4
-	cd $(srcdir) && autoheader
-	echo timestamp > $(srcdir)/stamp-h.in
-
-config.h: stamp-h
-stamp-h: config.h.in config.status
-	./config.status
-
-ChkTeX.tex: ChkTeX.tex.in
-	./config.status ChkTeX.tex
-
-Makefile: Makefile.in config.status
-	./config.status
-
-config.status: configure
-	./config.status --recheck
-
-###################### INDIVIDUAL DEPENDENCIES ##########################
-
-%.doc: %.1
-	$(GROFF) $< > $@
-
-ChkTeX.dvi: ChkTeX.tex
-ifdef LATEX
-	$(LATEX) ChkTeX.tex
-else
-	echo "No latex program found by configure"
-	false
-endif
-
-ChkTeX.ps: ChkTeX.dvi
-	$(DVIPS) -o ChkTeX.ps ChkTeX.dvi
-
-ChkTeX.pdf: ChkTeX.ps
-	$(PS2PDF) $< $@
-
-cover:
-	-./chktex -h
-	-./chktex Test.tex
-	-./chktex -v2 -t -o tmptmptmp <Test.tex
-	-./chktex -v2 -t -o tmptmptmp Test.tex
-	-./chktex Test.tex -v
-	-./chktex Test.tex -v0
-	-./chktex Test.tex -v1
-	-./chktex Test.tex -v2
-	-./chktex Test.tex -v3
-	-./chktex Test.tex -v4
-	-./chktex -t -v0s::: Test.tex -x
-	-./chktex -p FOO Test.tex
-	-./chktex -t Test.tex
-	-./chktex -o tmptmptmp -o tmptmptmptmp Test.tex
-	-./chktex -l t:faultrc test.tex
-	-./chktex -e30w22n1 Test.tex
-	-./chktex -w33e-n1 Test.tex
-	-./chktex -i
-	-./chktex -v2 -t -o tmptmptmp <Test.tex
-	-./chktex -I Test.tex
-	-./chktex -rd2 Test.tex
-	-./chktex -gd2 Test.tex
-	-./chktex -f "*N\
-Between: %b*N\
-Column: %c*N\
-Length: %d*N\
-File: %f*N\
-%iInverse%I*N\
-Kind: %k*N\
-Line: %l*N\
-Msg: %m*N\
-Num: %n*N\
-Und: %u*N\
-Pre:  %r*N\
-Str:  %s*N\
-Post: %t*N\
-*N\
-%k in %f line %l: %m*N\
-%r%i%s%I%t*N\
-%u*N\
-*N" Test.tex
-	-./chktex -o tmptmptmp -r -d2 Test.tex
-	-./chktex -qv0 Test.tex
-	-./chktex -w30 Test.tex
-	-./chktex -g --localrc=.testrc -d2 Test.tex
-	for file in $(CSOURCES); do gcov $(GCOVOPTS) $$file; done
diff --git a/Build/source/texk/chktex/chktex-1.7.1/Test.out b/Build/source/texk/chktex/chktex-1.7.1/Test.out
deleted file mode 100644
index 5bea0174f04..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1/Test.out
+++ /dev/null
@@ -1,498 +0,0 @@
-Message 30 in Test.tex: Multiple spaces detected in input.
-    o To test the program upon it  
- ^^^
-Message 30 in Test.tex: Multiple spaces detected in input.
-    o To show off some of the features  
- ^^^
-Message 22 in Test.tex: Comment displayed.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  
-^
-Message 22 in Test.tex: Comment displayed.
-% Warning 1  
-^
-Message 1 in Test.tex: Command terminated with space.
-\foo This is an error.  
-    ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 2  
-^
-Message 2 in Test.tex: Non-breaking space (`~') should have been used.
-This is a faulty reference to \ref{foo}  
-                             ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 3  
-^
-Message 3 in Test.tex: You should enclose the previous parenthesis with `{}'.
-$[(ab)^{-1}]^{-2}$  is not beautiful  
-     ^
-Message 3 in Test.tex: You should enclose the previous parenthesis with `{}'.
-$[(ab)^{-1}]^{-2}$  is not beautiful  
-           ^
-Message 30 in Test.tex: Multiple spaces detected in input.
-$[(ab)^{-1}]^{-2}$  is not beautiful  
-                  ^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 4-6, 28  
-^
-Message 6 in Test.tex: No italic correction (`\/') found.
-Testing {\it italic} in \/ this {\em sentence\/}, as {\em you \/ see\/}.  
-                   ^
-Message 42 in Test.tex: You should remove spaces in front of `\/'
-Testing {\it italic} in \/ this {\em sentence\/}, as {\em you \/ see\/}.  
-                       ^
-Message 4 in Test.tex: Italic correction (`\/') found in non-italic buffer.
-Testing {\it italic} in \/ this {\em sentence\/}, as {\em you \/ see\/}.  
-                        ^^
-Message 28 in Test.tex: Don't use \/ in front of small punctuation.
-Testing {\it italic} in \/ this {\em sentence\/}, as {\em you \/ see\/}.  
-                                             ^^
-Message 42 in Test.tex: You should remove spaces in front of `\/'
-Testing {\it italic} in \/ this {\em sentence\/}, as {\em you \/ see\/}.  
-                                                             ^
-Message 5 in Test.tex: Italic correction (`\/') found more than once.
-Testing {\it italic} in \/ this {\em sentence\/}, as {\em you \/ see\/}.  
-                                                                    ^^
-Message 22 in Test.tex: Comment displayed.
-% LaTeX2e  
-^
-Message 42 in Test.tex: You should remove spaces in front of `\/'
-Testing \textem{italic} in \/ this \textit{sentence\/}, as \textem{you \/ see\/}.  
-                          ^
-Message 4 in Test.tex: Italic correction (`\/') found in non-italic buffer.
-Testing \textem{italic} in \/ this \textit{sentence\/}, as \textem{you \/ see\/}.  
-                           ^^
-Message 4 in Test.tex: Italic correction (`\/') found in non-italic buffer.
-Testing \textem{italic} in \/ this \textit{sentence\/}, as \textem{you \/ see\/}.  
-                                                   ^^
-Message 42 in Test.tex: You should remove spaces in front of `\/'
-Testing \textem{italic} in \/ this \textit{sentence\/}, as \textem{you \/ see\/}.  
-                                                                      ^
-Message 4 in Test.tex: Italic correction (`\/') found in non-italic buffer.
-Testing \textem{italic} in \/ this \textit{sentence\/}, as \textem{you \/ see\/}.  
-                                                                       ^^
-Message 4 in Test.tex: Italic correction (`\/') found in non-italic buffer.
-Testing \textem{italic} in \/ this \textit{sentence\/}, as \textem{you \/ see\/}.  
-                                                                             ^^
-Message 4 in Test.tex: Italic correction (`\/') found in non-italic buffer.
-Testing \textem{italic\/} in this \textit{sentence}, as \textem{you see}.  
-                      ^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 7  
-^
-Message 7 in Test.tex: Accent command `\'' needs use of `\i'.
-This \'is a test of $\hat{j}$ accents.  
-     ^^
-Message 7 in Test.tex: Accent command `\hat' needs use of `\jmath'.
-This \'is a test of $\hat{j}$ accents.  
-                     ^^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 8  
-^
-Message 8 in Test.tex: Wrong length of dash may have been used.
-It wasn't anything - just a 2---3 star--shots.  
-                   ^
-Message 8 in Test.tex: Wrong length of dash may have been used.
-It wasn't anything - just a 2---3 star--shots.  
-                             ^^^
-Message 8 in Test.tex: Wrong length of dash may have been used.
-It wasn't anything - just a 2---3 star--shots.  
-                                      ^^
-Message 22 in Test.tex: Comment displayed.
-% From Knuths TeXbook Chapter 14  
-^
-Message 22 in Test.tex: Comment displayed.
-% "How TeX Breaks Paragraphs into Lines", fourth paragraph:  
-^
-Message 22 in Test.tex: Comment displayed.
-% Warning 9-10  
-^
-Message 22 in Test.tex: Comment displayed.
-% Brackets:  
-^
-Message 10 in Test.tex: Solo `)' found.
-)}{[])} }}}]]])))  
-^
-Message 10 in Test.tex: Solo `}' found.
-)}{[])} }}}]]])))  
- ^
-Message 9 in Test.tex: `}' expected, found `)'.
-)}{[])} }}}]]])))  
-     ^
-Message 10 in Test.tex: Solo `}' found.
-)}{[])} }}}]]])))  
-      ^
-Message 10 in Test.tex: Solo `}' found.
-)}{[])} }}}]]])))  
-        ^
-Message 10 in Test.tex: Solo `}' found.
-)}{[])} }}}]]])))  
-         ^
-Message 10 in Test.tex: Solo `}' found.
-)}{[])} }}}]]])))  
-          ^
-Message 10 in Test.tex: Solo `]' found.
-)}{[])} }}}]]])))  
-           ^
-Message 10 in Test.tex: Solo `]' found.
-)}{[])} }}}]]])))  
-            ^
-Message 10 in Test.tex: Solo `]' found.
-)}{[])} }}}]]])))  
-             ^
-Message 10 in Test.tex: Solo `)' found.
-)}{[])} }}}]]])))  
-              ^
-Message 10 in Test.tex: Solo `)' found.
-)}{[])} }}}]]])))  
-               ^
-Message 10 in Test.tex: Solo `)' found.
-)}{[])} }}}]]])))  
-                ^
-Message 22 in Test.tex: Comment displayed.
-% Envs:  
-^
-Message 9 in Test.tex: `baz' expected, found `quux'.
-\begin{quux} \begin{baz} \end{quux} \end{baz} \end{asoi} \begin{dobedo}  
-                         ^^^^
-Message 9 in Test.tex: `quux' expected, found `baz'.
-\begin{quux} \begin{baz} \end{quux} \end{baz} \end{asoi} \begin{dobedo}  
-                                    ^^^^
-Message 10 in Test.tex: Solo `asoi' found.
-\begin{quux} \begin{baz} \end{quux} \end{baz} \end{asoi} \begin{dobedo}  
-                                              ^^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 11  
-^
-Message 11 in Test.tex: You should use \ldots to achieve an ellipsis.
-Foo...bar. $1,...,3$. $1+...+3$. $1,\cdots,3$. $1\cdot\ldots\cdot3$.  
-   ^^^
-Message 11 in Test.tex: You should use \ldots to achieve an ellipsis.
-Foo...bar. $1,...,3$. $1+...+3$. $1,\cdots,3$. $1\cdot\ldots\cdot3$.  
-              ^^^
-Message 11 in Test.tex: You should use \cdots to achieve an ellipsis.
-Foo...bar. $1,...,3$. $1+...+3$. $1,\cdots,3$. $1\cdot\ldots\cdot3$.  
-                         ^^^
-Message 11 in Test.tex: You should use \ldots to achieve an ellipsis.
-Foo...bar. $1,...,3$. $1+...+3$. $1,\cdots,3$. $1\cdot\ldots\cdot3$.  
-                                    ^^^^^^
-Message 11 in Test.tex: You should use \cdots to achieve an ellipsis.
-Foo...bar. $1,...,3$. $1+...+3$. $1,\cdots,3$. $1\cdot\ldots\cdot3$.  
-                                                      ^^^^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 12  
-^
-Message 12 in Test.tex: Interword spacing (`\ ') should perhaps be used.
-1st. Foo Inc. Ab.cd. foo ab.cd. Foo. bar baz., billy.; bob.: joe.! frank.? james.. george  
-    ^
-Message 12 in Test.tex: Interword spacing (`\ ') should perhaps be used.
-1st. Foo Inc. Ab.cd. foo ab.cd. Foo. bar baz., billy.; bob.: joe.! frank.? james.. george  
-                    ^
-Message 12 in Test.tex: Interword spacing (`\ ') should perhaps be used.
-1st. Foo Inc. Ab.cd. foo ab.cd. Foo. bar baz., billy.; bob.: joe.! frank.? james.. george  
-                                    ^
-Message 12 in Test.tex: Interword spacing (`\ ') should perhaps be used.
-1st. Foo Inc. Ab.cd. foo ab.cd. Foo. bar baz., billy.; bob.: joe.! frank.? james.. george  
-                                                           ^
-Message 12 in Test.tex: Interword spacing (`\ ') should perhaps be used.
-1st. Foo Inc. Ab.cd. foo ab.cd. Foo. bar baz., billy.; bob.: joe.! frank.? james.. george  
-                                                                 ^
-Message 12 in Test.tex: Interword spacing (`\ ') should perhaps be used.
-1st. Foo Inc. Ab.cd. foo ab.cd. Foo. bar baz., billy.; bob.: joe.! frank.? james.. george  
-                                                                         ^
-Message 12 in Test.tex: Interword spacing (`\ ') should perhaps be used.
-1st. Foo Inc. Ab.cd. foo ab.cd. Foo. bar baz., billy.; bob.: joe.! frank.? james.. george  
-                                                                                 ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 13  
-^
-Message 13 in Test.tex: Intersentence spacing (`\@') should perhaps be used.
-Look at THIS! It's an error.  
-            ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 14  
-^
-Message 1 in Test.tex: Command terminated with space.
-\hat  
-    ^
-Message 14 in Test.tex: Could not find argument for command.
-\hat  
-^^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 18,19  
-^
-Message 18 in Test.tex: Use either `` or '' as an alternative to `"'.
-Is this an "example", or is it an ´example´.  
-           ^
-Message 18 in Test.tex: Use either `` or '' as an alternative to `"'.
-Is this an "example", or is it an ´example´.  
-                   ^
-Message 19 in Test.tex: Use "'" (ASCII 39) instead  of "´" (ASCII 180).
-Is this an "example", or is it an ´example´.  
-                                  ^
-Message 19 in Test.tex: Use "'" (ASCII 39) instead  of "´" (ASCII 180).
-Is this an "example", or is it an ´example´.  
-                                          ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 20  
-^
-Message 20 in Test.tex: User-specified pattern found: \unknown.
-That bug is \unknown\ to me.  
-            ^^^^^^^^
-Message 22 in Test.tex: Comment displayed.
-% That bug is \unknown\ to me.  
-^
-Message 22 in Test.tex: Comment displayed.
-% Warning 21  
-^
-Message 21 in Test.tex: This command might not be intended.
-\LaTeX\ is an extension of \TeX\. Right?  
-                               ^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 23  
-^
-Message 23 in Test.tex: Either `\,`` or ``\,` will look better.
-```Hello', I heard him said'', she remembered.  
-^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 24  
-^
-Message 24 in Test.tex: Delete this space to maintain correct pagereferences.
-Indexing text \index{text} is fun!  
-             ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 25  
-^
-Message 25 in Test.tex: You might wish to put this between a pair of `{}'
-$5\cdot10^10$  
-          ^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 26  
-^
-Message 26 in Test.tex: You ought to remove spaces in front of punctuation.
-Do you understand ?  
-                 ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 27  
-^
-Message 1 in input.tex: Command terminated with space.
-\this is a test of whether the file is actually inputted...  
-     ^
-Message 11 in input.tex: You should use \ldots to achieve an ellipsis.
-\this is a test of whether the file is actually inputted...  
-                                                        ^^^
-Message 1 in input.tex: Command terminated with space.
-\this is a test of whether the file is actually inputted...  
-     ^
-Message 11 in input.tex: You should use \ldots to achieve an ellipsis.
-\this is a test of whether the file is actually inputted...  
-                                                        ^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 29  
-^
-Message 29 in Test.tex: $\times$ may look prettier here.
-The program opens a screen sized 640x200 pixels  
-                                    ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 30  
-^
-Message 30 in Test.tex: Multiple spaces detected in input.
-White           is a beautiful colour.  
-     ^^^^^^^^^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 31  
-^
-Message 31 in Test.tex: This text may be ignored.
-\end{verbatim} foo bar  
-               ^^^^^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 32-34  
-^
-Message 32 in Test.tex: Use ` to begin quotation, not '.
-This is either an 'example`, an ''example`` or an `"`example'`'.  
-                  ^
-Message 33 in Test.tex: Use ' to end quotation, not `.
-This is either an 'example`, an ''example`` or an `"`example'`'.  
-                          ^
-Message 32 in Test.tex: Use ` to begin quotation, not '.
-This is either an 'example`, an ''example`` or an `"`example'`'.  
-                                ^^
-Message 33 in Test.tex: Use ' to end quotation, not `.
-This is either an 'example`, an ''example`` or an `"`example'`'.  
-                                         ^^
-Message 34 in Test.tex: Don't mix quotes.
-This is either an 'example`, an ''example`` or an `"`example'`'.  
-                                                  ^^^
-Message 34 in Test.tex: Don't mix quotes.
-This is either an 'example`, an ''example`` or an `"`example'`'.  
-                                                            ^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 35  
-^
-Message 35 in Test.tex: You should perhaps use `\sin' instead.
-$sin^2 + cos^2 = 1$  
- ^^^
-Message 35 in Test.tex: You should perhaps use `\cos' instead.
-$sin^2 + cos^2 = 1$  
-         ^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 36-37  
-^
-Message 36 in Test.tex: You should put a space in front of parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-    ^
-Message 37 in Test.tex: You should avoid spaces after parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-     ^
-Message 36 in Test.tex: You should put a space in front of parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-                ^
-Message 37 in Test.tex: You should avoid spaces after parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-                 ^
-Message 37 in Test.tex: You should avoid spaces in front of parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-                            ^
-Message 36 in Test.tex: You should put a space in front of parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-                                           ^
-Message 37 in Test.tex: You should avoid spaces after parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-                                            ^
-Message 37 in Test.tex: You should avoid spaces in front of parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-                                                    ^
-Message 36 in Test.tex: You should put a space after parenthesis.
-This( an example( Nuff said )), illustrates( ``my'' )point.  
-                                                     ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 38  
-^
-Message 38 in Test.tex: You should not use punctuation in front of quotes.
-``An example,'' he said, ``would be great.''  
-            ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 39  
-^
-Message 39 in Test.tex: Double space found.
-For output codes, see table ~\ref{tab:fmtout}.  
-                           ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 40  
-^
-Message 40 in Test.tex: You should put punctuation outside inner math mode.
-$\this,$ and $$this$$.  
-      ^
-Message 40 in Test.tex: You should put punctuation inside display math mode.
-$\this,$ and $$this$$.  
-                     ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 41  
-^
-Message 1 in Test.tex: Command terminated with space.
-foo \above qux  
-          ^
-Message 41 in Test.tex: You ought to not use primitive TeX in LaTeX code.
-foo \above qux  
-    ^^^^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 42  
-^
-Message 42 in Test.tex: You should remove spaces in front of `\footnote'
-This is a footnote \footnote{foo}.  
-                  ^
-Message 22 in Test.tex: Comment displayed.
-% Warning 43  
-^
-Message 43 in Test.tex: `\left' is normally not followed by `{'.
-Here is a mistake $\left{x\right}$.  
-                   ^^^^^
-Message 43 in Test.tex: `\right' is normally not followed by `}'.
-Here is a mistake $\left{x\right}$.  
-                          ^^^^^^
-Message 21 in Test.tex: This command might not be intended.
-This one triggers warning 22 $\left\{x\right\}$.  
-                                   ^^
-Message 21 in Test.tex: This command might not be intended.
-This one triggers warning 22 $\left\{x\right\}$.  
-                                            ^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 44 -- user regex -- default message  
-^
-Message 44 in Test.tex: User Regex:  intro..
-You should always write a good intro.  
-                              ^^^^^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 44 -- user regex -- user message  
-^
-Message 44 in Test.tex: User Regex: Always use \nmid.
-For every $p\not|n$ you have an ugly prime which doesn't divide $n$.  
-            ^^^^^
-Message 22 in Test.tex: Comment displayed.
-% Math mode check  
-^
-Message 35 in Test.tex: You should perhaps use `\sin' instead.
-\ensuremath{sin x\text{is not the same as sin x, but is the same as $sin x$}}  
-            ^^^
-Message 35 in Test.tex: You should perhaps use `\sin' instead.
-\ensuremath{sin x\text{is not the same as sin x, but is the same as $sin x$}}  
-                                                                     ^^^
-Message 36 in Test.tex: You should put a space in front of parenthesis.
-Also, $x(3)\text{ is not x(3) but it is $x(3)$}$  
-                          ^
-Message 22 in Test.tex: Comment displayed.
-This is\\% a comment. Nothing here should be checked(right)?  
-         ^
-Message 36 in Test.tex: You should put a space in front of parenthesis.
-But this is not a \% comment, so we should find this error(right)?  
-                                                          ^
-Message 22 in Test.tex: Comment displayed.
-Here(on this line only)is a warning $sin(x)$ suppressed. % chktex 36 chktex 35  
-                                                         ^
-Message 22 in Test.tex: Comment displayed.
-Here(on this line only)is a warning $sin(x)$ suppressed. % CHKTEX 35 36  
-                                                         ^
-Message 36 in Test.tex: You should put a space in front of parenthesis.
-Here(on this line only)is a warning $sin(x)$ suppressed. % CHKTEX 35 36  
-    ^
-Message 36 in Test.tex: You should put a space after parenthesis.
-Here(on this line only)is a warning $sin(x)$ suppressed. % CHKTEX 35 36  
-                       ^
-Message 44 in Test.tex: User Regex: 1:Capitalize before references.
-In section~\ref{sec:3} we have a warning.  
-  ^^^^^^^^^^^^^
-Message 22 in Test.tex: Comment displayed.
-In section~\ref{sec:4} it is suppressed. % chktex -1  
-                                         ^
-Message 22 in Test.tex: Comment displayed.
-% In section~\ref{sec:5} we don't have a warning.  
-^
-Message 44 in Test.tex: User Regex: -2:Vertical rules in tables are ugly.
-\begin{tabular*}{1.0\linewidth}[h]{|c|cc|}  
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Message 44 in Test.tex: User Regex: -2:Use \toprule, midrule, or \bottomrule from booktabs.
-  \hline  
-  ^^^^^^
-Message 22 in Test.tex: Comment displayed.
-% Verb check  
-^
-Message 14 in Test.tex: Could not find argument for command.
-\verb#  
-^^^^^
-Message 31 in Test.tex: This text may be ignored.
-\end{verbatim} FOO  
-               ^^^
-Message 22 in Test.tex: Comment displayed.
-% Warning 16,15  
-^
-Message 16 in Test.tex: Mathmode still on at end of LaTeX file.
-
-
-Message 17 in Test.tex: Number of `(' doesn't match the number of `)'!
-
-
-Message 17 in Test.tex: Number of `[' doesn't match the number of `]'!
-
-
-Message 17 in Test.tex: Number of `{' doesn't match the number of `}'!
-
-
diff --git a/Build/source/texk/chktex/chktex-1.7.1/aclocal.m4 b/Build/source/texk/chktex/chktex-1.7.1/aclocal.m4
deleted file mode 100644
index 52c43e7af14..00000000000
--- a/Build/source/texk/chktex/chktex-1.7.1/aclocal.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_include([m4/ax_cflags_strict_prototypes.m4])
-m4_include([m4/vl_prog_cc_warnings.m4])
diff --git a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog b/Build/source/texk/chktex/chktex-1.7.2-PATCHES/ChangeLog
index b0d6fe22008..dcde8acf28d 100644
--- a/Build/source/texk/chktex/chktex-1.7.1-PATCHES/ChangeLog
+++ b/Build/source/texk/chktex/chktex-1.7.2-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import chktex-1.7.2.
+	* patch-07-kpathsea, patch-08-stpcpy, patch-09-test-output,
+	patch-10-semicolon, patch-11-TL, patch-12-uint64_t,
+	patch-13-char, patch-14-finderrs (removed): Applied upstream.
+
 2013-04-01  Karl Berry  <karl@tug.org>
 
 	* patch-14-finderrs: patch from author for test failure,
diff --git a/Build/source/texk/chktex/chktex-1.7.2-PATCHES/TL-Changes b/Build/source/texk/chktex/chktex-1.7.2-PATCHES/TL-Changes
new file mode 100644
index 00000000000..3d5d2a14792
--- /dev/null
+++ b/Build/source/texk/chktex/chktex-1.7.2-PATCHES/TL-Changes
@@ -0,0 +1,15 @@
+Changes applied to the chktex-1.7.2 tree as obtained from:
+	http://mirror.ctan.org/support/chktex/chktex-1.7.2.tar.gz
+	http://download.savannah.gnu.org/releases/chktex/chktex-1.7.2.tar.gz
+
+Remove:
+	Makefile.in
+	aclocal.m4
+	config.h.in
+	configure
+	install-sh
+	stamp-h.in
+
+Rename:
+	chkweb -> chkweb.sh
+
diff --git a/Build/source/texk/chktex/chktex-1.7.1/COPYING b/Build/source/texk/chktex/chktex-1.7.2/COPYING
index d4e8cec1128..d4e8cec1128 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/COPYING
+++ b/Build/source/texk/chktex/chktex-1.7.2/COPYING
diff --git a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.c b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.c
index 95688728af4..596bba26e83 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.c
+++ b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.c
@@ -40,10 +40,10 @@
 #include <string.h>
 
 #undef MSG
-#define MSG(num, type, inuse, ctxt, text) {num, type, inuse, ctxt, text},
+#define MSG(num, type, inuse, ctxt, text) {(enum ErrNum)num, type, inuse, ctxt, text},
 
 struct ErrMsg PrgMsgs[pmMaxFault + 1] = {
-    PRGMSGS {pmMaxFault, etErr, TRUE, 0, INTERNFAULT}
+    PRGMSGS {(enum ErrNum)pmMaxFault, etErr, TRUE, 0, INTERNFAULT}
 };
 
 struct Stack CharStack = {
@@ -353,7 +353,7 @@ int main(int argc, char **argv)
 #define LIST(a)
 #define LNEMPTY(a) InsertWord("", &a);
 
-    RESOURCE_INFO;
+    RESOURCE_INFO
 
     while (SetupVars())
         ReadRC(ConfigFile);
@@ -647,7 +647,7 @@ static void ShowIntStatus(void)
 
     if (DebugLevel & (FLG_DbgListInfo | FLG_DbgListCont))
     {
-        RESOURCE_INFO;
+        RESOURCE_INFO
     }
 
     if (DebugLevel & FLG_DbgOtherInfo)
@@ -686,8 +686,7 @@ static void ShowIntStatus(void)
 
 static void ResetStacks(void)
 {
-    RESOURCE_INFO;
-
+    RESOURCE_INFO
 }
 
 /*
@@ -872,7 +871,7 @@ static int ParseArgs(int argc, char **argv)
             case 'e': ErrType = etErr; InUse = iuOK; LAST(warntype);
             case 'm': ErrType = etMsg; InUse = iuOK; LAST(warntype);
             case 'n': ErrType = etMsg; InUse = iuNotUser; LAST(warntype);
-                ) 
+                )
                 if (isdigit((unsigned char)*optarg))
                 {
                     nextc = ParseNumArg(&Err, -1, &optarg);
diff --git a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.h b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.h
index aba2c215239..6372d212ed9 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.h
+++ b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.h
@@ -38,6 +38,7 @@
 #  include CONFIG_H_NAME
 #endif
 
+/* For TeX Live */
 #ifdef KPATHSEA
 #include <kpathsea/config.h>
 #endif
@@ -293,7 +294,15 @@ extern unsigned long Brackets[NUMBRACKETS];
 
 extern FILE *OutputFile, *InputFile;
 
-#define OPTION_DEFAULTS \
+/* We include semicolons on all but the last so that we can include a
+ * semicolon where it's called.  This helps with indentation at the
+ * calling location.  It also means that DEF must never have a
+ * semicolon.  The reason for the care is that isolated semicolons
+ * have been known to break some compilers. */
+/* See also RESOURCE_INFO where the same trick doesn't work, and we
+ * cannot include semicolons at the calling site, regardless of
+ * indentation concerns. */
+#define OPTION_DEFAULTS        \
   DEF(int, GlobalRC,    TRUE); \
   DEF(int, WipeVerb,    TRUE); \
   DEF(int, BackupOut,   TRUE); \
@@ -311,18 +320,18 @@ extern FILE *OutputFile, *InputFile;
   DEF(int,  NoLineSupp, FALSE)
 
 #define STATE_VARS \
-  DEF(enum ItState, ItState, itOff); /* Are we doing italics? */ \
-  DEF(int, AtLetter, FALSE); /* Whether `@' is a letter or not. */ \
-  DEF(int, InHeader, TRUE);  /* Whether we're in the header */ \
+    DEF(enum ItState, ItState, itOff); /* Are we doing italics? */      \
+  DEF(int, AtLetter, FALSE); /* Whether `@' is a letter or not. */      \
+  DEF(int, InHeader, TRUE);  /* Whether we're in the header */          \
   DEF(int, VerbMode, FALSE); /* Whether we're in complete ignore-mode */ \
-  DEF(long, MathMode, 0);    /* Whether we're in math mode or not */ \
+  DEF(long, MathMode, 0);    /* Whether we're in math mode or not */    \
   DEF(const char *, VerbStr, "");     /* String we'll terminate verbmode upon */ \
-  DEF(unsigned long, ErrPrint, 0);    /* # errors printed */ \
-  DEF(unsigned long, WarnPrint, 0);   /* # warnings printed */ \
-  DEF(unsigned long, UserSupp, 0);    /* # user suppressed warnings */ \
+  DEF(unsigned long, ErrPrint, 0);    /* # errors printed */            \
+  DEF(unsigned long, WarnPrint, 0);   /* # warnings printed */          \
+  DEF(unsigned long, UserSupp, 0);    /* # user suppressed warnings */  \
   DEF(unsigned long, LineSupp, 0);    /* # warnings suppressed on a single line */ \
   DEF(uint64_t, FileSuppressions, 0);     /* # warnings suppressed in a file */ \
-  DEF(uint64_t, UserFileSuppressions, 0); /* # User warnings suppressed in a file */
+  DEF(uint64_t, UserFileSuppressions, 0) /* # User warnings suppressed in a file */
 
 #define DEF(type, name, value) extern type name
 OPTION_DEFAULTS;
diff --git a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.pdf b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.pdf
index 4bebc93ed6f..246c2a502a1 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.pdf
+++ b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.pdf
diff --git a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.tex.in b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.tex.in
index 5ec07632ad9..8cb0750556f 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.tex.in
+++ b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.tex.in
@@ -892,7 +892,7 @@ keyword in the \rsrc\ file which controls the discussed warning.
   like to have a real space there.
 
   You can also specify regular expressions to match commands which can
-  safely be terminated with a space.  They are specified in in the
+  safely be terminated with a space.  They are specified in the
   \rsrc\ file in \texttt{[]}, which in some other cases is used to
   indicate case-insensitive matching.
 
@@ -1052,8 +1052,9 @@ keyword in the \rsrc\ file which controls the discussed warning.
 \Keyword{CenterDots\\LowDots}
 \begin{errdesc}{You should use `\%s' to achieve  an ellipsis.}
   Simply typing three \Cmd{.} in a row will not give a perfect spacing
-  withing the between the dots. The \verb@\ldots@ is much more
-  suitable for this.
+  between the dots.  The \verb@\ldots@ is much more suitable for this.
+  Similar problems are noted for two periods in a row (instead of three)
+  since lacheck does.
 
   In math mode, you should also distinguish between \verb@\cdots@ and
   \verb@\ldots@; take a look at the example below.
@@ -1736,6 +1737,10 @@ The author wishes to thank the following people (in alphabetical order):
   version making it a much better release than it would have otherwise
   been.  He also helped expand several keywords in the \rsrc\ file.
 
+  \Name{Mojca Miklavec}{mojca.miklavec.lists@gmail.com}
+  Found and helped debug a problem (fixed in 1.7.2) occurring only on
+  some platforms, 32 bit Macs for one.
+
   \Name{Baruch Even}{chktex@ev-en.org}
   Maintainer of \chktex\ for about a decade.
 
diff --git a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.texrc b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.texrc
index e990c71d1be..e990c71d1be 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/ChkTeX.texrc
+++ b/Build/source/texk/chktex/chktex-1.7.2/ChkTeX.texrc
diff --git a/Build/source/texk/chktex/chktex-1.7.1/FindErrs.c b/Build/source/texk/chktex/chktex-1.7.2/FindErrs.c
index 5877d7ec011..7a1c6e24c80 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/FindErrs.c
+++ b/Build/source/texk/chktex/chktex-1.7.2/FindErrs.c
@@ -33,14 +33,6 @@
 #include "Utility.h"
 #include "Resource.h"
 
-#if !(defined HAVE_DECL_STPCPY && HAVE_DECL_STPCPY)
-static inline char *
-stpcpy(char *dest, const char *src)
-{
-    return strcpy(dest, src) + strlen(src);
-}
-#endif
-
 #if HAVE_PCRE || HAVE_POSIX_ERE
 
 #if HAVE_PCRE
@@ -926,6 +918,7 @@ static void CheckRest(void)
                         /* Default -- show the match */
                         PSERR2(offset + MATCH.rm_so, MATCH.rm_eo - MATCH.rm_so,
                                emUserWarnRegex,
+                               /* The format specifier expects an int */
                                (int)(MATCH.rm_eo - MATCH.rm_so),
                                TmpBuffer + offset + MATCH.rm_so);
                     }
@@ -1143,7 +1136,7 @@ int CheckSilentRegex(void)
 
 #if ! (HAVE_PCRE || HAVE_POSIX_ERE)
 
-    return HasWord(CmdBuffer, &Silent);
+    return HasWord(CmdBuffer, &Silent) != NULL;
 
 #else
 
@@ -1378,12 +1371,15 @@ int FindErr(const char *_RealBuf, const unsigned long _Line)
                 break;
 
             case '.':
-                if ((Char == *BufPtr) && (Char == BufPtr[1]))
+                /* .. or ... should be ellipses */
+                if ((Char == *BufPtr) && (Char != PrePtr[0]))
                 {
                     const char *cTmpPtr;
-                    dotlev = CheckDots(&PrePtr[1], &BufPtr[2]);
+                    const int NumDots = (Char == BufPtr[1]) ? 3 : 2;
+                    dotlev = CheckDots(&PrePtr[1],
+                                       &BufPtr[NumDots-1]);
                     cTmpPtr = Dot2Str(dotlev);
-                    HEREA(3, emEllipsis, cTmpPtr);
+                    HEREA(NumDots, emEllipsis, cTmpPtr);
                 }
 
                 /* Regexp: "([^A-Z@.])\.[.!?:]*\s+[a-z]" */
@@ -1453,10 +1449,10 @@ int FindErr(const char *_RealBuf, const unsigned long _Line)
                 MixingQuotes = FALSE;
 
                 if ((*TmpPtr == MatchC) || (*TmpPtr == '\"') ||
-                    (*TmpPtr == '´'))
+                    (*TmpPtr == '\xB4')) /* xB4 = latin1 acute accent */
                     MixingQuotes = TRUE;
 
-                SKIP_AHEAD(TmpPtr, TmpC, strchr("`\'\"´", TmpC));
+                SKIP_AHEAD(TmpPtr, TmpC, strchr("`\'\"\xB4", TmpC)); /* xB4 = latin1 acute accent */
 
                 if (MixingQuotes)
                     HERE(TmpPtr - BufPtr + 1, emQuoteMix);
@@ -1505,7 +1501,7 @@ int FindErr(const char *_RealBuf, const unsigned long _Line)
                 HERE(1, emUseQuoteLiga);
                 break;
 
-            case '\264':          /* '´' */
+            case '\264':             /* ´ (in Latin-1) */
                 HERE(1, emUseOtherQuote);
                 break;
 
@@ -1799,6 +1795,8 @@ PrintError(const char *File, const char *String,
                         fputs(Delimit, OutputFile);
                         break;
                     case 'c':
+                        /* TODO: need to add the offset of the column
+                         * here when long lines are broken. */
                         fprintf(OutputFile, "%ld", Position + 1);
                         break;
                     case 'd':
diff --git a/Build/source/texk/chktex/chktex-1.7.1/FindErrs.h b/Build/source/texk/chktex/chktex-1.7.2/FindErrs.h
index c938a365928..5b04f336d89 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/FindErrs.h
+++ b/Build/source/texk/chktex/chktex-1.7.2/FindErrs.h
@@ -74,7 +74,7 @@
  MSG(emUseQuoteLiga, etWarn, iuOK, ctNone,\
      "Use either `` or '' as an alternative to `\"'.")\
  MSG(emUseOtherQuote, etWarn, iuOK, ctNone,\
-     "Use \"'\" (ASCII 39) instead  of \"´\" (ASCII 180).")\
+     "Use \"'\" (ASCII 39) instead  of \"\xB4\" (ASCII 180).")\
  MSG(emUserWarn, etWarn, iuOK, ctNone,\
      "User-specified pattern found: %s.")\
  MSG(emNotIntended, etWarn, iuNotSys, ctNone,\
diff --git a/Build/source/texk/chktex/chktex-1.7.1/MakeHTML.pl b/Build/source/texk/chktex/chktex-1.7.2/MakeHTML.pl
index 6bdbadcf127..6bdbadcf127 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/MakeHTML.pl
+++ b/Build/source/texk/chktex/chktex-1.7.2/MakeHTML.pl
diff --git a/Build/source/texk/chktex/chktex-1.7.1/NEWS b/Build/source/texk/chktex/chktex-1.7.2/NEWS
index 895b8e9c3ed..3b42ee0a806 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/NEWS
+++ b/Build/source/texk/chktex/chktex-1.7.2/NEWS
@@ -1,6 +1,13 @@
 Development of ChkTeX is now in a maintainance mode.  All versions
 1.6.x are essentially bug fixes.  Version 1.7 added some new features.
 
+1.7.2 (2013-04-17), released by Ivan Andrus <darthandrus@gmail.com>
+
+  * Fixed display bug on platforms where sizeof(int) != sizeof(regoff_t)
+  * Warn that .. should be \dots like lacheck does
+  * Fixed warnings under clang
+  * Incorporated several build related patches from TeX Live
+
 1.7.1 (2012-08-22), released by Ivan Andrus <darthandrus@gmail.com>
 
   * Improvements for TeX Live and CTAN
diff --git a/Build/source/texk/chktex/chktex-1.7.1/OpSys.c b/Build/source/texk/chktex/chktex-1.7.2/OpSys.c
index 3c6ad702bcb..7d055b72284 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/OpSys.c
+++ b/Build/source/texk/chktex/chktex-1.7.2/OpSys.c
@@ -340,7 +340,7 @@ void tackon(char *Dir, const char *File)
 
 /*
  * This function should add the appendix App to the filename Name.
- * If the resulting filename gets too long due to this, it may 
+ * If the resulting filename gets too long due to this, it may
  * overwrite the old appendix.
  *
  * Name may be assumed to be a legal filename under your OS.
diff --git a/Build/source/texk/chktex/chktex-1.7.1/OpSys.h b/Build/source/texk/chktex/chktex-1.7.2/OpSys.h
index 7ce3f1b5270..7ce3f1b5270 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/OpSys.h
+++ b/Build/source/texk/chktex/chktex-1.7.2/OpSys.h
diff --git a/Build/source/texk/chktex/chktex-1.7.1/README b/Build/source/texk/chktex/chktex-1.7.2/README
index ba098014666..ba098014666 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/README
+++ b/Build/source/texk/chktex/chktex-1.7.2/README
diff --git a/Build/source/texk/chktex/chktex-1.7.1/Resource.c b/Build/source/texk/chktex/chktex-1.7.2/Resource.c
index f589d65d0a7..f301c6aff27 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/Resource.c
+++ b/Build/source/texk/chktex/chktex-1.7.2/Resource.c
@@ -66,6 +66,10 @@ struct KeyWord Keys[] = {
 
 /***************************** RESOURCE HANDLING **************************/
 
+/* We don't include a trailing semicolon here, so that we can add it
+ * at the calling site, thereby preserving proper indentation.  Double
+ * semicolons are undesirable since they have been known to break some
+ * compilers. */
 #define TOKENBITS(name) enum name { \
   BIT(Eof),      /* End-of-file */ \
   BIT(Open),     /* { */ \
diff --git a/Build/source/texk/chktex/chktex-1.7.1/Resource.h b/Build/source/texk/chktex/chktex-1.7.2/Resource.h
index 73b5c8ac60a..232e8e58932 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/Resource.h
+++ b/Build/source/texk/chktex/chktex-1.7.2/Resource.h
@@ -35,6 +35,11 @@
 #define ESCAPE  '!'             /* Char used to access special characters       */
 #define CMNT    '#'             /* Char used as comment                         */
 
+/* We cannot put semicolons here as with OPTION_DEFAULTS, since
+ * sometimes LIST etc. will be defined to be empty.  Thus we must
+ * never put a semicolon after RESOURCE_INFO where it's called since
+ * such isolated semicolons can break certain compilers.  This can
+ * mess with indentation a bit, but we just have to deal with it. */
 #define RESOURCE_INFO \
   LCASE(Silent)    LIST(Linker)     LIST(IJAccent) LIST(Italic)\
   LIST(ItalCmd)    LIST(PostLink)   LIST(WipeArg)  LIST(VerbEnvir)\
diff --git a/Build/source/texk/chktex/chktex-1.7.1/Test.tex b/Build/source/texk/chktex/chktex-1.7.2/Test.tex
index 503e95ea6e4..503e95ea6e4 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/Test.tex
+++ b/Build/source/texk/chktex/chktex-1.7.2/Test.tex
diff --git a/Build/source/texk/chktex/chktex-1.7.1/Utility.c b/Build/source/texk/chktex/chktex-1.7.2/Utility.c
index 39beaa6cc83..39beaa6cc83 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/Utility.c
+++ b/Build/source/texk/chktex/chktex-1.7.2/Utility.c
diff --git a/Build/source/texk/chktex/chktex-1.7.1/Utility.h b/Build/source/texk/chktex/chktex-1.7.2/Utility.h
index 2bfd4b053dc..b1b31ec7739 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/Utility.h
+++ b/Build/source/texk/chktex/chktex-1.7.2/Utility.h
@@ -173,6 +173,12 @@ char *mystrdup(const char *String);
 int strcasecmp(char *a, char *b);
 #endif
 
+#if !(defined HAVE_DECL_STPCPY && HAVE_DECL_STPCPY)
+static inline char * stpcpy(char *dest, const char *src)
+{
+    return strcpy(dest, src) + strlen(src);
+}
+#endif
 
 
 #endif /* UTILITY_H */
diff --git a/Build/source/texk/chktex/chktex-1.7.1/autogen.sh b/Build/source/texk/chktex/chktex-1.7.2/autogen.sh
index 0982233b129..0982233b129 100755
--- a/Build/source/texk/chktex/chktex-1.7.1/autogen.sh
+++ b/Build/source/texk/chktex/chktex-1.7.2/autogen.sh
diff --git a/Build/source/texk/chktex/chktex-1.7.1/chktex.1 b/Build/source/texk/chktex/chktex-1.7.2/chktex.1
index a3dcc13e3dc..a3dcc13e3dc 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/chktex.1
+++ b/Build/source/texk/chktex/chktex-1.7.2/chktex.1
diff --git a/Build/source/texk/chktex/chktex-1.7.1/chktex.el b/Build/source/texk/chktex/chktex-1.7.2/chktex.el
index e61334796ca..e61334796ca 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/chktex.el
+++ b/Build/source/texk/chktex/chktex-1.7.2/chktex.el
diff --git a/Build/source/texk/chktex/chktex-1.7.1/chktexrc b/Build/source/texk/chktex/chktex-1.7.2/chktexrc
index f14c2522972..f14c2522972 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/chktexrc
+++ b/Build/source/texk/chktex/chktex-1.7.2/chktexrc
diff --git a/Build/source/texk/chktex/chktex-1.7.1/chkweb.1 b/Build/source/texk/chktex/chktex-1.7.2/chkweb.1
index 5cb7063f786..5cb7063f786 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/chkweb.1
+++ b/Build/source/texk/chktex/chktex-1.7.2/chkweb.1
diff --git a/Build/source/texk/chktex/chktex-1.7.1/chkweb.sh b/Build/source/texk/chktex/chktex-1.7.2/chkweb.sh
index 8d6361d1097..8d6361d1097 100755
--- a/Build/source/texk/chktex/chktex-1.7.1/chkweb.sh
+++ b/Build/source/texk/chktex/chktex-1.7.2/chkweb.sh
diff --git a/Build/source/texk/chktex/chktex-1.7.1/configure.in b/Build/source/texk/chktex/chktex-1.7.2/configure.in
index bedb8d4b1a7..930819575d6 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/configure.in
+++ b/Build/source/texk/chktex/chktex-1.7.2/configure.in
@@ -27,7 +27,7 @@ dnl
 
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ChkTeX, 1.7.1)
+AC_INIT(ChkTeX, 1.7.2)
 AC_SUBST(SCRIPTS)
 AC_SUBST(BUILT_SCRIPTS)
 AC_SUBST(ELISPDIR)
@@ -79,7 +79,7 @@ AC_MSG_CHECKING(whether runtime debug info should be used)
 if test "$enable_debug_info" = "yes"; then
   AC_MSG_RESULT(yes)
 else
-  AC_DEFINE(STRIP_DEBUG, 1, "Strip debug info")
+  AC_DEFINE(STRIP_DEBUG, 1, Strip debug info)
   AC_MSG_RESULT(no)
 fi
 
@@ -174,15 +174,15 @@ AC_MSG_RESULT($enable_pcre)
 if test "$enable_pcre" = "yes"; then
   AC_CHECK_PROG(WITH_PCRE, pcre-config, yes, no)
   if test "$WITH_PCRE" = "yes"; then
-    AC_DEFINE(HAVE_PCRE, 1, "Whether PCRE can be used for user warnings.")
+    AC_DEFINE(HAVE_PCRE, 1, Whether PCRE can be used for user warnings.)
     CFLAGS="${CFLAGS} $(pcre-config --cflags-posix)"
     LDFLAGS="${LDFLAGS} $(pcre-config --libs-posix)"
   else
-    AC_DEFINE(HAVE_PCRE, 0, "Whether PCRE can be used for user warnings.")
+    AC_DEFINE(HAVE_PCRE, 0)
     AC_MSG_WARN(PCRE library not found.)
   fi
 else
-    AC_DEFINE(HAVE_PCRE, 0, "Whether PCRE can be used for user warnings.")
+    AC_DEFINE(HAVE_PCRE, 0)
     AC_MSG_WARN(PCRE regular expressions not enabled.)
 fi
 
@@ -196,16 +196,16 @@ AC_EGREP_CPP([yes],
   ], posix_ere=yes, posix_ere=no)
 AC_MSG_RESULT($posix_ere)
 if test "$WITH_PCRE" = "yes"; then
-    AC_DEFINE(HAVE_POSIX_ERE, 0, "Whether POSIX ERE can be used for user warnings.")
+    AC_DEFINE(HAVE_POSIX_ERE, 0, Whether POSIX ERE can be used for user warnings.)
 else
   if test "$enable_posixre" = "yes"; then
     if test "$posix_ere" = "yes"; then
-      AC_DEFINE(HAVE_POSIX_ERE, 1, "Whether PCRE can be used for user warnings.")
+      AC_DEFINE(HAVE_POSIX_ERE, 1)
     else
-      AC_DEFINE(HAVE_POSIX_ERE, 0, "Whether PCRE can be used for user warnings.")
+      AC_DEFINE(HAVE_POSIX_ERE, 0)
     fi
   else
-    AC_DEFINE(HAVE_POSIX_ERE, 0, "Whether PCRE can be used for user warnings.")
+    AC_DEFINE(HAVE_POSIX_ERE, 0)
     AC_MSG_WARN(Regular expressions not enabled.)
   fi
 fi
diff --git a/Build/source/texk/chktex/chktex-1.7.1/deweb.1 b/Build/source/texk/chktex/chktex-1.7.2/deweb.1
index 43770aa1fd3..43770aa1fd3 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/deweb.1
+++ b/Build/source/texk/chktex/chktex-1.7.2/deweb.1
diff --git a/Build/source/texk/chktex/chktex-1.7.1/deweb.in b/Build/source/texk/chktex/chktex-1.7.2/deweb.in
index 91750e636a2..91750e636a2 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/deweb.in
+++ b/Build/source/texk/chktex/chktex-1.7.2/deweb.in
diff --git a/Build/source/texk/chktex/chktex-1.7.1/input.tex b/Build/source/texk/chktex/chktex-1.7.2/input.tex
index 76bc301ff25..76bc301ff25 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/input.tex
+++ b/Build/source/texk/chktex/chktex-1.7.2/input.tex
diff --git a/Build/source/texk/chktex/chktex-1.7.1/lacheck b/Build/source/texk/chktex/chktex-1.7.2/lacheck
index da75d360dee..da75d360dee 100755
--- a/Build/source/texk/chktex/chktex-1.7.1/lacheck
+++ b/Build/source/texk/chktex/chktex-1.7.2/lacheck
diff --git a/Build/source/texk/chktex/chktex-1.7.1/m4/ax_cflags_strict_prototypes.m4 b/Build/source/texk/chktex/chktex-1.7.2/m4/ax_cflags_strict_prototypes.m4
index 06ec9e2f27b..06ec9e2f27b 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/m4/ax_cflags_strict_prototypes.m4
+++ b/Build/source/texk/chktex/chktex-1.7.2/m4/ax_cflags_strict_prototypes.m4
diff --git a/Build/source/texk/chktex/chktex-1.7.1/m4/vl_prog_cc_warnings.m4 b/Build/source/texk/chktex/chktex-1.7.2/m4/vl_prog_cc_warnings.m4
index fe2f6145450..fe2f6145450 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/m4/vl_prog_cc_warnings.m4
+++ b/Build/source/texk/chktex/chktex-1.7.2/m4/vl_prog_cc_warnings.m4
diff --git a/Build/source/texk/chktex/chktex-1.7.1/rmeheader.in b/Build/source/texk/chktex/chktex-1.7.2/rmeheader.in
index 56ca58ae76e..56ca58ae76e 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/rmeheader.in
+++ b/Build/source/texk/chktex/chktex-1.7.2/rmeheader.in
diff --git a/Build/source/texk/chktex/chktex-1.7.1/types.h b/Build/source/texk/chktex/chktex-1.7.2/types.h
index a26b95295e4..a26b95295e4 100644
--- a/Build/source/texk/chktex/chktex-1.7.1/types.h
+++ b/Build/source/texk/chktex/chktex-1.7.2/types.h
diff --git a/Build/source/texk/chktex/chktex.test b/Build/source/texk/chktex/chktex.test
index 3ae9c35e766..43dd8578fc6 100755
--- a/Build/source/texk/chktex/chktex.test
+++ b/Build/source/texk/chktex/chktex.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 rm -f chktest
@@ -11,4 +11,4 @@ rm -f chktest
     $bld/chktex -mall -r -g0 -lchktexrc -v5 Test.tex || exit 1
 ) >chktest || exit 1
 
-diff $srcdir/$CHKTEX_TREE/Test.out chktest || exit 1
+diff $srcdir/$CHKTEX_TREE/Test.posix-ere.out chktest || exit 1
diff --git a/Build/source/texk/chktex/configure b/Build/source/texk/chktex/configure
index 36864bdb109..207dabd6527 100755
--- a/Build/source/texk/chktex/configure
+++ b/Build/source/texk/chktex/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ChkTeX for TeX Live 1.7.1.
+# Generated by GNU Autoconf 2.69 for ChkTeX for TeX Live 1.7.2.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,12 +590,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ChkTeX for TeX Live'
 PACKAGE_TARNAME='chktex-for-tex-live'
-PACKAGE_VERSION='1.7.1'
-PACKAGE_STRING='ChkTeX for TeX Live 1.7.1'
+PACKAGE_VERSION='1.7.2'
+PACKAGE_STRING='ChkTeX for TeX Live 1.7.2'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="chktex-1.7.1/ChkTeX.c"
+ac_unique_file="chktex-1.7.2/ChkTeX.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1333,7 +1333,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 ChkTeX for TeX Live 1.7.1 to adapt to many kinds of systems.
+\`configure' configures ChkTeX for TeX Live 1.7.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1404,7 +1404,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ChkTeX for TeX Live 1.7.1:";;
+     short | recursive ) echo "Configuration of ChkTeX for TeX Live 1.7.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ChkTeX for TeX Live configure 1.7.1
+ChkTeX for TeX Live configure 1.7.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2177,7 +2177,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 ChkTeX for TeX Live $as_me 1.7.1, which was
+It was created by ChkTeX for TeX Live $as_me 1.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2558,7 +2558,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -3874,6 +3874,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -7608,7 +7667,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='chktex-for-tex-live'
- VERSION='1.7.1'
+ VERSION='1.7.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7648,6 +7707,10 @@ 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 -'
 
 
@@ -7655,6 +7718,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -13008,7 +13113,7 @@ fi
 
 
 
-CHKTEX_TREE=chktex-1.7.1
+CHKTEX_TREE=chktex-1.7.2
 
 PERL5='/usr/bin/env perl'
 
@@ -13427,7 +13532,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-ChkTeX for TeX Live config.lt 1.7.1
+ChkTeX for TeX Live config.lt 1.7.2
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -14475,7 +14580,7 @@ fi
 
 ac_config_files="$ac_config_files Makefile"
 
-ac_config_files="$ac_config_files deweb.pl:chktex-1.7.1/deweb.in"
+ac_config_files="$ac_config_files deweb.pl:chktex-1.7.2/deweb.in"
 
 
 cat >confcache <<\_ACEOF
@@ -15024,7 +15129,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 ChkTeX for TeX Live $as_me 1.7.1, which was
+This file was extended by ChkTeX for TeX Live $as_me 1.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15090,7 +15195,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="\\
-ChkTeX for TeX Live config.status 1.7.1
+ChkTeX for TeX Live config.status 1.7.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15503,7 +15608,7 @@ do
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "deweb.pl") CONFIG_FILES="$CONFIG_FILES deweb.pl:chktex-1.7.1/deweb.in" ;;
+    "deweb.pl") CONFIG_FILES="$CONFIG_FILES deweb.pl:chktex-1.7.2/deweb.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -16151,7 +16256,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/texk/chktex/version.ac b/Build/source/texk/chktex/version.ac
index a852157fb4b..3bdbfc6cbd5 100644
--- a/Build/source/texk/chktex/version.ac
+++ b/Build/source/texk/chktex/version.ac
@@ -1,5 +1,5 @@
 dnl
-dnl   Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2012, 2013 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,
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current chktex version
-m4_define([chktex_version], [1.7.1])
+m4_define([chktex_version], [1.7.2])