50 files changed, 47 insertions, 191 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 55e0c76151d..8e8774c6da5 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -37,8 +37,9 @@ devnag - from devnag package installed in texmf-dist.
 
 dtl - ?
 
-dvi2tty 5.3.3 - checked 6nov10
+dvi2tty 5.3.4 - checked 6nov13
   http://www.mesa.nl/pub/dvi2tty/
+  ftp://ftp.mesa.nl/pub/dvi2tty/
 
 dvidvi - ?
 
diff --git a/Build/source/texk/dvi2tty/ChangeLog b/Build/source/texk/dvi2tty/ChangeLog
index 505bb93e00b..78c6bd2069b 100644
--- a/Build/source/texk/dvi2tty/ChangeLog
+++ b/Build/source/texk/dvi2tty/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-13  Peter Breitenlohner   <peb@mppmu.mpg.de>
+
+	Import dvi2tty-5.3.4.
+	* configure.ac: Adapted.
+
 2010-11-09  Peter Breitenlohner   <peb@mppmu.mpg.de>
 
 	* dvi2tty.test: Test input filename without ".dvi".
diff --git a/Build/source/texk/dvi2tty/configure b/Build/source/texk/dvi2tty/configure
index 2ebe4ac0256..0d9829056a6 100755
--- a/Build/source/texk/dvi2tty/configure
+++ b/Build/source/texk/dvi2tty/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for dvi2tty for TeX Live 5.3.3.
+# Generated by GNU Autoconf 2.68 for dvi2tty for TeX Live 5.3.4.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -570,12 +570,12 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvi2tty for TeX Live'
 PACKAGE_TARNAME='dvi2tty-for-tex-live'
