147 files changed, 52 insertions, 36 deletions
diff --git a/Master/bin/i386-solaris/afm2pl b/Master/bin/i386-solaris/afm2pl
index a3e067e3c6b..39d6c1be455 100755
--- a/Master/bin/i386-solaris/afm2pl
+++ b/Master/bin/i386-solaris/afm2pl
diff --git a/Master/bin/i386-solaris/afm2tfm b/Master/bin/i386-solaris/afm2tfm
index 06e4ded5236..68841114607 100755
--- a/Master/bin/i386-solaris/afm2tfm
+++ b/Master/bin/i386-solaris/afm2tfm
diff --git a/Master/bin/i386-solaris/aleph b/Master/bin/i386-solaris/aleph
index 8fa9074cd60..fb05c2d58af 100755
--- a/Master/bin/i386-solaris/aleph
+++ b/Master/bin/i386-solaris/aleph
diff --git a/Master/bin/i386-solaris/amstex b/Master/bin/i386-solaris/amstex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/amstex
+++ b/Master/bin/i386-solaris/amstex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/bg5conv b/Master/bin/i386-solaris/bg5conv
index 983060a5517..b746a3191e3 100755
--- a/Master/bin/i386-solaris/bg5conv
+++ b/Master/bin/i386-solaris/bg5conv
diff --git a/Master/bin/i386-solaris/bibtex b/Master/bin/i386-solaris/bibtex
index 6d90b9c9fbc..49cc284be8b 100755
--- a/Master/bin/i386-solaris/bibtex
+++ b/Master/bin/i386-solaris/bibtex
diff --git a/Master/bin/i386-solaris/bibtex8 b/Master/bin/i386-solaris/bibtex8
index c613cc2c1a0..321adf8aab2 100755
--- a/Master/bin/i386-solaris/bibtex8
+++ b/Master/bin/i386-solaris/bibtex8
diff --git a/Master/bin/i386-solaris/cef5conv b/Master/bin/i386-solaris/cef5conv
index da381795842..1783148f58d 100755
--- a/Master/bin/i386-solaris/cef5conv
+++ b/Master/bin/i386-solaris/cef5conv
diff --git a/Master/bin/i386-solaris/cefconv b/Master/bin/i386-solaris/cefconv
index 3f84767807e..cd4b790c58e 100755
--- a/Master/bin/i386-solaris/cefconv
+++ b/Master/bin/i386-solaris/cefconv
diff --git a/Master/bin/i386-solaris/cefsconv b/Master/bin/i386-solaris/cefsconv
index c8f983b8a08..c67ac611bbf 100755
--- a/Master/bin/i386-solaris/cefsconv
+++ b/Master/bin/i386-solaris/cefsconv
diff --git a/Master/bin/i386-solaris/cfftot1 b/Master/bin/i386-solaris/cfftot1
index a3adda1239a..aea6f156b53 100755
--- a/Master/bin/i386-solaris/cfftot1
+++ b/Master/bin/i386-solaris/cfftot1
diff --git a/Master/bin/i386-solaris/cslatex b/Master/bin/i386-solaris/cslatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/cslatex
+++ b/Master/bin/i386-solaris/cslatex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/csplain b/Master/bin/i386-solaris/csplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/csplain
+++ b/Master/bin/i386-solaris/csplain
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/ctangle b/Master/bin/i386-solaris/ctangle
index 24da509cc59..d63615d258d 100755
--- a/Master/bin/i386-solaris/ctangle
+++ b/Master/bin/i386-solaris/ctangle
diff --git a/Master/bin/i386-solaris/ctie b/Master/bin/i386-solaris/ctie
index f8aa1dcdf99..32b9465769f 100755
--- a/Master/bin/i386-solaris/ctie
+++ b/Master/bin/i386-solaris/ctie
diff --git a/Master/bin/i386-solaris/cweave b/Master/bin/i386-solaris/cweave
index 08d6f264a36..bce3f81ef7a 100755
--- a/Master/bin/i386-solaris/cweave
+++ b/Master/bin/i386-solaris/cweave
diff --git a/Master/bin/i386-solaris/detex b/Master/bin/i386-solaris/detex
index 50a458e68f3..76949f79ddf 100755
--- a/Master/bin/i386-solaris/detex
+++ b/Master/bin/i386-solaris/detex
diff --git a/Master/bin/i386-solaris/devnag b/Master/bin/i386-solaris/devnag
index 35f59daf933..3a0ce92e1ce 100755
--- a/Master/bin/i386-solaris/devnag
+++ b/Master/bin/i386-solaris/devnag
diff --git a/Master/bin/i386-solaris/disdvi b/Master/bin/i386-solaris/disdvi
index 6a144a64000..a68ce779b06 100755
--- a/Master/bin/i386-solaris/disdvi
+++ b/Master/bin/i386-solaris/disdvi
diff --git a/Master/bin/i386-solaris/dmp b/Master/bin/i386-solaris/dmp
index 009e31efd4c..641a9ec4f01 100755
--- a/Master/bin/i386-solaris/dmp
+++ b/Master/bin/i386-solaris/dmp
diff --git a/Master/bin/i386-solaris/dt2dv b/Master/bin/i386-solaris/dt2dv
index 1731130c628..9a28def00e7 100755
--- a/Master/bin/i386-solaris/dt2dv
+++ b/Master/bin/i386-solaris/dt2dv
diff --git a/Master/bin/i386-solaris/dv2dt b/Master/bin/i386-solaris/dv2dt
index b142f0bb3e2..838e6ce7d71 100755
--- a/Master/bin/i386-solaris/dv2dt
+++ b/Master/bin/i386-solaris/dv2dt
diff --git a/Master/bin/i386-solaris/dvi2tty b/Master/bin/i386-solaris/dvi2tty
index 52d143eb2ee..1772c1dd7d6 100755
--- a/Master/bin/i386-solaris/dvi2tty
+++ b/Master/bin/i386-solaris/dvi2tty
diff --git a/Master/bin/i386-solaris/dvibook b/Master/bin/i386-solaris/dvibook
index e514ceabc9b..4e0e3c99a5a 100755
--- a/Master/bin/i386-solaris/dvibook
+++ b/Master/bin/i386-solaris/dvibook
diff --git a/Master/bin/i386-solaris/dviconcat b/Master/bin/i386-solaris/dviconcat
index 097a3951cd8..ea5c02c761d 100755
--- a/Master/bin/i386-solaris/dviconcat
+++ b/Master/bin/i386-solaris/dviconcat
diff --git a/Master/bin/i386-solaris/dvicopy b/Master/bin/i386-solaris/dvicopy
index bf4d4305a12..1455812503d 100755
--- a/Master/bin/i386-solaris/dvicopy
+++ b/Master/bin/i386-solaris/dvicopy
diff --git a/Master/bin/i386-solaris/dvidvi b/Master/bin/i386-solaris/dvidvi
index 29d00c60924..ccca472144e 100755
--- a/Master/bin/i386-solaris/dvidvi
+++ b/Master/bin/i386-solaris/dvidvi
diff --git a/Master/bin/i386-solaris/dvilj b/Master/bin/i386-solaris/dvilj
index f78f74271e6..e0abab5608b 100755
--- a/Master/bin/i386-solaris/dvilj
+++ b/Master/bin/i386-solaris/dvilj
diff --git a/Master/bin/i386-solaris/dvilj2p b/Master/bin/i386-solaris/dvilj2p
index 3da0efb77aa..d3ae32e8548 100755
--- a/Master/bin/i386-solaris/dvilj2p
+++ b/Master/bin/i386-solaris/dvilj2p
diff --git a/Master/bin/i386-solaris/dvilj4 b/Master/bin/i386-solaris/dvilj4
index cba54b41447..48ecbf1a7ff 100755
--- a/Master/bin/i386-solaris/dvilj4
+++ b/Master/bin/i386-solaris/dvilj4
diff --git a/Master/bin/i386-solaris/dvilj4l b/Master/bin/i386-solaris/dvilj4l
index dd53e55e100..dab4a01d951 100755
--- a/Master/bin/i386-solaris/dvilj4l
+++ b/Master/bin/i386-solaris/dvilj4l
diff --git a/Master/bin/i386-solaris/dvipdfm b/Master/bin/i386-solaris/dvipdfm
index 9d3fc9fabb9..8224f873172 100755
--- a/Master/bin/i386-solaris/dvipdfm
+++ b/Master/bin/i386-solaris/dvipdfm
diff --git a/Master/bin/i386-solaris/dvipdfmx b/Master/bin/i386-solaris/dvipdfmx
index 7832fd77bc4..d134cddcc8a 100755
--- a/Master/bin/i386-solaris/dvipdfmx
+++ b/Master/bin/i386-solaris/dvipdfmx
diff --git a/Master/bin/i386-solaris/dvipng b/Master/bin/i386-solaris/dvipng
index 4d8d805385f..af5ea6867a6 100755
--- a/Master/bin/i386-solaris/dvipng
+++ b/Master/bin/i386-solaris/dvipng
diff --git a/Master/bin/i386-solaris/dvips b/Master/bin/i386-solaris/dvips
index e827f59cd98..8915c387ab9 100755
--- a/Master/bin/i386-solaris/dvips
+++ b/Master/bin/i386-solaris/dvips
diff --git a/Master/bin/i386-solaris/dviselect b/Master/bin/i386-solaris/dviselect
index a40dd0a8f12..d3f5fa7e3ae 100755
--- a/Master/bin/i386-solaris/dviselect
+++ b/Master/bin/i386-solaris/dviselect
diff --git a/Master/bin/i386-solaris/dvitodvi b/Master/bin/i386-solaris/dvitodvi
index 3e1837596e9..5bbd5826c3a 100755
--- a/Master/bin/i386-solaris/dvitodvi
+++ b/Master/bin/i386-solaris/dvitodvi
diff --git a/Master/bin/i386-solaris/dvitomp b/Master/bin/i386-solaris/dvitomp
index 7709697ec0e..3ffca8bbc4a 100755
--- a/Master/bin/i386-solaris/dvitomp
+++ b/Master/bin/i386-solaris/dvitomp
diff --git a/Master/bin/i386-solaris/dvitype b/Master/bin/i386-solaris/dvitype
index 11465b4961d..f7079749327 100755
--- a/Master/bin/i386-solaris/dvitype
+++ b/Master/bin/i386-solaris/dvitype
diff --git a/Master/bin/i386-solaris/ebb b/Master/bin/i386-solaris/ebb
index 1e109ed3339..674f9870adc 100755
--- a/Master/bin/i386-solaris/ebb
+++ b/Master/bin/i386-solaris/ebb
diff --git a/Master/bin/i386-solaris/eplain b/Master/bin/i386-solaris/eplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/eplain
+++ b/Master/bin/i386-solaris/eplain
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/epsffit b/Master/bin/i386-solaris/epsffit
index 8f00d8f3794..51a33f78987 100755
--- a/Master/bin/i386-solaris/epsffit
+++ b/Master/bin/i386-solaris/epsffit
diff --git a/Master/bin/i386-solaris/epstopdf b/Master/bin/i386-solaris/epstopdf
index e7ea5f239df..0fb015d4420 100755
--- a/Master/bin/i386-solaris/epstopdf
+++ b/Master/bin/i386-solaris/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/i386-solaris/etex b/Master/bin/i386-solaris/etex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/etex
+++ b/Master/bin/i386-solaris/etex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/extconv b/Master/bin/i386-solaris/extconv
index 6d615d24568..7437c215a77 100755
--- a/Master/bin/i386-solaris/extconv
+++ b/Master/bin/i386-solaris/extconv
diff --git a/Master/bin/i386-solaris/gftodvi b/Master/bin/i386-solaris/gftodvi
index 8f7cf305d3f..7869f6eaccc 100755
--- a/Master/bin/i386-solaris/gftodvi
+++ b/Master/bin/i386-solaris/gftodvi
diff --git a/Master/bin/i386-solaris/gftopk b/Master/bin/i386-solaris/gftopk
index 963fb84fdaa..4a80a84e64d 100755
--- a/Master/bin/i386-solaris/gftopk
+++ b/Master/bin/i386-solaris/gftopk
diff --git a/Master/bin/i386-solaris/gftype b/Master/bin/i386-solaris/gftype
index fd04e365e37..efb5e92fe76 100755
--- a/Master/bin/i386-solaris/gftype
+++ b/Master/bin/i386-solaris/gftype
diff --git a/Master/bin/i386-solaris/gsftopk b/Master/bin/i386-solaris/gsftopk
index 81540a4f83f..f0556d02bda 100755
--- a/Master/bin/i386-solaris/gsftopk
+++ b/Master/bin/i386-solaris/gsftopk
diff --git a/Master/bin/i386-solaris/hbf2gf b/Master/bin/i386-solaris/hbf2gf
index c6bff7373de..40340aa483f 100755
--- a/Master/bin/i386-solaris/hbf2gf
+++ b/Master/bin/i386-solaris/hbf2gf
diff --git a/Master/bin/i386-solaris/info b/Master/bin/i386-solaris/info
index adf3d6b1204..a758fe3179e 100755
--- a/Master/bin/i386-solaris/info
+++ b/Master/bin/i386-solaris/info
diff --git a/Master/bin/i386-solaris/infokey b/Master/bin/i386-solaris/infokey
index 91f1dc63215..8258506e0af 100755
--- a/Master/bin/i386-solaris/infokey
+++ b/Master/bin/i386-solaris/infokey
diff --git a/Master/bin/i386-solaris/install-info b/Master/bin/i386-solaris/install-info
index fb74c09ce35..565887a5908 100755
--- a/Master/bin/i386-solaris/install-info
+++ b/Master/bin/i386-solaris/install-info
diff --git a/Master/bin/i386-solaris/jadetex b/Master/bin/i386-solaris/jadetex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/jadetex
+++ b/Master/bin/i386-solaris/jadetex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/kpseaccess b/Master/bin/i386-solaris/kpseaccess
index e8a80ff6d1e..b18c051f36f 100755
--- a/Master/bin/i386-solaris/kpseaccess
+++ b/Master/bin/i386-solaris/kpseaccess
diff --git a/Master/bin/i386-solaris/kpsereadlink b/Master/bin/i386-solaris/kpsereadlink
index 05c96b32f24..ab5f58d0879 100755
--- a/Master/bin/i386-solaris/kpsereadlink
+++ b/Master/bin/i386-solaris/kpsereadlink
diff --git a/Master/bin/i386-solaris/kpsestat b/Master/bin/i386-solaris/kpsestat
index 9a4ebc92e81..a4b70d98621 100755
--- a/Master/bin/i386-solaris/kpsestat
+++ b/Master/bin/i386-solaris/kpsestat
diff --git a/Master/bin/i386-solaris/kpsewhich b/Master/bin/i386-solaris/kpsewhich
index 1c3a40f7e40..17745db8338 100755
--- a/Master/bin/i386-solaris/kpsewhich
+++ b/Master/bin/i386-solaris/kpsewhich
diff --git a/Master/bin/i386-solaris/lacheck b/Master/bin/i386-solaris/lacheck
index 6cfc4596a2b..a300becad95 100755
--- a/Master/bin/i386-solaris/lacheck
+++ b/Master/bin/i386-solaris/lacheck
diff --git a/Master/bin/i386-solaris/latex b/Master/bin/i386-solaris/latex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/latex
+++ b/Master/bin/i386-solaris/latex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/mag b/Master/bin/i386-solaris/mag
index 723addf8e8a..b3a3c3a6c22 100755
--- a/Master/bin/i386-solaris/mag
+++ b/Master/bin/i386-solaris/mag
diff --git a/Master/bin/i386-solaris/makeindex b/Master/bin/i386-solaris/makeindex
index 1f03facc0b5..34bba3eb734 100755
--- a/Master/bin/i386-solaris/makeindex
+++ b/Master/bin/i386-solaris/makeindex
diff --git a/Master/bin/i386-solaris/makeinfo b/Master/bin/i386-solaris/makeinfo
index 31b51a4f50f..2a4d44f214f 100755
--- a/Master/bin/i386-solaris/makeinfo
+++ b/Master/bin/i386-solaris/makeinfo
diff --git a/Master/bin/i386-solaris/makempx b/Master/bin/i386-solaris/makempx
index 443576f8098..5a534aac553 100755
--- a/Master/bin/i386-solaris/makempx
+++ b/Master/bin/i386-solaris/makempx
diff --git a/Master/bin/i386-solaris/mex b/Master/bin/i386-solaris/mex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/mex
+++ b/Master/bin/i386-solaris/mex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/mf b/Master/bin/i386-solaris/mf
index 11d12a10384..38ffb8cefc5 100755
--- a/Master/bin/i386-solaris/mf
+++ b/Master/bin/i386-solaris/mf
diff --git a/Master/bin/i386-solaris/mf-nowin b/Master/bin/i386-solaris/mf-nowin
index 620dfe1c05e..1247f634316 100755
--- a/Master/bin/i386-solaris/mf-nowin
+++ b/Master/bin/i386-solaris/mf-nowin
diff --git a/Master/bin/i386-solaris/mft b/Master/bin/i386-solaris/mft
index adfbf2d209d..05f5a487594 100755
--- a/Master/bin/i386-solaris/mft
+++ b/Master/bin/i386-solaris/mft
diff --git a/Master/bin/i386-solaris/mllatex b/Master/bin/i386-solaris/mllatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/mllatex
+++ b/Master/bin/i386-solaris/mllatex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/mltex b/Master/bin/i386-solaris/mltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/mltex
+++ b/Master/bin/i386-solaris/mltex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/mmafm b/Master/bin/i386-solaris/mmafm
index 7f517b55f20..ab49c53036b 100755
--- a/Master/bin/i386-solaris/mmafm
+++ b/Master/bin/i386-solaris/mmafm
diff --git a/Master/bin/i386-solaris/mmpfb b/Master/bin/i386-solaris/mmpfb
index 44dbad32ecd..4e4f9727df9 100755
--- a/Master/bin/i386-solaris/mmpfb
+++ b/Master/bin/i386-solaris/mmpfb
diff --git a/Master/bin/i386-solaris/mpost b/Master/bin/i386-solaris/mpost
index f915224cd37..ee514c864bc 100755
--- a/Master/bin/i386-solaris/mpost
+++ b/Master/bin/i386-solaris/mpost
diff --git a/Master/bin/i386-solaris/mpto b/Master/bin/i386-solaris/mpto
index 084249aed10..259ee77b182 100755
--- a/Master/bin/i386-solaris/mpto
+++ b/Master/bin/i386-solaris/mpto
diff --git a/Master/bin/i386-solaris/musixflx b/Master/bin/i386-solaris/musixflx
index 2a67c3dc31a..d058c523032 100755
--- a/Master/bin/i386-solaris/musixflx
+++ b/Master/bin/i386-solaris/musixflx
diff --git a/Master/bin/i386-solaris/newer b/Master/bin/i386-solaris/newer
index 04e40f87b29..82691459960 100755
--- a/Master/bin/i386-solaris/newer
+++ b/Master/bin/i386-solaris/newer
diff --git a/Master/bin/i386-solaris/odvicopy b/Master/bin/i386-solaris/odvicopy
index 46f68a39584..6dddc2406ac 100755
--- a/Master/bin/i386-solaris/odvicopy
+++ b/Master/bin/i386-solaris/odvicopy
diff --git a/Master/bin/i386-solaris/odvitype b/Master/bin/i386-solaris/odvitype
index f18f0af6d21..996869e0256 100755
--- a/Master/bin/i386-solaris/odvitype
+++ b/Master/bin/i386-solaris/odvitype
diff --git a/Master/bin/i386-solaris/omega b/Master/bin/i386-solaris/omega
index e0560b716f1..08903ef5558 100755
--- a/Master/bin/i386-solaris/omega
+++ b/Master/bin/i386-solaris/omega
diff --git a/Master/bin/i386-solaris/omfonts b/Master/bin/i386-solaris/omfonts
index b7864d4c5aa..9d9558ae63f 100755
--- a/Master/bin/i386-solaris/omfonts
+++ b/Master/bin/i386-solaris/omfonts
diff --git a/Master/bin/i386-solaris/otangle b/Master/bin/i386-solaris/otangle
index db390f90d69..acaeda63191 100755
--- a/Master/bin/i386-solaris/otangle
+++ b/Master/bin/i386-solaris/otangle
diff --git a/Master/bin/i386-solaris/otfinfo b/Master/bin/i386-solaris/otfinfo
index 0d2cad9958c..f82bcdb0107 100755
--- a/Master/bin/i386-solaris/otfinfo
+++ b/Master/bin/i386-solaris/otfinfo
diff --git a/Master/bin/i386-solaris/otftotfm b/Master/bin/i386-solaris/otftotfm
index bcca10f75e0..ac6b2f11522 100755
--- a/Master/bin/i386-solaris/otftotfm
+++ b/Master/bin/i386-solaris/otftotfm
diff --git a/Master/bin/i386-solaris/otp2ocp b/Master/bin/i386-solaris/otp2ocp
index 0dcf53be9f5..9f6dbaa9d8d 100755
--- a/Master/bin/i386-solaris/otp2ocp
+++ b/Master/bin/i386-solaris/otp2ocp
diff --git a/Master/bin/i386-solaris/outocp b/Master/bin/i386-solaris/outocp
index 94bbc8ec0c5..e23e1d21196 100755
--- a/Master/bin/i386-solaris/outocp
+++ b/Master/bin/i386-solaris/outocp
diff --git a/Master/bin/i386-solaris/patgen b/Master/bin/i386-solaris/patgen
index af7af5fb4d7..45929d8d134 100755
--- a/Master/bin/i386-solaris/patgen
+++ b/Master/bin/i386-solaris/patgen
diff --git a/Master/bin/i386-solaris/pdfclose b/Master/bin/i386-solaris/pdfclose
index d0e5ff0024e..1ecb1332bc0 100755
--- a/Master/bin/i386-solaris/pdfclose
+++ b/Master/bin/i386-solaris/pdfclose
diff --git a/Master/bin/i386-solaris/pdfcslatex b/Master/bin/i386-solaris/pdfcslatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/pdfcslatex
+++ b/Master/bin/i386-solaris/pdfcslatex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pdfcsplain b/Master/bin/i386-solaris/pdfcsplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/pdfcsplain
+++ b/Master/bin/i386-solaris/pdfcsplain
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pdfetex b/Master/bin/i386-solaris/pdfetex
index 33e338b1383..f68cc91498e 100755..120000
--- a/Master/bin/i386-solaris/pdfetex
+++ b/Master/bin/i386-solaris/pdfetex
diff --git a/Master/bin/i386-solaris/pdfjadetex b/Master/bin/i386-solaris/pdfjadetex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/pdfjadetex
+++ b/Master/bin/i386-solaris/pdfjadetex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pdflatex b/Master/bin/i386-solaris/pdflatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/pdflatex
+++ b/Master/bin/i386-solaris/pdflatex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pdfmex b/Master/bin/i386-solaris/pdfmex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/pdfmex
+++ b/Master/bin/i386-solaris/pdfmex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pdfopen b/Master/bin/i386-solaris/pdfopen
index 721b16a83ad..8a7f1ea4666 100755
--- a/Master/bin/i386-solaris/pdfopen
+++ b/Master/bin/i386-solaris/pdfopen
diff --git a/Master/bin/i386-solaris/pdfplatex b/Master/bin/i386-solaris/pdfplatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/pdfplatex
+++ b/Master/bin/i386-solaris/pdfplatex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pdftex b/Master/bin/i386-solaris/pdftex
index eb4e1e5aff7..cac2ce2f3e8 120000..100755
--- a/Master/bin/i386-solaris/pdftex
+++ b/Master/bin/i386-solaris/pdftex
diff --git a/Master/bin/i386-solaris/pdfxmltex b/Master/bin/i386-solaris/pdfxmltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/pdfxmltex
+++ b/Master/bin/i386-solaris/pdfxmltex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pfb2pfa b/Master/bin/i386-solaris/pfb2pfa
index 2256eea6c78..fa3550e0720 100755
--- a/Master/bin/i386-solaris/pfb2pfa
+++ b/Master/bin/i386-solaris/pfb2pfa
diff --git a/Master/bin/i386-solaris/physe b/Master/bin/i386-solaris/physe
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/physe
+++ b/Master/bin/i386-solaris/physe
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/phyzzx b/Master/bin/i386-solaris/phyzzx
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/phyzzx
+++ b/Master/bin/i386-solaris/phyzzx
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pk2bm b/Master/bin/i386-solaris/pk2bm
index 1c6de1245f3..11a13f170ac 100755
--- a/Master/bin/i386-solaris/pk2bm
+++ b/Master/bin/i386-solaris/pk2bm
diff --git a/Master/bin/i386-solaris/pktogf b/Master/bin/i386-solaris/pktogf
index 787158d4d54..cb6c7b82f05 100755
--- a/Master/bin/i386-solaris/pktogf
+++ b/Master/bin/i386-solaris/pktogf
diff --git a/Master/bin/i386-solaris/pktype b/Master/bin/i386-solaris/pktype
index 2a392a27b01..81ee5cbc7ec 100755
--- a/Master/bin/i386-solaris/pktype
+++ b/Master/bin/i386-solaris/pktype
diff --git a/Master/bin/i386-solaris/platex b/Master/bin/i386-solaris/platex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/platex
+++ b/Master/bin/i386-solaris/platex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pltotf b/Master/bin/i386-solaris/pltotf
index 3013f77070a..13e4babc464 100755
--- a/Master/bin/i386-solaris/pltotf
+++ b/Master/bin/i386-solaris/pltotf
diff --git a/Master/bin/i386-solaris/pooltype b/Master/bin/i386-solaris/pooltype
index 2cf46a36cc8..7b72095a83b 100755
--- a/Master/bin/i386-solaris/pooltype
+++ b/Master/bin/i386-solaris/pooltype
diff --git a/Master/bin/i386-solaris/ps2pk b/Master/bin/i386-solaris/ps2pk
index 06a813fd8f4..62e94a580d8 100755
--- a/Master/bin/i386-solaris/ps2pk
+++ b/Master/bin/i386-solaris/ps2pk
diff --git a/Master/bin/i386-solaris/psbook b/Master/bin/i386-solaris/psbook
index 363e8a6013a..63ee135f76e 100755
--- a/Master/bin/i386-solaris/psbook
+++ b/Master/bin/i386-solaris/psbook
diff --git a/Master/bin/i386-solaris/psnup b/Master/bin/i386-solaris/psnup
index ae30edbb708..8150054b276 100755
--- a/Master/bin/i386-solaris/psnup
+++ b/Master/bin/i386-solaris/psnup
diff --git a/Master/bin/i386-solaris/psresize b/Master/bin/i386-solaris/psresize
index 02dbba2d880..7b3255a8a9a 100755
--- a/Master/bin/i386-solaris/psresize
+++ b/Master/bin/i386-solaris/psresize
diff --git a/Master/bin/i386-solaris/psselect b/Master/bin/i386-solaris/psselect
index 8cdaebb3902..9c0350ce9f1 100755
--- a/Master/bin/i386-solaris/psselect
+++ b/Master/bin/i386-solaris/psselect
diff --git a/Master/bin/i386-solaris/pstops b/Master/bin/i386-solaris/pstops
index 7f4dc0149c7..0eba7eb725c 100755
--- a/Master/bin/i386-solaris/pstops
+++ b/Master/bin/i386-solaris/pstops
diff --git a/Master/bin/i386-solaris/sjisconv b/Master/bin/i386-solaris/sjisconv
index 8ab4d76fbcd..36bac29129a 100755
--- a/Master/bin/i386-solaris/sjisconv
+++ b/Master/bin/i386-solaris/sjisconv
diff --git a/Master/bin/i386-solaris/t1ascii b/Master/bin/i386-solaris/t1ascii
index 75293ea4074..7ab92945ce7 100755
--- a/Master/bin/i386-solaris/t1ascii
+++ b/Master/bin/i386-solaris/t1ascii
diff --git a/Master/bin/i386-solaris/t1asm b/Master/bin/i386-solaris/t1asm
index 064d99e658b..71c50fb899e 100755
--- a/Master/bin/i386-solaris/t1asm
+++ b/Master/bin/i386-solaris/t1asm
diff --git a/Master/bin/i386-solaris/t1binary b/Master/bin/i386-solaris/t1binary
index 0298a69610a..0162b2b691a 100755
--- a/Master/bin/i386-solaris/t1binary
+++ b/Master/bin/i386-solaris/t1binary
diff --git a/Master/bin/i386-solaris/t1disasm b/Master/bin/i386-solaris/t1disasm
index 25ac083c2f3..8180698e66e 100755
--- a/Master/bin/i386-solaris/t1disasm
+++ b/Master/bin/i386-solaris/t1disasm
diff --git a/Master/bin/i386-solaris/t1dotlessj b/Master/bin/i386-solaris/t1dotlessj
index d51aa870d05..967a022c2c8 100755
--- a/Master/bin/i386-solaris/t1dotlessj
+++ b/Master/bin/i386-solaris/t1dotlessj
diff --git a/Master/bin/i386-solaris/t1lint b/Master/bin/i386-solaris/t1lint
index 9c86325b0b1..b31b622fa6e 100755
--- a/Master/bin/i386-solaris/t1lint
+++ b/Master/bin/i386-solaris/t1lint
diff --git a/Master/bin/i386-solaris/t1mac b/Master/bin/i386-solaris/t1mac
index dcf70a5ead6..ec774554b4f 100755
--- a/Master/bin/i386-solaris/t1mac
+++ b/Master/bin/i386-solaris/t1mac
diff --git a/Master/bin/i386-solaris/t1reencode b/Master/bin/i386-solaris/t1reencode
index 63089e74b00..383ec746b06 100755
--- a/Master/bin/i386-solaris/t1reencode
+++ b/Master/bin/i386-solaris/t1reencode
diff --git a/Master/bin/i386-solaris/t1testpage b/Master/bin/i386-solaris/t1testpage
index d5ad66392c4..034ccf726bc 100755
--- a/Master/bin/i386-solaris/t1testpage
+++ b/Master/bin/i386-solaris/t1testpage
diff --git a/Master/bin/i386-solaris/t1unmac b/Master/bin/i386-solaris/t1unmac
index 0c2d035f3cd..5c023562f80 100755
--- a/Master/bin/i386-solaris/t1unmac
+++ b/Master/bin/i386-solaris/t1unmac
diff --git a/Master/bin/i386-solaris/t4ht b/Master/bin/i386-solaris/t4ht
index 945478f3a89..2706023da83 100755
--- a/Master/bin/i386-solaris/t4ht
+++ b/Master/bin/i386-solaris/t4ht
diff --git a/Master/bin/i386-solaris/tangle b/Master/bin/i386-solaris/tangle
index ca4f35107b7..0c361471abf 100755
--- a/Master/bin/i386-solaris/tangle
+++ b/Master/bin/i386-solaris/tangle
diff --git a/Master/bin/i386-solaris/tcdialog b/Master/bin/i386-solaris/tcdialog
index bb73e77fb28..e655a1a2817 100755
--- a/Master/bin/i386-solaris/tcdialog
+++ b/Master/bin/i386-solaris/tcdialog
diff --git a/Master/bin/i386-solaris/tex b/Master/bin/i386-solaris/tex
index 710688e6fd8..935bd527953 100755
--- a/Master/bin/i386-solaris/tex
+++ b/Master/bin/i386-solaris/tex
diff --git a/Master/bin/i386-solaris/tex4ht b/Master/bin/i386-solaris/tex4ht
index 21ed58e9e0d..6f8da450c8f 100755
--- a/Master/bin/i386-solaris/tex4ht
+++ b/Master/bin/i386-solaris/tex4ht
diff --git a/Master/bin/i386-solaris/texconfig b/Master/bin/i386-solaris/texconfig
index 633ba7e807d..976f4590ab5 100755
--- a/Master/bin/i386-solaris/texconfig
+++ b/Master/bin/i386-solaris/texconfig
@@ -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/i386-solaris/texindex b/Master/bin/i386-solaris/texindex
index 306f769ae51..feb3c866a42 100755
--- a/Master/bin/i386-solaris/texindex
+++ b/Master/bin/i386-solaris/texindex
diff --git a/Master/bin/i386-solaris/texsis b/Master/bin/i386-solaris/texsis
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/texsis
+++ b/Master/bin/i386-solaris/texsis
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/tftopl b/Master/bin/i386-solaris/tftopl
index b674d596340..268d6f8ea83 100755
--- a/Master/bin/i386-solaris/tftopl
+++ b/Master/bin/i386-solaris/tftopl
diff --git a/Master/bin/i386-solaris/tie b/Master/bin/i386-solaris/tie
index 67015960dad..7cc87d2522f 100755
--- a/Master/bin/i386-solaris/tie
+++ b/Master/bin/i386-solaris/tie
diff --git a/Master/bin/i386-solaris/ttf2afm b/Master/bin/i386-solaris/ttf2afm
index 835d54c4629..2a05104aa4c 100755
--- a/Master/bin/i386-solaris/ttf2afm
+++ b/Master/bin/i386-solaris/ttf2afm
diff --git a/Master/bin/i386-solaris/ttf2pk b/Master/bin/i386-solaris/ttf2pk
index 92c0b570773..9a667ed610e 100755
--- a/Master/bin/i386-solaris/ttf2pk
+++ b/Master/bin/i386-solaris/ttf2pk
diff --git a/Master/bin/i386-solaris/ttf2tfm b/Master/bin/i386-solaris/ttf2tfm
index f0fcbe90a57..83657801443 100755
--- a/Master/bin/i386-solaris/ttf2tfm
+++ b/Master/bin/i386-solaris/ttf2tfm
diff --git a/Master/bin/i386-solaris/ttftotype42 b/Master/bin/i386-solaris/ttftotype42
index a7e237bf42e..6c0dbd5245e 100755
--- a/Master/bin/i386-solaris/ttftotype42
+++ b/Master/bin/i386-solaris/ttftotype42
diff --git a/Master/bin/i386-solaris/updmap b/Master/bin/i386-solaris/updmap
index ced046f76b9..0f8cc469a83 100755
--- a/Master/bin/i386-solaris/updmap
+++ b/Master/bin/i386-solaris/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/i386-solaris/utf8mex b/Master/bin/i386-solaris/utf8mex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/utf8mex
+++ b/Master/bin/i386-solaris/utf8mex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/vftovp b/Master/bin/i386-solaris/vftovp
index 368e4738807..823d0eb777f 100755
--- a/Master/bin/i386-solaris/vftovp
+++ b/Master/bin/i386-solaris/vftovp
diff --git a/Master/bin/i386-solaris/vptovf b/Master/bin/i386-solaris/vptovf
index c7b9e5de9d9..3433c0c99e2 100755
--- a/Master/bin/i386-solaris/vptovf
+++ b/Master/bin/i386-solaris/vptovf
diff --git a/Master/bin/i386-solaris/weave b/Master/bin/i386-solaris/weave
index 381445a69f1..852745abf7b 100755
--- a/Master/bin/i386-solaris/weave
+++ b/Master/bin/i386-solaris/weave
diff --git a/Master/bin/i386-solaris/xdvi-xaw.bin b/Master/bin/i386-solaris/xdvi-xaw.bin
index d0eb4cac370..c328f61e4bf 100755
--- a/Master/bin/i386-solaris/xdvi-xaw.bin
+++ b/Master/bin/i386-solaris/xdvi-xaw.bin
diff --git a/Master/bin/i386-solaris/xdvipdfmx b/Master/bin/i386-solaris/xdvipdfmx
index afd9aaf9409..40f22da3060 100755
--- a/Master/bin/i386-solaris/xdvipdfmx
+++ b/Master/bin/i386-solaris/xdvipdfmx
diff --git a/Master/bin/i386-solaris/xetex b/Master/bin/i386-solaris/xetex
index 6d30960b9a3..e0638cc3e74 100755
--- a/Master/bin/i386-solaris/xetex
+++ b/Master/bin/i386-solaris/xetex
diff --git a/Master/bin/i386-solaris/xmltex b/Master/bin/i386-solaris/xmltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-solaris/xmltex
+++ b/Master/bin/i386-solaris/xmltex
@@ -1 +1 @@
-pdfetex
-\ No newline at end of file
+pdftex
+\ No newline at end of file
diff --git a/Master/support/i386-solaris-libs.pkg.gz b/Master/support/i386-solaris-libs.pkg.gz
index 8211fad9315..6beae5ad5dc 100644
--- a/Master/support/i386-solaris-libs.pkg.gz
+++ b/Master/support/i386-solaris-libs.pkg.gz