123 files changed, 34 insertions, 18 deletions

diff --git a/Master/bin/x86_64-linux/afm2pl b/Master/bin/x86_64-linux/afm2pl
index b790442b9f5..640eb391a1a 100755
--- a/Master/bin/x86_64-linux/afm2pl
+++ b/Master/bin/x86_64-linux/afm2pl
diff --git a/Master/bin/x86_64-linux/afm2tfm b/Master/bin/x86_64-linux/afm2tfm
index 167d0802799..959d399da07 100755
--- a/Master/bin/x86_64-linux/afm2tfm
+++ b/Master/bin/x86_64-linux/afm2tfm
diff --git a/Master/bin/x86_64-linux/aleph b/Master/bin/x86_64-linux/aleph
index e3871da780c..b5a328abbe5 100755
--- a/Master/bin/x86_64-linux/aleph
+++ b/Master/bin/x86_64-linux/aleph
diff --git a/Master/bin/x86_64-linux/bg5conv b/Master/bin/x86_64-linux/bg5conv
index 93cde9026c0..c7dc5a102ed 100755
--- a/Master/bin/x86_64-linux/bg5conv
+++ b/Master/bin/x86_64-linux/bg5conv
diff --git a/Master/bin/x86_64-linux/bibtex b/Master/bin/x86_64-linux/bibtex
index 7a0da7298f7..fbcde76fc80 100755
--- a/Master/bin/x86_64-linux/bibtex
+++ b/Master/bin/x86_64-linux/bibtex
diff --git a/Master/bin/x86_64-linux/bibtex8 b/Master/bin/x86_64-linux/bibtex8
index b7e3e796911..e0ea2e0d2bb 100755
--- a/Master/bin/x86_64-linux/bibtex8
+++ b/Master/bin/x86_64-linux/bibtex8
diff --git a/Master/bin/x86_64-linux/cef5conv b/Master/bin/x86_64-linux/cef5conv
index bd697ecebff..715b71bec48 100755
--- a/Master/bin/x86_64-linux/cef5conv
+++ b/Master/bin/x86_64-linux/cef5conv
diff --git a/Master/bin/x86_64-linux/cefconv b/Master/bin/x86_64-linux/cefconv
index b897b618570..40009a0f056 100755
--- a/Master/bin/x86_64-linux/cefconv
+++ b/Master/bin/x86_64-linux/cefconv
diff --git a/Master/bin/x86_64-linux/cefsconv b/Master/bin/x86_64-linux/cefsconv
index 31482e25e69..abf5ef9fd0e 100755
--- a/Master/bin/x86_64-linux/cefsconv
+++ b/Master/bin/x86_64-linux/cefsconv
diff --git a/Master/bin/x86_64-linux/cfftot1 b/Master/bin/x86_64-linux/cfftot1
index 37e2470973e..c3d5cdf81ac 100755
--- a/Master/bin/x86_64-linux/cfftot1
+++ b/Master/bin/x86_64-linux/cfftot1
diff --git a/Master/bin/x86_64-linux/ctangle b/Master/bin/x86_64-linux/ctangle
index 54aa7230f38..188485ad13b 100755
--- a/Master/bin/x86_64-linux/ctangle
+++ b/Master/bin/x86_64-linux/ctangle
diff --git a/Master/bin/x86_64-linux/ctie b/Master/bin/x86_64-linux/ctie
index 55e4f5d677c..ce6cd131ca1 100755
--- a/Master/bin/x86_64-linux/ctie
+++ b/Master/bin/x86_64-linux/ctie
diff --git a/Master/bin/x86_64-linux/cweave b/Master/bin/x86_64-linux/cweave
index ff5a0e724da..f28d4f70ded 100755
--- a/Master/bin/x86_64-linux/cweave
+++ b/Master/bin/x86_64-linux/cweave
diff --git a/Master/bin/x86_64-linux/detex b/Master/bin/x86_64-linux/detex
index 66377b80b4f..7562198d29d 100755
--- a/Master/bin/x86_64-linux/detex
+++ b/Master/bin/x86_64-linux/detex
diff --git a/Master/bin/x86_64-linux/devnag b/Master/bin/x86_64-linux/devnag
index e7634e431eb..119eea12333 100755
--- a/Master/bin/x86_64-linux/devnag
+++ b/Master/bin/x86_64-linux/devnag
diff --git a/Master/bin/x86_64-linux/disdvi b/Master/bin/x86_64-linux/disdvi
index 1d2d28481a1..df167064cef 100755
--- a/Master/bin/x86_64-linux/disdvi
+++ b/Master/bin/x86_64-linux/disdvi
diff --git a/Master/bin/x86_64-linux/dmp b/Master/bin/x86_64-linux/dmp
index e97c372183f..cf7dd2156c8 100755
--- a/Master/bin/x86_64-linux/dmp
+++ b/Master/bin/x86_64-linux/dmp
diff --git a/Master/bin/x86_64-linux/dt2dv b/Master/bin/x86_64-linux/dt2dv
index 80c10612159..7408d0aeaba 100755
--- a/Master/bin/x86_64-linux/dt2dv
+++ b/Master/bin/x86_64-linux/dt2dv
diff --git a/Master/bin/x86_64-linux/dv2dt b/Master/bin/x86_64-linux/dv2dt
index d1711570a29..4a68980fdc0 100755
--- a/Master/bin/x86_64-linux/dv2dt
+++ b/Master/bin/x86_64-linux/dv2dt
diff --git a/Master/bin/x86_64-linux/dvi2tty b/Master/bin/x86_64-linux/dvi2tty
index faf7abaf84e..1f2fdc38cac 100755
--- a/Master/bin/x86_64-linux/dvi2tty
+++ b/Master/bin/x86_64-linux/dvi2tty
diff --git a/Master/bin/x86_64-linux/dvibook b/Master/bin/x86_64-linux/dvibook
index 407fc8df814..88d68208d7c 100755
--- a/Master/bin/x86_64-linux/dvibook
+++ b/Master/bin/x86_64-linux/dvibook
diff --git a/Master/bin/x86_64-linux/dviconcat b/Master/bin/x86_64-linux/dviconcat
index 3b86213d002..7a52444cf53 100755
--- a/Master/bin/x86_64-linux/dviconcat
+++ b/Master/bin/x86_64-linux/dviconcat
diff --git a/Master/bin/x86_64-linux/dvicopy b/Master/bin/x86_64-linux/dvicopy
index f52f6ed14f9..1b93d68cb64 100755
--- a/Master/bin/x86_64-linux/dvicopy
+++ b/Master/bin/x86_64-linux/dvicopy
diff --git a/Master/bin/x86_64-linux/dvidvi b/Master/bin/x86_64-linux/dvidvi
index a3fed9a55e8..215b6d7dd46 100755
--- a/Master/bin/x86_64-linux/dvidvi
+++ b/Master/bin/x86_64-linux/dvidvi
diff --git a/Master/bin/x86_64-linux/dvilj b/Master/bin/x86_64-linux/dvilj
index 8ee0bb4cce1..0ccdd9bfb8f 100755
--- a/Master/bin/x86_64-linux/dvilj
+++ b/Master/bin/x86_64-linux/dvilj
diff --git a/Master/bin/x86_64-linux/dvilj2p b/Master/bin/x86_64-linux/dvilj2p
index d592c51e706..20ca0312c1d 100755
--- a/Master/bin/x86_64-linux/dvilj2p
+++ b/Master/bin/x86_64-linux/dvilj2p
diff --git a/Master/bin/x86_64-linux/dvilj4 b/Master/bin/x86_64-linux/dvilj4
index bbf7c648928..b08f77f7daf 100755
--- a/Master/bin/x86_64-linux/dvilj4
+++ b/Master/bin/x86_64-linux/dvilj4
diff --git a/Master/bin/x86_64-linux/dvilj4l b/Master/bin/x86_64-linux/dvilj4l
index 018358a4314..d491b81412d 100755
--- a/Master/bin/x86_64-linux/dvilj4l
+++ b/Master/bin/x86_64-linux/dvilj4l
diff --git a/Master/bin/x86_64-linux/dvipdfm b/Master/bin/x86_64-linux/dvipdfm
index e7c65f7bf37..7dea73e4b40 100755
--- a/Master/bin/x86_64-linux/dvipdfm
+++ b/Master/bin/x86_64-linux/dvipdfm
diff --git a/Master/bin/x86_64-linux/dvipdfmx b/Master/bin/x86_64-linux/dvipdfmx
index a070fa48394..53c465332ba 100755
--- a/Master/bin/x86_64-linux/dvipdfmx
+++ b/Master/bin/x86_64-linux/dvipdfmx
diff --git a/Master/bin/x86_64-linux/dvipng b/Master/bin/x86_64-linux/dvipng
index 77c9dda6488..9348ebd5c1e 100755
--- a/Master/bin/x86_64-linux/dvipng
+++ b/Master/bin/x86_64-linux/dvipng
diff --git a/Master/bin/x86_64-linux/dvips b/Master/bin/x86_64-linux/dvips
index 36900f2c7a4..ce208906711 100755
--- a/Master/bin/x86_64-linux/dvips
+++ b/Master/bin/x86_64-linux/dvips
diff --git a/Master/bin/x86_64-linux/dviselect b/Master/bin/x86_64-linux/dviselect
index e5f16952933..816d0fb3517 100755
--- a/Master/bin/x86_64-linux/dviselect
+++ b/Master/bin/x86_64-linux/dviselect
diff --git a/Master/bin/x86_64-linux/dvitodvi b/Master/bin/x86_64-linux/dvitodvi
index e75f88c64cd..717b0b61012 100755
--- a/Master/bin/x86_64-linux/dvitodvi
+++ b/Master/bin/x86_64-linux/dvitodvi
diff --git a/Master/bin/x86_64-linux/dvitomp b/Master/bin/x86_64-linux/dvitomp
index 9116ae628f7..83ee8df8770 100755
--- a/Master/bin/x86_64-linux/dvitomp
+++ b/Master/bin/x86_64-linux/dvitomp
diff --git a/Master/bin/x86_64-linux/dvitype b/Master/bin/x86_64-linux/dvitype
index a78478e7605..e3c2a976b41 100755
--- a/Master/bin/x86_64-linux/dvitype
+++ b/Master/bin/x86_64-linux/dvitype
diff --git a/Master/bin/x86_64-linux/ebb b/Master/bin/x86_64-linux/ebb
index 2362cada746..a6353e1c8b6 100755
--- a/Master/bin/x86_64-linux/ebb
+++ b/Master/bin/x86_64-linux/ebb
diff --git a/Master/bin/x86_64-linux/epsffit b/Master/bin/x86_64-linux/epsffit
index f51ef30b9d5..1d951586dcb 100755
--- a/Master/bin/x86_64-linux/epsffit
+++ b/Master/bin/x86_64-linux/epsffit
diff --git a/Master/bin/x86_64-linux/epstopdf b/Master/bin/x86_64-linux/epstopdf
index e7ea5f239df..0fb015d4420 100755
--- a/Master/bin/x86_64-linux/epstopdf
+++ b/Master/bin/x86_64-linux/epstopdf
@@ -58,13 +58,17 @@ use strict;
 #    * Quote OutFilename
 #  2005/10/01 v2.9.3draft (Gerben Wierda)
 #    * Quote OutFilename
