147 files changed, 55 insertions, 37 deletions

diff --git a/Master/bin/hppa-hpux/afm2pl b/Master/bin/hppa-hpux/afm2pl
index d954f779a26..a64026c8f53 100755
--- a/Master/bin/hppa-hpux/afm2pl
+++ b/Master/bin/hppa-hpux/afm2pl
diff --git a/Master/bin/hppa-hpux/afm2tfm b/Master/bin/hppa-hpux/afm2tfm
index 16ea2491494..af4c520a3b8 100755
--- a/Master/bin/hppa-hpux/afm2tfm
+++ b/Master/bin/hppa-hpux/afm2tfm
diff --git a/Master/bin/hppa-hpux/aleph b/Master/bin/hppa-hpux/aleph
index b4bfa41dc50..d7d2f97a147 100755
--- a/Master/bin/hppa-hpux/aleph
+++ b/Master/bin/hppa-hpux/aleph
diff --git a/Master/bin/hppa-hpux/amstex b/Master/bin/hppa-hpux/amstex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/amstex
+++ b/Master/bin/hppa-hpux/amstex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/bg5conv b/Master/bin/hppa-hpux/bg5conv
index 5a38cfffe9c..a3a1105ff77 100755
--- a/Master/bin/hppa-hpux/bg5conv
+++ b/Master/bin/hppa-hpux/bg5conv
diff --git a/Master/bin/hppa-hpux/bibtex b/Master/bin/hppa-hpux/bibtex
index 401ae6acffe..43af433c7cf 100755
--- a/Master/bin/hppa-hpux/bibtex
+++ b/Master/bin/hppa-hpux/bibtex
diff --git a/Master/bin/hppa-hpux/bibtex8 b/Master/bin/hppa-hpux/bibtex8
index 39a5001e89e..d014b52afaa 100755
--- a/Master/bin/hppa-hpux/bibtex8
+++ b/Master/bin/hppa-hpux/bibtex8
diff --git a/Master/bin/hppa-hpux/cef5conv b/Master/bin/hppa-hpux/cef5conv
index 33407fcde3a..b174fab6313 100755
--- a/Master/bin/hppa-hpux/cef5conv
+++ b/Master/bin/hppa-hpux/cef5conv
diff --git a/Master/bin/hppa-hpux/cefconv b/Master/bin/hppa-hpux/cefconv
index f1a25792b31..daa229d1b8a 100755
--- a/Master/bin/hppa-hpux/cefconv
+++ b/Master/bin/hppa-hpux/cefconv
diff --git a/Master/bin/hppa-hpux/cefsconv b/Master/bin/hppa-hpux/cefsconv
index f3f1c0cc36f..34c63e0c05c 100755
--- a/Master/bin/hppa-hpux/cefsconv
+++ b/Master/bin/hppa-hpux/cefsconv
diff --git a/Master/bin/hppa-hpux/cfftot1 b/Master/bin/hppa-hpux/cfftot1
index b3f54fea5e7..84b87e2aead 100755
--- a/Master/bin/hppa-hpux/cfftot1
+++ b/Master/bin/hppa-hpux/cfftot1
diff --git a/Master/bin/hppa-hpux/cslatex b/Master/bin/hppa-hpux/cslatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/cslatex
+++ b/Master/bin/hppa-hpux/cslatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/csplain b/Master/bin/hppa-hpux/csplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/csplain
+++ b/Master/bin/hppa-hpux/csplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/ctangle b/Master/bin/hppa-hpux/ctangle
index 0bfe07482c1..51bb6a3ca4d 100755
--- a/Master/bin/hppa-hpux/ctangle
+++ b/Master/bin/hppa-hpux/ctangle
diff --git a/Master/bin/hppa-hpux/ctie b/Master/bin/hppa-hpux/ctie
index ac9974c27ad..a5df09c544a 100755
--- a/Master/bin/hppa-hpux/ctie
+++ b/Master/bin/hppa-hpux/ctie
diff --git a/Master/bin/hppa-hpux/cweave b/Master/bin/hppa-hpux/cweave
index c37db2c2540..4ef3fc3179f 100755
--- a/Master/bin/hppa-hpux/cweave
+++ b/Master/bin/hppa-hpux/cweave
diff --git a/Master/bin/hppa-hpux/detex b/Master/bin/hppa-hpux/detex
index 090590e0122..791464e0b56 100755
--- a/Master/bin/hppa-hpux/detex
+++ b/Master/bin/hppa-hpux/detex
diff --git a/Master/bin/hppa-hpux/devnag b/Master/bin/hppa-hpux/devnag
index be75ed352fd..56a09cd920e 100755
--- a/Master/bin/hppa-hpux/devnag
+++ b/Master/bin/hppa-hpux/devnag
diff --git a/Master/bin/hppa-hpux/disdvi b/Master/bin/hppa-hpux/disdvi
index 528aa8dfebe..7e037106fd8 100755
--- a/Master/bin/hppa-hpux/disdvi
+++ b/Master/bin/hppa-hpux/disdvi
diff --git a/Master/bin/hppa-hpux/dmp b/Master/bin/hppa-hpux/dmp
index de8a6df334d..d550368c9dd 100755
--- a/Master/bin/hppa-hpux/dmp
+++ b/Master/bin/hppa-hpux/dmp
diff --git a/Master/bin/hppa-hpux/dt2dv b/Master/bin/hppa-hpux/dt2dv
index 68cb423048b..ff891d498ec 100755
--- a/Master/bin/hppa-hpux/dt2dv
+++ b/Master/bin/hppa-hpux/dt2dv
diff --git a/Master/bin/hppa-hpux/dv2dt b/Master/bin/hppa-hpux/dv2dt
index 58cfca58fb9..8fa6612c1ca 100755
--- a/Master/bin/hppa-hpux/dv2dt
+++ b/Master/bin/hppa-hpux/dv2dt
diff --git a/Master/bin/hppa-hpux/dvi2tty b/Master/bin/hppa-hpux/dvi2tty
index 47f8f0cf075..bb20e1f1800 100755
--- a/Master/bin/hppa-hpux/dvi2tty
+++ b/Master/bin/hppa-hpux/dvi2tty
diff --git a/Master/bin/hppa-hpux/dvibook b/Master/bin/hppa-hpux/dvibook
index 34685ecb10d..2fe5999831d 100755
--- a/Master/bin/hppa-hpux/dvibook
+++ b/Master/bin/hppa-hpux/dvibook
diff --git a/Master/bin/hppa-hpux/dviconcat b/Master/bin/hppa-hpux/dviconcat
index 5ed6cdc386c..01f99d75fad 100755
--- a/Master/bin/hppa-hpux/dviconcat
+++ b/Master/bin/hppa-hpux/dviconcat
diff --git a/Master/bin/hppa-hpux/dvicopy b/Master/bin/hppa-hpux/dvicopy
index 6d8fec28f81..39f7591d390 100755
--- a/Master/bin/hppa-hpux/dvicopy
+++ b/Master/bin/hppa-hpux/dvicopy
diff --git a/Master/bin/hppa-hpux/dvidvi b/Master/bin/hppa-hpux/dvidvi
index 45ba226b20c..1b6e54edde4 100755
--- a/Master/bin/hppa-hpux/dvidvi
+++ b/Master/bin/hppa-hpux/dvidvi
diff --git a/Master/bin/hppa-hpux/dvilj b/Master/bin/hppa-hpux/dvilj
index 7ba70bf2dfb..897b9444a93 100755
--- a/Master/bin/hppa-hpux/dvilj
+++ b/Master/bin/hppa-hpux/dvilj
diff --git a/Master/bin/hppa-hpux/dvilj2p b/Master/bin/hppa-hpux/dvilj2p
index 392a368a815..32417659d88 100755
--- a/Master/bin/hppa-hpux/dvilj2p
+++ b/Master/bin/hppa-hpux/dvilj2p
diff --git a/Master/bin/hppa-hpux/dvilj4 b/Master/bin/hppa-hpux/dvilj4
index 13eda0a35c8..b31239849a4 100755
--- a/Master/bin/hppa-hpux/dvilj4
+++ b/Master/bin/hppa-hpux/dvilj4
diff --git a/Master/bin/hppa-hpux/dvilj4l b/Master/bin/hppa-hpux/dvilj4l
index 5eadeaa6872..2902e9cf4fd 100755
--- a/Master/bin/hppa-hpux/dvilj4l
+++ b/Master/bin/hppa-hpux/dvilj4l
diff --git a/Master/bin/hppa-hpux/dvipdfm b/Master/bin/hppa-hpux/dvipdfm
index 9f7a867d070..6f108b7ed9b 100755
--- a/Master/bin/hppa-hpux/dvipdfm
+++ b/Master/bin/hppa-hpux/dvipdfm
diff --git a/Master/bin/hppa-hpux/dvipdfmx b/Master/bin/hppa-hpux/dvipdfmx
index c34719b9f75..36dfd32b7e5 100755
--- a/Master/bin/hppa-hpux/dvipdfmx
+++ b/Master/bin/hppa-hpux/dvipdfmx
diff --git a/Master/bin/hppa-hpux/dvips b/Master/bin/hppa-hpux/dvips
index d07878358d8..7a6ff58fbfa 100755
--- a/Master/bin/hppa-hpux/dvips
+++ b/Master/bin/hppa-hpux/dvips
diff --git a/Master/bin/hppa-hpux/dviselect b/Master/bin/hppa-hpux/dviselect
index 7afc671f29c..55c0a149c01 100755
--- a/Master/bin/hppa-hpux/dviselect
+++ b/Master/bin/hppa-hpux/dviselect
diff --git a/Master/bin/hppa-hpux/dvitodvi b/Master/bin/hppa-hpux/dvitodvi
index cf5c725e609..bfafeedbf4c 100755
--- a/Master/bin/hppa-hpux/dvitodvi
+++ b/Master/bin/hppa-hpux/dvitodvi
diff --git a/Master/bin/hppa-hpux/dvitomp b/Master/bin/hppa-hpux/dvitomp
index 9cc42875103..a82a13665f2 100755
--- a/Master/bin/hppa-hpux/dvitomp
+++ b/Master/bin/hppa-hpux/dvitomp
diff --git a/Master/bin/hppa-hpux/dvitype b/Master/bin/hppa-hpux/dvitype
index ccd72bff82c..0db88440d75 100755
--- a/Master/bin/hppa-hpux/dvitype
+++ b/Master/bin/hppa-hpux/dvitype
diff --git a/Master/bin/hppa-hpux/ebb b/Master/bin/hppa-hpux/ebb
index fdffa7ab0e0..2ea7ade9c7b 100755
--- a/Master/bin/hppa-hpux/ebb
+++ b/Master/bin/hppa-hpux/ebb
diff --git a/Master/bin/hppa-hpux/eplain b/Master/bin/hppa-hpux/eplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/eplain
+++ b/Master/bin/hppa-hpux/eplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/epsffit b/Master/bin/hppa-hpux/epsffit
index 98598a196b4..53720497d9d 100755
--- a/Master/bin/hppa-hpux/epsffit
+++ b/Master/bin/hppa-hpux/epsffit
diff --git a/Master/bin/hppa-hpux/epstopdf b/Master/bin/hppa-hpux/epstopdf
index e7ea5f239df..0fb015d4420 100755
--- a/Master/bin/hppa-hpux/epstopdf
+++ b/Master/bin/hppa-hpux/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/hppa-hpux/etex b/Master/bin/hppa-hpux/etex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/etex
+++ b/Master/bin/hppa-hpux/etex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/extconv b/Master/bin/hppa-hpux/extconv
index 7ee5fb7cf0f..0774f98a82c 100755
--- a/Master/bin/hppa-hpux/extconv
+++ b/Master/bin/hppa-hpux/extconv
diff --git a/Master/bin/hppa-hpux/gftodvi b/Master/bin/hppa-hpux/gftodvi
index a920ba176b6..25fdde769b5 100755
--- a/Master/bin/hppa-hpux/gftodvi
+++ b/Master/bin/hppa-hpux/gftodvi
diff --git a/Master/bin/hppa-hpux/gftopk b/Master/bin/hppa-hpux/gftopk
index 57b1647b93c..90550ecbb94 100755
--- a/Master/bin/hppa-hpux/gftopk
+++ b/Master/bin/hppa-hpux/gftopk
diff --git a/Master/bin/hppa-hpux/gftype b/Master/bin/hppa-hpux/gftype
index a0ce0a766bd..2826b817a3b 100755
--- a/Master/bin/hppa-hpux/gftype
+++ b/Master/bin/hppa-hpux/gftype
diff --git a/Master/bin/hppa-hpux/gsftopk b/Master/bin/hppa-hpux/gsftopk
index c50c9b852f6..7b3c9c4cbbc 100755
--- a/Master/bin/hppa-hpux/gsftopk
+++ b/Master/bin/hppa-hpux/gsftopk
diff --git a/Master/bin/hppa-hpux/hbf2gf b/Master/bin/hppa-hpux/hbf2gf
index 60d58bcb419..c8f699767a7 100755
--- a/Master/bin/hppa-hpux/hbf2gf
+++ b/Master/bin/hppa-hpux/hbf2gf
diff --git a/Master/bin/hppa-hpux/info b/Master/bin/hppa-hpux/info
index 80d79f74455..e3bf9152932 100755
--- a/Master/bin/hppa-hpux/info
+++ b/Master/bin/hppa-hpux/info
diff --git a/Master/bin/hppa-hpux/infokey b/Master/bin/hppa-hpux/infokey
index a4a3a48bc9c..e9e9f250f80 100755
--- a/Master/bin/hppa-hpux/infokey
+++ b/Master/bin/hppa-hpux/infokey
diff --git a/Master/bin/hppa-hpux/install-info b/Master/bin/hppa-hpux/install-info
index d6ea1f26000..cdf28a0fd79 100755
--- a/Master/bin/hppa-hpux/install-info
+++ b/Master/bin/hppa-hpux/install-info
diff --git a/Master/bin/hppa-hpux/jadetex b/Master/bin/hppa-hpux/jadetex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/jadetex
+++ b/Master/bin/hppa-hpux/jadetex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/kpseaccess b/Master/bin/hppa-hpux/kpseaccess
index c6dbb624f9f..025cdf89472 100755
--- a/Master/bin/hppa-hpux/kpseaccess
+++ b/Master/bin/hppa-hpux/kpseaccess
diff --git a/Master/bin/hppa-hpux/kpsereadlink b/Master/bin/hppa-hpux/kpsereadlink
index 9ef29711d84..a9e752d391b 100755
--- a/Master/bin/hppa-hpux/kpsereadlink
+++ b/Master/bin/hppa-hpux/kpsereadlink
diff --git a/Master/bin/hppa-hpux/kpsestat b/Master/bin/hppa-hpux/kpsestat
index 6666012bebd..be32e869d53 100755
--- a/Master/bin/hppa-hpux/kpsestat
+++ b/Master/bin/hppa-hpux/kpsestat
diff --git a/Master/bin/hppa-hpux/kpsewhich b/Master/bin/hppa-hpux/kpsewhich
index 027fc275f37..567896057f7 100755
--- a/Master/bin/hppa-hpux/kpsewhich
+++ b/Master/bin/hppa-hpux/kpsewhich
diff --git a/Master/bin/hppa-hpux/lacheck b/Master/bin/hppa-hpux/lacheck
index 60839255ad6..684213da700 100755
--- a/Master/bin/hppa-hpux/lacheck
+++ b/Master/bin/hppa-hpux/lacheck
diff --git a/Master/bin/hppa-hpux/latex b/Master/bin/hppa-hpux/latex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/latex
+++ b/Master/bin/hppa-hpux/latex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/mag b/Master/bin/hppa-hpux/mag
index 6fbea150bfd..bdc9926d430 100755
--- a/Master/bin/hppa-hpux/mag
+++ b/Master/bin/hppa-hpux/mag
diff --git a/Master/bin/hppa-hpux/makeindex b/Master/bin/hppa-hpux/makeindex
index f6f0f693330..d789b343ea1 100755
--- a/Master/bin/hppa-hpux/makeindex
+++ b/Master/bin/hppa-hpux/makeindex
diff --git a/Master/bin/hppa-hpux/makeinfo b/Master/bin/hppa-hpux/makeinfo
index da26798d73b..8fb2a7761d9 100755
--- a/Master/bin/hppa-hpux/makeinfo
+++ b/Master/bin/hppa-hpux/makeinfo
diff --git a/Master/bin/hppa-hpux/makempx b/Master/bin/hppa-hpux/makempx
index cf383025726..606ba52766f 100755
--- a/Master/bin/hppa-hpux/makempx
+++ b/Master/bin/hppa-hpux/makempx
diff --git a/Master/bin/hppa-hpux/mex b/Master/bin/hppa-hpux/mex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/mex
+++ b/Master/bin/hppa-hpux/mex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/mf b/Master/bin/hppa-hpux/mf
index d90266fe3b8..9c9d71adb2f 100755
--- a/Master/bin/hppa-hpux/mf
+++ b/Master/bin/hppa-hpux/mf
diff --git a/Master/bin/hppa-hpux/mf-nowin b/Master/bin/hppa-hpux/mf-nowin
index f7bbcb00d8b..f4509798a95 100755
--- a/Master/bin/hppa-hpux/mf-nowin
+++ b/Master/bin/hppa-hpux/mf-nowin
diff --git a/Master/bin/hppa-hpux/mft b/Master/bin/hppa-hpux/mft
index 50e9c49f4d0..3cc3eb03ef5 100755
--- a/Master/bin/hppa-hpux/mft
+++ b/Master/bin/hppa-hpux/mft
diff --git a/Master/bin/hppa-hpux/mllatex b/Master/bin/hppa-hpux/mllatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/mllatex
+++ b/Master/bin/hppa-hpux/mllatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/mltex b/Master/bin/hppa-hpux/mltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/mltex
+++ b/Master/bin/hppa-hpux/mltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/mmafm b/Master/bin/hppa-hpux/mmafm
index 44b858f780f..928eaa1227f 100755
--- a/Master/bin/hppa-hpux/mmafm
+++ b/Master/bin/hppa-hpux/mmafm
diff --git a/Master/bin/hppa-hpux/mmpfb b/Master/bin/hppa-hpux/mmpfb
index 2f28ff52ad7..c2781cc6ea9 100755
--- a/Master/bin/hppa-hpux/mmpfb
+++ b/Master/bin/hppa-hpux/mmpfb
diff --git a/Master/bin/hppa-hpux/mpost b/Master/bin/hppa-hpux/mpost
index 538a8b82073..ce9c6d13826 100755
--- a/Master/bin/hppa-hpux/mpost
+++ b/Master/bin/hppa-hpux/mpost
diff --git a/Master/bin/hppa-hpux/mpto b/Master/bin/hppa-hpux/mpto
index cf025826f4c..de65082c0bf 100755
--- a/Master/bin/hppa-hpux/mpto
+++ b/Master/bin/hppa-hpux/mpto
diff --git a/Master/bin/hppa-hpux/musixflx b/Master/bin/hppa-hpux/musixflx
index a4ddf006db2..3fe47137c82 100755
--- a/Master/bin/hppa-hpux/musixflx
+++ b/Master/bin/hppa-hpux/musixflx
diff --git a/Master/bin/hppa-hpux/newer b/Master/bin/hppa-hpux/newer
index 48cf5d77f1b..c3781379e5b 100755
--- a/Master/bin/hppa-hpux/newer
+++ b/Master/bin/hppa-hpux/newer
diff --git a/Master/bin/hppa-hpux/odvicopy b/Master/bin/hppa-hpux/odvicopy
index ee2f8adb49e..288b75b7ee5 100755
--- a/Master/bin/hppa-hpux/odvicopy
+++ b/Master/bin/hppa-hpux/odvicopy
diff --git a/Master/bin/hppa-hpux/odvitype b/Master/bin/hppa-hpux/odvitype
index 3c5a2f9e4ad..6a1858bce1b 100755
--- a/Master/bin/hppa-hpux/odvitype
+++ b/Master/bin/hppa-hpux/odvitype
diff --git a/Master/bin/hppa-hpux/omega b/Master/bin/hppa-hpux/omega
index 3ce6b317100..54cdb7b9f11 100755
--- a/Master/bin/hppa-hpux/omega
+++ b/Master/bin/hppa-hpux/omega
diff --git a/Master/bin/hppa-hpux/omfonts b/Master/bin/hppa-hpux/omfonts
index 94588c42ba6..21be3608b3f 100755
--- a/Master/bin/hppa-hpux/omfonts
+++ b/Master/bin/hppa-hpux/omfonts
diff --git a/Master/bin/hppa-hpux/otangle b/Master/bin/hppa-hpux/otangle
index 25bedb499f0..0e4ca01e74a 100755
--- a/Master/bin/hppa-hpux/otangle
+++ b/Master/bin/hppa-hpux/otangle
diff --git a/Master/bin/hppa-hpux/otfinfo b/Master/bin/hppa-hpux/otfinfo
index 8624a0fb65b..d217e6df4bf 100755
--- a/Master/bin/hppa-hpux/otfinfo
+++ b/Master/bin/hppa-hpux/otfinfo
diff --git a/Master/bin/hppa-hpux/otftotfm b/Master/bin/hppa-hpux/otftotfm
index af161089556..060680015c7 100755
--- a/Master/bin/hppa-hpux/otftotfm
+++ b/Master/bin/hppa-hpux/otftotfm
diff --git a/Master/bin/hppa-hpux/otp2ocp b/Master/bin/hppa-hpux/otp2ocp
index d22a8609d82..c3c28854825 100755
--- a/Master/bin/hppa-hpux/otp2ocp
+++ b/Master/bin/hppa-hpux/otp2ocp
diff --git a/Master/bin/hppa-hpux/outocp b/Master/bin/hppa-hpux/outocp
index fe5bf0f4026..87608095633 100755
--- a/Master/bin/hppa-hpux/outocp
+++ b/Master/bin/hppa-hpux/outocp
diff --git a/Master/bin/hppa-hpux/patgen b/Master/bin/hppa-hpux/patgen
index 4fa48d6876c..099a91a8d1d 100755
--- a/Master/bin/hppa-hpux/patgen
+++ b/Master/bin/hppa-hpux/patgen
diff --git a/Master/bin/hppa-hpux/pdfclose b/Master/bin/hppa-hpux/pdfclose
index 8de6ccb9801..0b66c01df13 100755
--- a/Master/bin/hppa-hpux/pdfclose
+++ b/Master/bin/hppa-hpux/pdfclose
diff --git a/Master/bin/hppa-hpux/pdfcslatex b/Master/bin/hppa-hpux/pdfcslatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/pdfcslatex
+++ b/Master/bin/hppa-hpux/pdfcslatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pdfcsplain b/Master/bin/hppa-hpux/pdfcsplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/pdfcsplain
+++ b/Master/bin/hppa-hpux/pdfcsplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pdfetex b/Master/bin/hppa-hpux/pdfetex
index 43516a4b0a7..f68cc91498e 100755..120000
--- a/Master/bin/hppa-hpux/pdfetex
+++ b/Master/bin/hppa-hpux/pdfetex
diff --git a/Master/bin/hppa-hpux/pdfjadetex b/Master/bin/hppa-hpux/pdfjadetex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/pdfjadetex
+++ b/Master/bin/hppa-hpux/pdfjadetex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pdflatex b/Master/bin/hppa-hpux/pdflatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/pdflatex
+++ b/Master/bin/hppa-hpux/pdflatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pdfmex b/Master/bin/hppa-hpux/pdfmex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/pdfmex
+++ b/Master/bin/hppa-hpux/pdfmex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pdfopen b/Master/bin/hppa-hpux/pdfopen
index 8dd8d9b132f..e8b1b10c8ee 100755
--- a/Master/bin/hppa-hpux/pdfopen
+++ b/Master/bin/hppa-hpux/pdfopen
diff --git a/Master/bin/hppa-hpux/pdfplatex b/Master/bin/hppa-hpux/pdfplatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/pdfplatex
+++ b/Master/bin/hppa-hpux/pdfplatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pdftex b/Master/bin/hppa-hpux/pdftex
index eb4e1e5aff7..d810e7f99dc 120000..100755
--- a/Master/bin/hppa-hpux/pdftex
+++ b/Master/bin/hppa-hpux/pdftex
diff --git a/Master/bin/hppa-hpux/pdfxmltex b/Master/bin/hppa-hpux/pdfxmltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/pdfxmltex
+++ b/Master/bin/hppa-hpux/pdfxmltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pfb2pfa b/Master/bin/hppa-hpux/pfb2pfa
index 19a3877cf61..55f455adfa2 100755
--- a/Master/bin/hppa-hpux/pfb2pfa
+++ b/Master/bin/hppa-hpux/pfb2pfa
diff --git a/Master/bin/hppa-hpux/physe b/Master/bin/hppa-hpux/physe
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/physe
+++ b/Master/bin/hppa-hpux/physe
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/phyzzx b/Master/bin/hppa-hpux/phyzzx
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/phyzzx
+++ b/Master/bin/hppa-hpux/phyzzx
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pk2bm b/Master/bin/hppa-hpux/pk2bm
index 880a260a641..f55d60ecb64 100755
--- a/Master/bin/hppa-hpux/pk2bm
+++ b/Master/bin/hppa-hpux/pk2bm
diff --git a/Master/bin/hppa-hpux/pktogf b/Master/bin/hppa-hpux/pktogf
index 7584e1a4a12..afdeeb57f54 100755
--- a/Master/bin/hppa-hpux/pktogf
+++ b/Master/bin/hppa-hpux/pktogf
diff --git a/Master/bin/hppa-hpux/pktype b/Master/bin/hppa-hpux/pktype
index 3ee1388fe7b..1c53807798e 100755
--- a/Master/bin/hppa-hpux/pktype
+++ b/Master/bin/hppa-hpux/pktype
diff --git a/Master/bin/hppa-hpux/platex b/Master/bin/hppa-hpux/platex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/platex
+++ b/Master/bin/hppa-hpux/platex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/pltotf b/Master/bin/hppa-hpux/pltotf
index d071072ff12..cb2a7d287c6 100755
--- a/Master/bin/hppa-hpux/pltotf
+++ b/Master/bin/hppa-hpux/pltotf
diff --git a/Master/bin/hppa-hpux/pooltype b/Master/bin/hppa-hpux/pooltype
index 93f399b0d91..782c0939e0c 100755
--- a/Master/bin/hppa-hpux/pooltype
+++ b/Master/bin/hppa-hpux/pooltype
diff --git a/Master/bin/hppa-hpux/ps2pk b/Master/bin/hppa-hpux/ps2pk
index 47bada396a0..5399e8f1b1c 100755
--- a/Master/bin/hppa-hpux/ps2pk
+++ b/Master/bin/hppa-hpux/ps2pk
diff --git a/Master/bin/hppa-hpux/psbook b/Master/bin/hppa-hpux/psbook
index fdc6e2674e0..2cb36b2f6d1 100755
--- a/Master/bin/hppa-hpux/psbook
+++ b/Master/bin/hppa-hpux/psbook
diff --git a/Master/bin/hppa-hpux/psnup b/Master/bin/hppa-hpux/psnup
index ab577139266..dc8b2a3537b 100755
--- a/Master/bin/hppa-hpux/psnup
+++ b/Master/bin/hppa-hpux/psnup
diff --git a/Master/bin/hppa-hpux/psresize b/Master/bin/hppa-hpux/psresize
index 659b758a7fe..3ddb4ad9f35 100755
--- a/Master/bin/hppa-hpux/psresize
+++ b/Master/bin/hppa-hpux/psresize
diff --git a/Master/bin/hppa-hpux/psselect b/Master/bin/hppa-hpux/psselect
index 6cd6aec1024..ee58807da16 100755
--- a/Master/bin/hppa-hpux/psselect
+++ b/Master/bin/hppa-hpux/psselect
diff --git a/Master/bin/hppa-hpux/pstops b/Master/bin/hppa-hpux/pstops
index 253efba96e3..31a01c484e7 100755
--- a/Master/bin/hppa-hpux/pstops
+++ b/Master/bin/hppa-hpux/pstops
diff --git a/Master/bin/hppa-hpux/sjisconv b/Master/bin/hppa-hpux/sjisconv
index 63fba701877..c5866092221 100755
--- a/Master/bin/hppa-hpux/sjisconv
+++ b/Master/bin/hppa-hpux/sjisconv
diff --git a/Master/bin/hppa-hpux/t1ascii b/Master/bin/hppa-hpux/t1ascii
index c6ec3a342d8..98696aeb557 100755
--- a/Master/bin/hppa-hpux/t1ascii
+++ b/Master/bin/hppa-hpux/t1ascii
diff --git a/Master/bin/hppa-hpux/t1asm b/Master/bin/hppa-hpux/t1asm
index 593eecebda9..8f2a48c8688 100755
--- a/Master/bin/hppa-hpux/t1asm
+++ b/Master/bin/hppa-hpux/t1asm
diff --git a/Master/bin/hppa-hpux/t1binary b/Master/bin/hppa-hpux/t1binary
index cb4ee3a5ad8..7b840736b1e 100755
--- a/Master/bin/hppa-hpux/t1binary
+++ b/Master/bin/hppa-hpux/t1binary
diff --git a/Master/bin/hppa-hpux/t1disasm b/Master/bin/hppa-hpux/t1disasm
index bc6c91c40db..5dd756b6c29 100755
--- a/Master/bin/hppa-hpux/t1disasm
+++ b/Master/bin/hppa-hpux/t1disasm
diff --git a/Master/bin/hppa-hpux/t1dotlessj b/Master/bin/hppa-hpux/t1dotlessj
index 5bc08a93deb..b0b10fdeb23 100755
--- a/Master/bin/hppa-hpux/t1dotlessj
+++ b/Master/bin/hppa-hpux/t1dotlessj
diff --git a/Master/bin/hppa-hpux/t1lint b/Master/bin/hppa-hpux/t1lint
index 8cff96610ba..50ed23106ae 100755
--- a/Master/bin/hppa-hpux/t1lint
+++ b/Master/bin/hppa-hpux/t1lint
diff --git a/Master/bin/hppa-hpux/t1mac b/Master/bin/hppa-hpux/t1mac
index 5a42d1a0285..15010428172 100755
--- a/Master/bin/hppa-hpux/t1mac
+++ b/Master/bin/hppa-hpux/t1mac
diff --git a/Master/bin/hppa-hpux/t1reencode b/Master/bin/hppa-hpux/t1reencode
index 68267051bf9..30aa75e8d7e 100755
--- a/Master/bin/hppa-hpux/t1reencode
+++ b/Master/bin/hppa-hpux/t1reencode
diff --git a/Master/bin/hppa-hpux/t1testpage b/Master/bin/hppa-hpux/t1testpage
index fd2fe9d05b5..71786576749 100755
--- a/Master/bin/hppa-hpux/t1testpage
+++ b/Master/bin/hppa-hpux/t1testpage
diff --git a/Master/bin/hppa-hpux/t1unmac b/Master/bin/hppa-hpux/t1unmac
index 26d2bd69f78..b0eba8bed04 100755
--- a/Master/bin/hppa-hpux/t1unmac
+++ b/Master/bin/hppa-hpux/t1unmac
diff --git a/Master/bin/hppa-hpux/t4ht b/Master/bin/hppa-hpux/t4ht
index 5d9e65e7a02..2bb4610655d 100755
--- a/Master/bin/hppa-hpux/t4ht
+++ b/Master/bin/hppa-hpux/t4ht
diff --git a/Master/bin/hppa-hpux/tangle b/Master/bin/hppa-hpux/tangle
index 97a73eb1f1f..239bb8b1af8 100755
--- a/Master/bin/hppa-hpux/tangle
+++ b/Master/bin/hppa-hpux/tangle
diff --git a/Master/bin/hppa-hpux/tcdialog b/Master/bin/hppa-hpux/tcdialog
index 87a61dace41..18e2402eff3 100755
--- a/Master/bin/hppa-hpux/tcdialog
+++ b/Master/bin/hppa-hpux/tcdialog
diff --git a/Master/bin/hppa-hpux/tex b/Master/bin/hppa-hpux/tex
index 7e902a33a20..ba275c072b6 100755
--- a/Master/bin/hppa-hpux/tex
+++ b/Master/bin/hppa-hpux/tex
diff --git a/Master/bin/hppa-hpux/tex4ht b/Master/bin/hppa-hpux/tex4ht
index 28ba9b34066..2522f36c2f0 100755
--- a/Master/bin/hppa-hpux/tex4ht
+++ b/Master/bin/hppa-hpux/tex4ht
diff --git a/Master/bin/hppa-hpux/texconfig b/Master/bin/hppa-hpux/texconfig
index 633ba7e807d..0dc3f753f0b 100755
--- a/Master/bin/hppa-hpux/texconfig
+++ b/Master/bin/hppa-hpux/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/hppa-hpux/texindex b/Master/bin/hppa-hpux/texindex
index a8493fc125c..26805207efd 100755
--- a/Master/bin/hppa-hpux/texindex
+++ b/Master/bin/hppa-hpux/texindex
diff --git a/Master/bin/hppa-hpux/texsis b/Master/bin/hppa-hpux/texsis
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/texsis
+++ b/Master/bin/hppa-hpux/texsis
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/tftopl b/Master/bin/hppa-hpux/tftopl
index 160e1beecfb..2c2f19435a9 100755
--- a/Master/bin/hppa-hpux/tftopl
+++ b/Master/bin/hppa-hpux/tftopl
diff --git a/Master/bin/hppa-hpux/tie b/Master/bin/hppa-hpux/tie
index 4d1b9e886a0..05ef87ec182 100755
--- a/Master/bin/hppa-hpux/tie
+++ b/Master/bin/hppa-hpux/tie
diff --git a/Master/bin/hppa-hpux/ttf2afm b/Master/bin/hppa-hpux/ttf2afm
index 35dbb766389..f00b9aa2fe6 100755
--- a/Master/bin/hppa-hpux/ttf2afm
+++ b/Master/bin/hppa-hpux/ttf2afm
diff --git a/Master/bin/hppa-hpux/ttf2pk b/Master/bin/hppa-hpux/ttf2pk
index 57e5a63b25c..8f12eae7867 100755
--- a/Master/bin/hppa-hpux/ttf2pk
+++ b/Master/bin/hppa-hpux/ttf2pk
diff --git a/Master/bin/hppa-hpux/ttf2tfm b/Master/bin/hppa-hpux/ttf2tfm
index a75758f54a6..54a62288e0e 100755
--- a/Master/bin/hppa-hpux/ttf2tfm
+++ b/Master/bin/hppa-hpux/ttf2tfm
diff --git a/Master/bin/hppa-hpux/ttftotype42 b/Master/bin/hppa-hpux/ttftotype42
index 0b5629983e7..7cc47a8da43 100755
--- a/Master/bin/hppa-hpux/ttftotype42
+++ b/Master/bin/hppa-hpux/ttftotype42
diff --git a/Master/bin/hppa-hpux/updmap b/Master/bin/hppa-hpux/updmap
index ced046f76b9..0f8cc469a83 100755
--- a/Master/bin/hppa-hpux/updmap
+++ b/Master/bin/hppa-hpux/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/hppa-hpux/utf8mex b/Master/bin/hppa-hpux/utf8mex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/utf8mex
+++ b/Master/bin/hppa-hpux/utf8mex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/vftovp b/Master/bin/hppa-hpux/vftovp
index 30408577aeb..22b328f5939 100755
--- a/Master/bin/hppa-hpux/vftovp
+++ b/Master/bin/hppa-hpux/vftovp
diff --git a/Master/bin/hppa-hpux/vptovf b/Master/bin/hppa-hpux/vptovf
index 2bf1804dc9a..bc8dbe52f46 100755
--- a/Master/bin/hppa-hpux/vptovf
+++ b/Master/bin/hppa-hpux/vptovf
diff --git a/Master/bin/hppa-hpux/weave b/Master/bin/hppa-hpux/weave
index afa05c609c8..f2941a324e1 100755
--- a/Master/bin/hppa-hpux/weave
+++ b/Master/bin/hppa-hpux/weave
diff --git a/Master/bin/hppa-hpux/xdvi-xaw.bin b/Master/bin/hppa-hpux/xdvi-xaw.bin
index 5247c5fe10a..06a1776e6fe 100755
--- a/Master/bin/hppa-hpux/xdvi-xaw.bin
+++ b/Master/bin/hppa-hpux/xdvi-xaw.bin
diff --git a/Master/bin/hppa-hpux/xdvipdfmx b/Master/bin/hppa-hpux/xdvipdfmx
new file mode 100755
index 00000000000..e7af9f02db2
--- /dev/null
+++ b/Master/bin/hppa-hpux/xdvipdfmx
diff --git a/Master/bin/hppa-hpux/xelatex b/Master/bin/hppa-hpux/xelatex
new file mode 120000
index 00000000000..ef9fe406fd6
--- /dev/null
+++ b/Master/bin/hppa-hpux/xelatex
@@ -0,0 +1 @@
+xetex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/xeplain b/Master/bin/hppa-hpux/xeplain
new file mode 120000
index 00000000000..ef9fe406fd6
--- /dev/null
+++ b/Master/bin/hppa-hpux/xeplain
@@ -0,0 +1 @@
+xetex
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/xetex b/Master/bin/hppa-hpux/xetex
new file mode 100755
index 00000000000..81eef4a36c3
--- /dev/null
+++ b/Master/bin/hppa-hpux/xetex
diff --git a/Master/bin/hppa-hpux/xmltex b/Master/bin/hppa-hpux/xmltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/hppa-hpux/xmltex
+++ b/Master/bin/hppa-hpux/xmltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file