-PACKAGE_VERSION='5.3.3'
-PACKAGE_STRING='dvi2tty for TeX Live 5.3.3'
+PACKAGE_VERSION='5.3.4'
+PACKAGE_STRING='dvi2tty for TeX Live 5.3.4'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
-ac_unique_file="dvi2tty-5.3.3/dvi2tty.c"
+ac_unique_file="dvi2tty-5.3.4/dvi2tty.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
@@ -1303,7 +1303,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 dvi2tty for TeX Live 5.3.3 to adapt to many kinds of systems.
+\`configure' configures dvi2tty for TeX Live 5.3.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1374,7 +1374,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvi2tty for TeX Live 5.3.3:";;
+     short | recursive ) echo "Configuration of dvi2tty for TeX Live 5.3.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1486,7 +1486,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvi2tty for TeX Live configure 5.3.3
+dvi2tty for TeX Live configure 5.3.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1966,7 +1966,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 dvi2tty for TeX Live $as_me 5.3.3, which was
+It was created by dvi2tty for TeX Live $as_me 5.3.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7319,7 +7319,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvi2tty-for-tex-live'
- VERSION='5.3.3'
+ VERSION='5.3.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12966,7 +12966,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvi2tty for TeX Live config.lt 5.3.3
+dvi2tty for TeX Live config.lt 5.3.4
 configured by $0, generated by GNU Autoconf 2.68.
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -14018,7 +14018,7 @@ if test "x$kpse_cv_kpse_debug" != xyes; then :
 fi
 
 
-DVI2TTY_TREE=dvi2tty-5.3.3
+DVI2TTY_TREE=dvi2tty-5.3.4
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -14562,7 +14562,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvi2tty for TeX Live $as_me 5.3.3, which was
+This file was extended by dvi2tty for TeX Live $as_me 5.3.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14628,7 +14628,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvi2tty for TeX Live config.status 5.3.3
+dvi2tty for TeX Live config.status 5.3.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvi2tty/configure.ac b/Build/source/texk/dvi2tty/configure.ac
index 0233f715eee..ebaea23d17b 100644
--- a/Build/source/texk/dvi2tty/configure.ac
+++ b/Build/source/texk/dvi2tty/configure.ac
@@ -6,7 +6,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-m4_define([dvi2tty_version], [5.3.3])[]dnl using unmodified dvi2tty source tree
+m4_define([dvi2tty_version], [5.3.4])[]dnl using unmodified dvi2tty source tree
 AC_INIT([dvi2tty for TeX Live], dvi2tty_version, [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([dvi2tty-]dvi2tty_version[/dvi2tty.c])
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/TL-Changes b/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/TL-Changes
deleted file mode 100644
index 509190d5224..00000000000
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/TL-Changes
+++ /dev/null
@@ -1,3 +0,0 @@
-Changes applied to the dvi2tty-5.3.3 tree as obtained from:
-	http://www.mesa.nl/pub/dvi2tty/dvi2tty-5.3.3.tgz.
-
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-04-pager b/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-04-pager
deleted file mode 100644
index fca0ba5c831..00000000000
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-04-pager
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur dvi2tty-5.3.3.orig/dvi2tty.c dvi2tty-5.3.3/dvi2tty.c
---- dvi2tty-5.3.3.orig/dvi2tty.c	2010-10-30 14:37:14.000000000 +0200
-+++ dvi2tty-5.3.3/dvi2tty.c	2010-11-06 18:33:49.064212708 +0100
-@@ -49,7 +49,7 @@
-                               /* have terminals with latin1 chars */
- #define WANTPAGER   TRUE      /* default: try to pipe through a pager (like  */
-                               /* more) if stdout is tty and no -o switch     */
--#define DEFPAGER    "/bin/more"   /* CHANGE TO YOUR LOCAL PAGER            */
-+#define DEFPAGER    "more"    /* CHANGE TO YOUR LOCAL PAGER                  */
- 
-     /*------------------ end of customization constants ---------------------*/
- 
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-07-typo b/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-07-typo
deleted file mode 100644
index 56f904c77d4..00000000000
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-07-typo
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur dvi2tty-5.3.3.orig/dvi2tty.1 dvi2tty-5.3.3/dvi2tty.1
---- dvi2tty-5.3.3.orig/dvi2tty.1	2010-10-30 14:14:10.000000000 +0200
-+++ dvi2tty-5.3.3/dvi2tty.1	2010-11-06 19:38:55.404270272 +0100
-@@ -121,7 +121,7 @@
- .B \-u
- Toggle option to process certain latin1 characters. Use this if your output
- devices supports latin1 cahracters.
--Note this may interfere with -u. Best not to use -u and -s together.
-+Note this may interfere with -s. Best not to use -u and -s together.
- .TP
- .B \-s
- Toggle option to process the special Scandinavian characters that on most (?)
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-60-warnings b/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-60-warnings
deleted file mode 100644
index 5701a623abd..00000000000
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-60-warnings
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ur dvi2tty-5.3.3.orig/disdvi.c dvi2tty-5.3.3/disdvi.c
---- dvi2tty-5.3.3.orig/disdvi.c	2010-10-30 14:39:19.000000000 +0200
-+++ dvi2tty-5.3.3/disdvi.c	2010-11-06 20:09:02.763366429 +0100
-@@ -39,7 +39,7 @@
-  *
-  */
- 
--char *disdvi = "@(#) disdvi.c  2.26 20101027 M.J.E. Mol (c) 1989-2010, marcel@mesa.nl";
-+const char *disdvi = "@(#) disdvi.c  2.26 20101027 M.J.E. Mol (c) 1989-2010, marcel@mesa.nl";
- 
- /*
-  * Include files
-diff -ur dvi2tty-5.3.3.orig/dvi2tty.c dvi2tty-5.3.3/dvi2tty.c
---- dvi2tty-5.3.3.orig/dvi2tty.c	2010-11-06 18:33:49.000000000 +0100
-+++ dvi2tty-5.3.3/dvi2tty.c	2010-11-06 20:09:00.431537476 +0100
-@@ -86,7 +86,7 @@
-  * Variable definitions
-  */
- 
--char *dvi2tty = "@(#) dvi2tty.c  5.3.3 20101030 M.J.E. Mol (c) 1989-2010";
-+const char *dvi2tty = "@(#) dvi2tty.c  5.3.3 20101030 M.J.E. Mol (c) 1989-2010";
- #define VERSION 5.3.3
- 
- 
-diff -ur dvi2tty-5.3.3.orig/dvistuff.c dvi2tty-5.3.3/dvistuff.c
---- dvi2tty-5.3.3.orig/dvistuff.c	2010-10-30 01:27:02.000000000 +0200
-+++ dvi2tty-5.3.3/dvistuff.c	2010-11-06 20:11:49.963973874 +0100
-@@ -99,7 +99,7 @@
-  * Structure and variable definitions
-  */
- 
--char *dvistuff = "@(#) dvistuff.c  5.3.3 20101027 M.J.E. Mol (c) 1989-2010";
-+const char *dvistuff = "@(#) dvistuff.c  5.3.3 20101027 M.J.E. Mol (c) 1989-2010";
- 
- typedef struct {
-     long hh;
-@@ -1434,7 +1434,7 @@
- 
- 
- #define    NJSUBS        33
--char *jsf_names[]={
-+const char *jsf_names[]={
-     "sy", "roma", "hira", "kata", "greek", "russian", "keisen",
-     "ka", "kb", "kc", "kd", "ke", "kf", "kg", "kh", "ki", "kj",
-     "kk", "kl", "km", "kn", "ko", "kp", "kq", "kr", "ks", "kt",
-@@ -1469,7 +1469,7 @@
- void setfont(long fntnum)
- {
-     char * s;
--    char * d;
-+    const char * d;
- 
-     symbolfont = FALSE;
-     ttfont = FALSE;
-@@ -1492,7 +1492,7 @@
- 
-     s = fnt->name;
-     if (printfont) {
--         d = (char *) delim;      /* print delim and font name if -b was chosen */
-+         d = delim;      /* print delim and font name if -b was chosen */
-          while (*d) {putcharacter(*d); d++;}
-          while (*s) {putcharacter(*s); s++;}
-          while (d-- > delim) {putcharacter(*d);}
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-61-bug-fix b/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-61-bug-fix
deleted file mode 100644
index 7d7cb6e9c62..00000000000
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-61-bug-fix
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ur dvi2tty-5.3.3.orig/dvi2tty.c dvi2tty-5.3.3/dvi2tty.c
---- dvi2tty-5.3.3.orig/dvi2tty.c	2010-11-06 20:09:00.000000000 +0100
-+++ dvi2tty-5.3.3/dvi2tty.c	2010-11-09 11:47:09.561737069 +0100
-@@ -588,8 +588,8 @@
-     if (!readable_file(DVIfilename))
- #else
-     if ((i < 5) || strcmp(str+i-4, ".dvi"))
--        strcat(DVIfilename, ".dvi");
- #endif
-+        strcat(DVIfilename, ".dvi");
- 
-     return;
- 
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-62-kpathsea b/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-62-kpathsea
deleted file mode 100644
index 341ba35c64f..00000000000
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/patch-62-kpathsea
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ur dvi2tty-5.3.3.orig/dvi2tty.c dvi2tty-5.3.3/dvi2tty.c
---- dvi2tty-5.3.3.orig/dvi2tty.c	2010-11-09 11:47:09.000000000 +0100
-+++ dvi2tty-5.3.3/dvi2tty.c	2010-11-09 11:58:09.742662164 +0100
-@@ -533,44 +533,6 @@
- 
- 
- 
--#ifdef KPATHSEA
--# ifdef __DJGPP__
--  /* `stat' is way too expensive for such a simple job.  */
--# define READABLE(fn, st) \
--                  (access (fn, R_OK) == 0 && access (fn, D_OK) == -1)
--#else
--# define READABLE(fn, st) \
--                  (access (fn, R_OK) == 0 && stat (fn, &(st)) == 0 && !S_ISDIR (st.st_mode))
--#endif
--
--static char *
--readable_file(char *name)
--{
--    char *ret;
--
--#ifdef WIN32
--    unsigned int fa;
--
--    fa = GetFileAttributes(name);
--    if (fa == 0xFFFFFFFF)
--        ret = NULL;
--    else if ((fa & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY)
--        ret = NULL;
--    else
--        ret = name;
--#else /* ! WIN32 */
--    struct stat st;
--  
--    if (READABLE (name, st))
--        ret = name;
--    else /* Some other error.  */
--        ret = NULL;
--#endif  
--    return ret;
--}
--#endif
--
--
- 
- /*
-  * GETFNAME -- {Make sure we have a .dvi filename.
-@@ -585,7 +547,7 @@
-         usage(ign);
-     strcpy(DVIfilename, str);
- #ifdef KPATHSEA
--    if (!readable_file(DVIfilename))
-+    if (!kpse_readable_file(DVIfilename))
- #else
-     if ((i < 5) || strcmp(str+i-4, ".dvi"))
- #endif
-diff -ur dvi2tty-5.3.3.orig/dvi2tty.h dvi2tty-5.3.3/dvi2tty.h
---- dvi2tty-5.3.3.orig/dvi2tty.h	2010-10-30 14:38:49.000000000 +0200
-+++ dvi2tty-5.3.3/dvi2tty.h	2010-11-09 11:58:14.187495166 +0100
-@@ -35,6 +35,7 @@
- #if defined(KPATHSEA)
- # define NO_DEBUG 1
- # include <kpathsea/config.h>
-+# include <kpathsea/readable.h>
- # include <sys/types.h>
- # include <sys/stat.h>
- #else
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/ChangeLog b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog
index bfdf3aab7cd..c2d90b0c0e4 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3-PATCHES/ChangeLog
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Import dvi2tty-5.3.4.
+	* patch-*-* (removed): Now all in distribution.
+
 2010-11-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* patch-01-texk (removed): Avoid unnecessary modifications.
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/TL-Changes b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/TL-Changes
new file mode 100644
index 00000000000..d903f98fcf8
--- /dev/null
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/TL-Changes
@@ -0,0 +1,6 @@
+Changes applied to the dvi2tty-5.3.4 tree as obtained from:
+	http://www.mesa.nl/pub/dvi2tty/dvi2tty-5.3.4.tgz.
+
+Removed:
+	nagios.init
+
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/COPYING b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/COPYING
index 520e7de1d76..520e7de1d76 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/COPYING
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/COPYING
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/Changelog b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/Changelog
index 6f8ccd5abd8..135aa30bf0c 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/Changelog
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/Changelog
@@ -1,4 +1,13 @@
 /******************************************************************************
+ * Marcel Mol: 20101113  (marcel@mesa.nl)
+ *               Version 5.3.4
+ *               Fix VERSION code
+ *               From TeXLive:
+ *               - DEFPAGER form /bin/more to more
+ *               - kapthsea: fix bbug to handle input filenames without ".dvi".
+ *               - kpathsea - use library function instead of duplicated code.
+ *               - man page fixes
+ *               - const char fixes
  * Marcel Mol: 20101030  (marcel@mesa.nl)
  *               Version 5.3.3
  *               included patches from TexLive and Joerg Prante, and Kenshi Muto
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/DVI.format b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/DVI.format
index 4ce5d3936a3..4ce5d3936a3 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/DVI.format
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/DVI.format
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/Makefile b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/Makefile
index 6f8c5e66f5e..6f8c5e66f5e 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/Makefile
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/Makefile
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/README b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/README
index 266aa9de1a7..266aa9de1a7 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/README
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/README
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/README.MAC b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/README.MAC
index 2aa17b3055b..2aa17b3055b 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/README.MAC
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/README.MAC
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/README.ORG b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/README.ORG
index 3eeefc4684c..3eeefc4684c 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/README.ORG
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/README.ORG
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/README.VMS b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/README.VMS
index 1d07f22389c..1d07f22389c 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/README.VMS
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/README.VMS
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/TODO b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/TODO
index 56b7facaad0..56b7facaad0 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/TODO
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/TODO
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/UNIXtoMacLib/getopt.c b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/UNIXtoMacLib/getopt.c
index a0db51e2520..a0db51e2520 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/UNIXtoMacLib/getopt.c
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/UNIXtoMacLib/getopt.c
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/UNIXtoMacLib/macintosh.h b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/UNIXtoMacLib/macintosh.h
index 24843f507c7..24843f507c7 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/UNIXtoMacLib/macintosh.h
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/UNIXtoMacLib/macintosh.h
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/UNIXtoMacLib/unix-to-macintosh.c b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/UNIXtoMacLib/unix-to-macintosh.c
index f29b0334256..f29b0334256 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/UNIXtoMacLib/unix-to-macintosh.c
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/UNIXtoMacLib/unix-to-macintosh.c
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/commands.h b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/commands.h
index 46bf84530df..46bf84530df 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/commands.h
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/commands.h
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/README.Debian b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/README.Debian
index 040c15867c1..040c15867c1 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/README.Debian
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/README.Debian
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/changelog b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/changelog
index 97488d5927a..97488d5927a 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/changelog
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/changelog
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/compat b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/compat
index b8626c4cff2..b8626c4cff2 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/compat
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/compat
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/control b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/control
index df02fc909ef..df02fc909ef 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/control
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/control
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/copyright b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/copyright
index b3277a854cd..b3277a854cd 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/copyright
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/copyright
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/dirs b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/dirs
index 98d15831b4c..98d15831b4c 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/dirs
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/dirs
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/docs b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/docs
index e7473667e8b..e7473667e8b 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/docs
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/docs
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/jdvi2tty-ascii.patch.header b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/jdvi2tty-ascii.patch.header
index a3c9752ba49..a3c9752ba49 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/jdvi2tty-ascii.patch.header
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/jdvi2tty-ascii.patch.header
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/postinst b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/postinst
index 47877c36f67..47877c36f67 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/postinst
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/postinst
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/prerm b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/prerm
index ff3fbe963de..ff3fbe963de 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/prerm
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/prerm
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/rules b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/rules
index 5c919f9eebd..5c919f9eebd 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/debian/rules
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/debian/rules
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/disdvi.1 b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.1
index e59ce5ce46b..e59ce5ce46b 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/disdvi.1
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.1
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/disdvi.c b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.c
index b6c8743384d..b6c8743384d 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/disdvi.c
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.c
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.1 b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.1
index 443308ccd57..443308ccd57 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.1
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.1
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.DCL b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.DCL
index 637a9c2000d..637a9c2000d 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.DCL
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.DCL
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.c b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.c
index 5f40aaea787..a673c1f21ad 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.c
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.c
@@ -49,7 +49,7 @@
                               /* have terminals with latin1 chars */
 #define WANTPAGER   TRUE      /* default: try to pipe through a pager (like  */
                               /* more) if stdout is tty and no -o switch     */
-#define DEFPAGER    "more"    /* CHANGE TO YOUR LOCAL PAGER                  */
+#define DEFPAGER    "more"   /* CHANGE TO YOUR LOCAL PAGER            */
 
     /*------------------ end of customization constants ---------------------*/
 
@@ -86,8 +86,7 @@
  * Variable definitions
  */
 
-const char *dvi2tty = "@(#) dvi2tty.c  5.3.3 20101030 M.J.E. Mol (c) 1989-2010";
-#define VERSION 5.3.3
+const char *dvi2tty = "@(#) dvi2tty.c " VERSION " 20101030 M.J.E. Mol (c) 1989-2010";
 
 
 printlisttype * currentpage;    /* current page to print                     */
@@ -533,7 +532,6 @@ void plcnxt(int pagnr)
 
 
 
-
 /*
  * GETFNAME -- {Make sure we have a .dvi filename.
  */
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.h b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.h
index e18d4a2a167..e4f7294e1c7 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.h
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.h
@@ -18,9 +18,12 @@
  *
  */
 
+#define VERSION "5.3.4"
+
 #define Copyright "dvi2tty  Copyright (C) 1984, 1985, 1986 Svante Lindahl.\n\
 Copyright (C) 1989-2010 M.J.E. Mol, MESA Consulting B.V."
 
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.lsm b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.lsm
index 1fe3c431d07..1fe3c431d07 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.lsm
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.lsm
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.tex b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.tex
index b33e48858fa..b33e48858fa 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvi2tty.tex
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.tex
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvistuff.c b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c
index f40e2a48bf2..4e37a1f30f7 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/dvistuff.c
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvistuff.c
@@ -99,7 +99,7 @@
  * Structure and variable definitions
  */
 
-const char *dvistuff = "@(#) dvistuff.c  5.3.3 20101027 M.J.E. Mol (c) 1989-2010";
+const char *dvistuff = "@(#) dvistuff.c  " VERSION " 20101027 M.J.E. Mol (c) 1989-2010";
 
 typedef struct {
     long hh;
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/ligtest.dvi b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/ligtest.dvi
index b715d670d8e..b715d670d8e 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/ligtest.dvi
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/ligtest.dvi
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/ligtest.tex b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/ligtest.tex
index 22bf91dafd9..22bf91dafd9 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/ligtest.tex
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/ligtest.tex
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/test.dvi b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/test.dvi
index b1c0c097ab4..b1c0c097ab4 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/test.dvi
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/test.dvi
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/test.tex b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/test.tex
index a282f0a8fe7..a282f0a8fe7 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/test.tex
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/test.tex
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/test_org.dvi b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/test_org.dvi
index 072ec09acf4..072ec09acf4 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.3/test/test_org.dvi
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/test/test_org.dvi