+#  2005/10/06 v2.9.4gw (Gerben Wierda)
+#    * This has become the official version for now
+#  2005/10/06 v2.9.5gw (Gerben Wierda)
+#    * Fixed a horrendous bug in the (atend) handling code
 #
 
 ### program identification
 my $program = "epstopdf";
-my $filedate="2003/04/20";
-my $fileversion="2.9.3draft";
-my $copyright = "Copyright 1998-2002 by Sebastian Rahtz et al.";
+my $filedate="2006/01/29";
+my $fileversion="2.9.5gw";
+my $copyright = "Copyright 1998-2006 by Sebastian Rahtz et al.";
 my $title = "\U$program\E $fileversion, $filedate - $copyright\n";
 
 ### ghostscript command name
@@ -249,13 +253,14 @@ if ($buflen > 0) {
   # that array until it is empty, then move again back to <IN>
   $buf .= <IN> unless eof( IN);
   $buflen = length( $buf);
+  $bufarraypos = 0;
 
   # Some extra magic is needed here: if we set $/ to \r, Perl's re engine
   # still thinks eol is \n in regular expressions (not very nice) so we
   # cannot split on ^, but have to split on \r and reappend those.
   if ($/ eq "\r") {
-    @bufarray = split( /\r/ms, $buf);
-    grep( $_ .= "\r", @bufarray);
+    @bufarray = split( /\r/ms, $buf); # split on \r
+    grep( $_ .= "\r", @bufarray); # re-append \r to each array item
   }
   else {
     @bufarray = split( /^/ms, $buf);
@@ -268,6 +273,8 @@ sub getline {
     $_ = shift( @bufarray);
     unshift( @parsedbufarray, $_); # for myseek and mytell
     $bufarraypos += length( $_);
+    # debug "getline from array. bufarraypos = $bufarraypos";
+    # debug "*** READ: $_";
   }
   else {
     $_ = <IN>;
@@ -278,31 +285,40 @@ sub getline {
 ### mytell and myseek, work on <IN> only
 sub mytell {
   if ($#bufarray) {
+    # debug "Telling ARRAY position $bufarraypos";
     return $bufarraypos;
   }
   else {
-    return tell( IN);
+    my $pos = tell( IN);
+    # debug "Telling FILE position $pos";
+    return $pos;
   }
 }
 
 sub myseek {
   my $pos = shift;
+  # debug "Seeking to position $pos in input";
   if ($pos < $buflen) {
+    # debug "myseek position $pos < buffer size $buflen";
     # We were still parsing the array, reset to the end of buf and
     # move to the right line in the array.
-    # Now, move stuff from the @parsedbufarray until we are back at $pos
+    # Now, move stuff from the @parsedbufarray back until we are back at $pos
     my $tmpline;
-    while ($pos > 0) {
+    while ($bufarraypos > $pos) {
+      # debug "myseek bufarray position $bufarraypos > position $pos";
       # we test on parsedbufarray to prevent an infinite loop on
       # a programming error (DEVELOP only)
       die "Programming error 1\n" unless $#parsedbufarray;
-      $tmpline = pop( @parsedbufarray);
-      $pos -= length( $tmpline);
-      push( @bufarray, $tmpline);
+      $tmpline = shift( @parsedbufarray);
+      $bufarraypos -= length( $tmpline);
+      unshift( @bufarray, $tmpline);
+      debug "*** UNREAD: $tmpline";
     }
+    # debug "Returning to ARRAY size position $buflen (bufarraypos = $bufarraypos)";
     return seek( IN, $buflen, 0);
   }
   else {
+    # debug "Seeking to FILE position $pos";
     return seek( IN, $pos, 0);
   }
 }
diff --git a/Master/bin/x86_64-linux/extconv b/Master/bin/x86_64-linux/extconv
index 3967df679d6..8ef93a8866d 100755
--- a/Master/bin/x86_64-linux/extconv
+++ b/Master/bin/x86_64-linux/extconv
diff --git a/Master/bin/x86_64-linux/gftodvi b/Master/bin/x86_64-linux/gftodvi
index bf28191c03d..1870bfbd61a 100755
--- a/Master/bin/x86_64-linux/gftodvi
+++ b/Master/bin/x86_64-linux/gftodvi
diff --git a/Master/bin/x86_64-linux/gftopk b/Master/bin/x86_64-linux/gftopk
index c242cfbe907..883893e3471 100755
--- a/Master/bin/x86_64-linux/gftopk
+++ b/Master/bin/x86_64-linux/gftopk
diff --git a/Master/bin/x86_64-linux/gftype b/Master/bin/x86_64-linux/gftype
index 1312ad21ed7..9659493ad77 100755
--- a/Master/bin/x86_64-linux/gftype
+++ b/Master/bin/x86_64-linux/gftype
diff --git a/Master/bin/x86_64-linux/gsftopk b/Master/bin/x86_64-linux/gsftopk
index cde312d76ca..c0f9a66daf5 100755
--- a/Master/bin/x86_64-linux/gsftopk
+++ b/Master/bin/x86_64-linux/gsftopk
diff --git a/Master/bin/x86_64-linux/hbf2gf b/Master/bin/x86_64-linux/hbf2gf
index 345e0e4555c..6e3867131c7 100755
--- a/Master/bin/x86_64-linux/hbf2gf
+++ b/Master/bin/x86_64-linux/hbf2gf
diff --git a/Master/bin/x86_64-linux/info b/Master/bin/x86_64-linux/info
index 722fa0811b9..14ed9435ae7 100755
--- a/Master/bin/x86_64-linux/info
+++ b/Master/bin/x86_64-linux/info
diff --git a/Master/bin/x86_64-linux/infokey b/Master/bin/x86_64-linux/infokey
index ace073257ed..346d0b91e2e 100755
--- a/Master/bin/x86_64-linux/infokey
+++ b/Master/bin/x86_64-linux/infokey
diff --git a/Master/bin/x86_64-linux/install-info b/Master/bin/x86_64-linux/install-info
index 86f4edd53ad..12feaa97729 100755
--- a/Master/bin/x86_64-linux/install-info
+++ b/Master/bin/x86_64-linux/install-info
diff --git a/Master/bin/x86_64-linux/kpseaccess b/Master/bin/x86_64-linux/kpseaccess
index 84054a2ca93..1aee9011f15 100755
--- a/Master/bin/x86_64-linux/kpseaccess
+++ b/Master/bin/x86_64-linux/kpseaccess
diff --git a/Master/bin/x86_64-linux/kpsereadlink b/Master/bin/x86_64-linux/kpsereadlink
index 14e9153647f..fecf062af0c 100755
--- a/Master/bin/x86_64-linux/kpsereadlink
+++ b/Master/bin/x86_64-linux/kpsereadlink
diff --git a/Master/bin/x86_64-linux/kpsestat b/Master/bin/x86_64-linux/kpsestat
index 4d8922ae57b..2050b97b33c 100755
--- a/Master/bin/x86_64-linux/kpsestat
+++ b/Master/bin/x86_64-linux/kpsestat
diff --git a/Master/bin/x86_64-linux/kpsewhich b/Master/bin/x86_64-linux/kpsewhich
index 1a1f5007b96..3281b048b4b 100755
--- a/Master/bin/x86_64-linux/kpsewhich
+++ b/Master/bin/x86_64-linux/kpsewhich
diff --git a/Master/bin/x86_64-linux/lacheck b/Master/bin/x86_64-linux/lacheck
index 73289745fae..00def1f7bb4 100755
--- a/Master/bin/x86_64-linux/lacheck
+++ b/Master/bin/x86_64-linux/lacheck
diff --git a/Master/bin/x86_64-linux/mag b/Master/bin/x86_64-linux/mag
index 7c27df6a805..a7c7ec5600d 100755
--- a/Master/bin/x86_64-linux/mag
+++ b/Master/bin/x86_64-linux/mag
diff --git a/Master/bin/x86_64-linux/makeindex b/Master/bin/x86_64-linux/makeindex
index 8da4b106b47..6c0c3ef1b7d 100755
--- a/Master/bin/x86_64-linux/makeindex
+++ b/Master/bin/x86_64-linux/makeindex
diff --git a/Master/bin/x86_64-linux/makeinfo b/Master/bin/x86_64-linux/makeinfo
index 441fca2e119..cc328448f1e 100755
--- a/Master/bin/x86_64-linux/makeinfo
+++ b/Master/bin/x86_64-linux/makeinfo
diff --git a/Master/bin/x86_64-linux/makempx b/Master/bin/x86_64-linux/makempx
index e56fd7d5ce4..eb3422851c2 100755
--- a/Master/bin/x86_64-linux/makempx
+++ b/Master/bin/x86_64-linux/makempx
diff --git a/Master/bin/x86_64-linux/mf b/Master/bin/x86_64-linux/mf
index de5913aea19..b6ba9a93bf7 100755
--- a/Master/bin/x86_64-linux/mf
+++ b/Master/bin/x86_64-linux/mf
diff --git a/Master/bin/x86_64-linux/mf-nowin b/Master/bin/x86_64-linux/mf-nowin
index a3cda1a7383..6b64c801927 100755
--- a/Master/bin/x86_64-linux/mf-nowin
+++ b/Master/bin/x86_64-linux/mf-nowin
diff --git a/Master/bin/x86_64-linux/mft b/Master/bin/x86_64-linux/mft
index 7d9b960b43a..6f53a1062cf 100755
--- a/Master/bin/x86_64-linux/mft
+++ b/Master/bin/x86_64-linux/mft
diff --git a/Master/bin/x86_64-linux/mmafm b/Master/bin/x86_64-linux/mmafm
index 7cbbfeff353..7c5df67bbe6 100755
--- a/Master/bin/x86_64-linux/mmafm
+++ b/Master/bin/x86_64-linux/mmafm
diff --git a/Master/bin/x86_64-linux/mmpfb b/Master/bin/x86_64-linux/mmpfb
index 59da9fbea60..49464b25b02 100755
--- a/Master/bin/x86_64-linux/mmpfb
+++ b/Master/bin/x86_64-linux/mmpfb
diff --git a/Master/bin/x86_64-linux/mpost b/Master/bin/x86_64-linux/mpost
index 7ac274bf1c7..e6d181d557e 100755
--- a/Master/bin/x86_64-linux/mpost
+++ b/Master/bin/x86_64-linux/mpost
diff --git a/Master/bin/x86_64-linux/mpto b/Master/bin/x86_64-linux/mpto
index 06633d80033..e8fb38b8cf4 100755
--- a/Master/bin/x86_64-linux/mpto
+++ b/Master/bin/x86_64-linux/mpto
diff --git a/Master/bin/x86_64-linux/musixflx b/Master/bin/x86_64-linux/musixflx
index 789431ad8a3..e3c7dbe5187 100755
--- a/Master/bin/x86_64-linux/musixflx
+++ b/Master/bin/x86_64-linux/musixflx
diff --git a/Master/bin/x86_64-linux/newer b/Master/bin/x86_64-linux/newer
index 9e5f2db5966..1fdce454f18 100755
--- a/Master/bin/x86_64-linux/newer
+++ b/Master/bin/x86_64-linux/newer
diff --git a/Master/bin/x86_64-linux/odvicopy b/Master/bin/x86_64-linux/odvicopy
index 2246314d506..66e4333835c 100755
--- a/Master/bin/x86_64-linux/odvicopy
+++ b/Master/bin/x86_64-linux/odvicopy
diff --git a/Master/bin/x86_64-linux/odvitype b/Master/bin/x86_64-linux/odvitype
index c45a4e91608..ae2afd37517 100755
--- a/Master/bin/x86_64-linux/odvitype
+++ b/Master/bin/x86_64-linux/odvitype
diff --git a/Master/bin/x86_64-linux/omega b/Master/bin/x86_64-linux/omega
index fd8323adf36..1bcd564c551 100755
--- a/Master/bin/x86_64-linux/omega
+++ b/Master/bin/x86_64-linux/omega
diff --git a/Master/bin/x86_64-linux/omfonts b/Master/bin/x86_64-linux/omfonts
index 97ad05caf24..64b0a2dd70e 100755
--- a/Master/bin/x86_64-linux/omfonts
+++ b/Master/bin/x86_64-linux/omfonts
diff --git a/Master/bin/x86_64-linux/otangle b/Master/bin/x86_64-linux/otangle
index cc6a67feaa5..64e0f7ebfc3 100755
--- a/Master/bin/x86_64-linux/otangle
+++ b/Master/bin/x86_64-linux/otangle
diff --git a/Master/bin/x86_64-linux/otfinfo b/Master/bin/x86_64-linux/otfinfo
index 46c8af6e84b..41dd971c4c8 100755
--- a/Master/bin/x86_64-linux/otfinfo
+++ b/Master/bin/x86_64-linux/otfinfo
diff --git a/Master/bin/x86_64-linux/otftotfm b/Master/bin/x86_64-linux/otftotfm
index 443e20a0a12..c6b26c9453e 100755
--- a/Master/bin/x86_64-linux/otftotfm
+++ b/Master/bin/x86_64-linux/otftotfm
diff --git a/Master/bin/x86_64-linux/otp2ocp b/Master/bin/x86_64-linux/otp2ocp
index dd9f96d1721..63ab4c81ddf 100755
--- a/Master/bin/x86_64-linux/otp2ocp
+++ b/Master/bin/x86_64-linux/otp2ocp
diff --git a/Master/bin/x86_64-linux/outocp b/Master/bin/x86_64-linux/outocp
index 358c1552cb2..3cef7853783 100755
--- a/Master/bin/x86_64-linux/outocp
+++ b/Master/bin/x86_64-linux/outocp
diff --git a/Master/bin/x86_64-linux/patgen b/Master/bin/x86_64-linux/patgen
index bab96890b1a..9e57aa97b2d 100755
--- a/Master/bin/x86_64-linux/patgen
+++ b/Master/bin/x86_64-linux/patgen
diff --git a/Master/bin/x86_64-linux/pdfclose b/Master/bin/x86_64-linux/pdfclose
index 4684863172a..c45916fa564 100755
--- a/Master/bin/x86_64-linux/pdfclose
+++ b/Master/bin/x86_64-linux/pdfclose
diff --git a/Master/bin/x86_64-linux/pdfetex b/Master/bin/x86_64-linux/pdfetex
index bd85e8b88c4..c4ac1ea3b53 100755
--- a/Master/bin/x86_64-linux/pdfetex
+++ b/Master/bin/x86_64-linux/pdfetex
diff --git a/Master/bin/x86_64-linux/pdfopen b/Master/bin/x86_64-linux/pdfopen
index 9921eea5e53..cd16a13924d 100755
--- a/Master/bin/x86_64-linux/pdfopen
+++ b/Master/bin/x86_64-linux/pdfopen
diff --git a/Master/bin/x86_64-linux/pfb2pfa b/Master/bin/x86_64-linux/pfb2pfa
index 73167bbb04d..c04f240af52 100755
--- a/Master/bin/x86_64-linux/pfb2pfa
+++ b/Master/bin/x86_64-linux/pfb2pfa
diff --git a/Master/bin/x86_64-linux/pk2bm b/Master/bin/x86_64-linux/pk2bm
index 70d6b46f6bc..31a7ffbe936 100755
--- a/Master/bin/x86_64-linux/pk2bm
+++ b/Master/bin/x86_64-linux/pk2bm
diff --git a/Master/bin/x86_64-linux/pktogf b/Master/bin/x86_64-linux/pktogf
index 7f8381aef5c..f13e9936007 100755
--- a/Master/bin/x86_64-linux/pktogf
+++ b/Master/bin/x86_64-linux/pktogf
diff --git a/Master/bin/x86_64-linux/pktype b/Master/bin/x86_64-linux/pktype
index ac6eff95456..66db50f2228 100755
--- a/Master/bin/x86_64-linux/pktype
+++ b/Master/bin/x86_64-linux/pktype
diff --git a/Master/bin/x86_64-linux/pltotf b/Master/bin/x86_64-linux/pltotf
index d14a895cf36..ba690c9a121 100755
--- a/Master/bin/x86_64-linux/pltotf
+++ b/Master/bin/x86_64-linux/pltotf
diff --git a/Master/bin/x86_64-linux/pooltype b/Master/bin/x86_64-linux/pooltype
index cc5428e4eb2..1e540f4e0b0 100755
--- a/Master/bin/x86_64-linux/pooltype
+++ b/Master/bin/x86_64-linux/pooltype
diff --git a/Master/bin/x86_64-linux/ps2pk b/Master/bin/x86_64-linux/ps2pk
index 27867644d17..bbf79228ce7 100755
--- a/Master/bin/x86_64-linux/ps2pk
+++ b/Master/bin/x86_64-linux/ps2pk
diff --git a/Master/bin/x86_64-linux/psbook b/Master/bin/x86_64-linux/psbook
index 055973d79f1..3068e0d279e 100755
--- a/Master/bin/x86_64-linux/psbook
+++ b/Master/bin/x86_64-linux/psbook
diff --git a/Master/bin/x86_64-linux/psnup b/Master/bin/x86_64-linux/psnup
index e64d486d1c1..a95adda2efa 100755
--- a/Master/bin/x86_64-linux/psnup
+++ b/Master/bin/x86_64-linux/psnup
diff --git a/Master/bin/x86_64-linux/psresize b/Master/bin/x86_64-linux/psresize
index 256792da1d3..84798fd9f64 100755
--- a/Master/bin/x86_64-linux/psresize
+++ b/Master/bin/x86_64-linux/psresize
diff --git a/Master/bin/x86_64-linux/psselect b/Master/bin/x86_64-linux/psselect
index c9b29a2eee4..55ae1911fc1 100755
--- a/Master/bin/x86_64-linux/psselect
+++ b/Master/bin/x86_64-linux/psselect
diff --git a/Master/bin/x86_64-linux/pstops b/Master/bin/x86_64-linux/pstops
index d50aa172378..c1fbdb1a916 100755
--- a/Master/bin/x86_64-linux/pstops
+++ b/Master/bin/x86_64-linux/pstops
diff --git a/Master/bin/x86_64-linux/sjisconv b/Master/bin/x86_64-linux/sjisconv
index 9654b0f81da..fe0c87c9566 100755
--- a/Master/bin/x86_64-linux/sjisconv
+++ b/Master/bin/x86_64-linux/sjisconv
diff --git a/Master/bin/x86_64-linux/t1ascii b/Master/bin/x86_64-linux/t1ascii
index e7b0cd88aa0..88080694ade 100755
--- a/Master/bin/x86_64-linux/t1ascii
+++ b/Master/bin/x86_64-linux/t1ascii
diff --git a/Master/bin/x86_64-linux/t1asm b/Master/bin/x86_64-linux/t1asm
index b76c97fbaa2..b7ec30cc913 100755
--- a/Master/bin/x86_64-linux/t1asm
+++ b/Master/bin/x86_64-linux/t1asm
diff --git a/Master/bin/x86_64-linux/t1binary b/Master/bin/x86_64-linux/t1binary
index 8ac35f4d27f..78709d2cf9f 100755
--- a/Master/bin/x86_64-linux/t1binary
+++ b/Master/bin/x86_64-linux/t1binary
diff --git a/Master/bin/x86_64-linux/t1disasm b/Master/bin/x86_64-linux/t1disasm
index 465ab107809..3c8082c749b 100755
--- a/Master/bin/x86_64-linux/t1disasm
+++ b/Master/bin/x86_64-linux/t1disasm
diff --git a/Master/bin/x86_64-linux/t1dotlessj b/Master/bin/x86_64-linux/t1dotlessj
index 8e671bcf7fa..f44949db9cd 100755
--- a/Master/bin/x86_64-linux/t1dotlessj
+++ b/Master/bin/x86_64-linux/t1dotlessj
diff --git a/Master/bin/x86_64-linux/t1lint b/Master/bin/x86_64-linux/t1lint
index 7c46a40f536..cd19cca19d7 100755
--- a/Master/bin/x86_64-linux/t1lint
+++ b/Master/bin/x86_64-linux/t1lint
diff --git a/Master/bin/x86_64-linux/t1mac b/Master/bin/x86_64-linux/t1mac
index aa4d228701c..61ebe479ef6 100755
--- a/Master/bin/x86_64-linux/t1mac
+++ b/Master/bin/x86_64-linux/t1mac
diff --git a/Master/bin/x86_64-linux/t1reencode b/Master/bin/x86_64-linux/t1reencode
index 29dfd85cef4..e696b17197f 100755
--- a/Master/bin/x86_64-linux/t1reencode
+++ b/Master/bin/x86_64-linux/t1reencode
diff --git a/Master/bin/x86_64-linux/t1testpage b/Master/bin/x86_64-linux/t1testpage
index 3394940762e..4aa222bd1b9 100755
--- a/Master/bin/x86_64-linux/t1testpage
+++ b/Master/bin/x86_64-linux/t1testpage
diff --git a/Master/bin/x86_64-linux/t1unmac b/Master/bin/x86_64-linux/t1unmac
index 58d50ecc7a8..3d13c3822d8 100755
--- a/Master/bin/x86_64-linux/t1unmac
+++ b/Master/bin/x86_64-linux/t1unmac
diff --git a/Master/bin/x86_64-linux/t4ht b/Master/bin/x86_64-linux/t4ht
index 2af33f2f21a..57d110feaaf 100755
--- a/Master/bin/x86_64-linux/t4ht
+++ b/Master/bin/x86_64-linux/t4ht
diff --git a/Master/bin/x86_64-linux/tangle b/Master/bin/x86_64-linux/tangle
index cdce6ead2dd..84224c5eaf2 100755
--- a/Master/bin/x86_64-linux/tangle
+++ b/Master/bin/x86_64-linux/tangle
diff --git a/Master/bin/x86_64-linux/tcdialog b/Master/bin/x86_64-linux/tcdialog
index 365279a0689..b876c7191d2 100755
--- a/Master/bin/x86_64-linux/tcdialog
+++ b/Master/bin/x86_64-linux/tcdialog
diff --git a/Master/bin/x86_64-linux/tex b/Master/bin/x86_64-linux/tex
index 260870d2f76..642c0095803 100755
--- a/Master/bin/x86_64-linux/tex
+++ b/Master/bin/x86_64-linux/tex
diff --git a/Master/bin/x86_64-linux/tex4ht b/Master/bin/x86_64-linux/tex4ht
index e88c537dc6d..935b42a5bf1 100755
--- a/Master/bin/x86_64-linux/tex4ht
+++ b/Master/bin/x86_64-linux/tex4ht
diff --git a/Master/bin/x86_64-linux/texconfig b/Master/bin/x86_64-linux/texconfig
index 633ba7e807d..0dc3f753f0b 100755
--- a/Master/bin/x86_64-linux/texconfig
+++ b/Master/bin/x86_64-linux/texconfig
@@ -24,7 +24,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 progname=texconfig
 
 # the version string
-version=1118467711 # seconds since `00:00:00 1970-01-01 UTC'
+version=1167506445 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 envVars="
@@ -632,7 +632,7 @@ Get more help with
       echoLocateBinary kpsewhich updmap fmtutil texconfig tex pdfetex mktexpk dvips dvipdfm
       echo
       echo '=========================== active config files =========================='
-      echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort +1
+      echoLocateCfgfile texmf.cnf updmap.cfg fmtutil.cnf config.ps mktex.cnf XDvi pdftexconfig.tex config | sort -k 2
       echo
       echo '============================= font map files ============================='
       for m in psfonts.map pdftex.map ps2pk.map dvipdfm.map; do
diff --git a/Master/bin/x86_64-linux/texi2html b/Master/bin/x86_64-linux/texi2html
index 63e373cda8d..38b6a57713a 100755
--- a/Master/bin/x86_64-linux/texi2html
+++ b/Master/bin/x86_64-linux/texi2html
@@ -75,7 +75,7 @@ my $THISVERSION = '1.76';
 my $THISPROG = "texi2html $THISVERSION"; # program name and version
 
 # set by configure, prefix for the sysconfdir and so on
-my $prefix = '/usr/local/src/tex-live/Build/source/inst';
+my $prefix = '/home/reinhard/dev/texlive/svn/Build/source/inst';
 my $sysconfdir;
 my $pkgdatadir;
 my $datadir;
@@ -92,10 +92,10 @@ else
     $sysconfdir = "/usr/local/etc";
 }
 
-if ('/usr/local/src/tex-live/Build/source/inst' ne '@' . 'datadir@')
+if ('/home/reinhard/dev/texlive/svn/Build/source/inst' ne '@' . 'datadir@')
 {
-    $pkgdatadir = eval '"/usr/local/src/tex-live/Build/source/inst/texi2html"';
-    $datadir = eval '"/usr/local/src/tex-live/Build/source/inst"';
+    $pkgdatadir = eval '"/home/reinhard/dev/texlive/svn/Build/source/inst/texi2html"';
+    $datadir = eval '"/home/reinhard/dev/texlive/svn/Build/source/inst"';
 }
 else
 {
diff --git a/Master/bin/x86_64-linux/texindex b/Master/bin/x86_64-linux/texindex
index 6207f9a9416..a1a990942cd 100755
--- a/Master/bin/x86_64-linux/texindex
+++ b/Master/bin/x86_64-linux/texindex
diff --git a/Master/bin/x86_64-linux/tftopl b/Master/bin/x86_64-linux/tftopl
index 5f719ab9d3b..71a502678fc 100755
--- a/Master/bin/x86_64-linux/tftopl
+++ b/Master/bin/x86_64-linux/tftopl
diff --git a/Master/bin/x86_64-linux/tie b/Master/bin/x86_64-linux/tie
index 46d6ba79e93..04dafde722a 100755
--- a/Master/bin/x86_64-linux/tie
+++ b/Master/bin/x86_64-linux/tie
diff --git a/Master/bin/x86_64-linux/ttf2afm b/Master/bin/x86_64-linux/ttf2afm
index d3270fc69f5..664e70ff8c4 100755
--- a/Master/bin/x86_64-linux/ttf2afm
+++ b/Master/bin/x86_64-linux/ttf2afm
diff --git a/Master/bin/x86_64-linux/ttf2pk b/Master/bin/x86_64-linux/ttf2pk
index 67b33a50976..d66fb18897f 100755
--- a/Master/bin/x86_64-linux/ttf2pk
+++ b/Master/bin/x86_64-linux/ttf2pk
diff --git a/Master/bin/x86_64-linux/ttf2tfm b/Master/bin/x86_64-linux/ttf2tfm
index 6c662216103..47f9b32fae6 100755
--- a/Master/bin/x86_64-linux/ttf2tfm
+++ b/Master/bin/x86_64-linux/ttf2tfm
diff --git a/Master/bin/x86_64-linux/ttftotype42 b/Master/bin/x86_64-linux/ttftotype42
index a6bb88313a3..2ebc3ce4491 100755
--- a/Master/bin/x86_64-linux/ttftotype42
+++ b/Master/bin/x86_64-linux/ttftotype42
diff --git a/Master/bin/x86_64-linux/updmap b/Master/bin/x86_64-linux/updmap
index ced046f76b9..0f8cc469a83 100755
--- a/Master/bin/x86_64-linux/updmap
+++ b/Master/bin/x86_64-linux/updmap
@@ -122,7 +122,7 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 # the version string
-version=1122009795 # seconds since `00:00:00 1970-01-01 UTC'
+version=1167072206 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 ###############################################################################
diff --git a/Master/bin/x86_64-linux/vftovp b/Master/bin/x86_64-linux/vftovp
index 98994fb173f..7c582ddfc36 100755
--- a/Master/bin/x86_64-linux/vftovp
+++ b/Master/bin/x86_64-linux/vftovp
diff --git a/Master/bin/x86_64-linux/vptovf b/Master/bin/x86_64-linux/vptovf
index fd1ef30c058..11a288da327 100755
--- a/Master/bin/x86_64-linux/vptovf
+++ b/Master/bin/x86_64-linux/vptovf
diff --git a/Master/bin/x86_64-linux/weave b/Master/bin/x86_64-linux/weave
index 2da57272056..628a5efdbda 100755
--- a/Master/bin/x86_64-linux/weave
+++ b/Master/bin/x86_64-linux/weave
diff --git a/Master/bin/x86_64-linux/xdvi-xaw.bin b/Master/bin/x86_64-linux/xdvi-xaw.bin
index c2b1f249b53..bc90d895df4 100755
--- a/Master/bin/x86_64-linux/xdvi-xaw.bin
+++ b/Master/bin/x86_64-linux/xdvi-xaw.bin
diff --git a/Master/bin/x86_64-linux/xdvipdfmx b/Master/bin/x86_64-linux/xdvipdfmx
index 2078eac41c6..b949ef89ca9 100755
--- a/Master/bin/x86_64-linux/xdvipdfmx
+++ b/Master/bin/x86_64-linux/xdvipdfmx
diff --git a/Master/bin/x86_64-linux/xetex b/Master/bin/x86_64-linux/xetex
index b5ab6e42719..e3f7619c7d9 100755
--- a/Master/bin/x86_64-linux/xetex
+++ b/Master/bin/x86_64-linux/xetex