146 files changed, 56 insertions, 39 deletions

diff --git a/Master/bin/i386-darwin/T1Wrap b/Master/bin/i386-darwin/T1Wrap
index 81a43025bbf..719f0079c3c 100755
--- a/Master/bin/i386-darwin/T1Wrap
+++ b/Master/bin/i386-darwin/T1Wrap
diff --git a/Master/bin/i386-darwin/afm2pl b/Master/bin/i386-darwin/afm2pl
index b59976ce3b2..7d0f461bbd1 100755
--- a/Master/bin/i386-darwin/afm2pl
+++ b/Master/bin/i386-darwin/afm2pl
diff --git a/Master/bin/i386-darwin/afm2tfm b/Master/bin/i386-darwin/afm2tfm
index cdc4021afc9..fd72fec28d2 100755
--- a/Master/bin/i386-darwin/afm2tfm
+++ b/Master/bin/i386-darwin/afm2tfm
diff --git a/Master/bin/i386-darwin/aleph b/Master/bin/i386-darwin/aleph
index 97c9f8b97ee..14417956c4d 100755
--- a/Master/bin/i386-darwin/aleph
+++ b/Master/bin/i386-darwin/aleph
diff --git a/Master/bin/i386-darwin/amstex b/Master/bin/i386-darwin/amstex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/amstex
+++ b/Master/bin/i386-darwin/amstex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/bg5conv b/Master/bin/i386-darwin/bg5conv
index 414119f1547..52e72f8f82a 100755
--- a/Master/bin/i386-darwin/bg5conv
+++ b/Master/bin/i386-darwin/bg5conv
diff --git a/Master/bin/i386-darwin/bibtex b/Master/bin/i386-darwin/bibtex
index 9ca498478da..8a9aa367a2c 100755
--- a/Master/bin/i386-darwin/bibtex
+++ b/Master/bin/i386-darwin/bibtex
diff --git a/Master/bin/i386-darwin/bibtex8 b/Master/bin/i386-darwin/bibtex8
index 8e8564c0402..591c05f87a0 100755
--- a/Master/bin/i386-darwin/bibtex8
+++ b/Master/bin/i386-darwin/bibtex8
diff --git a/Master/bin/i386-darwin/cef5conv b/Master/bin/i386-darwin/cef5conv
index 6547bbced94..8584791385b 100755
--- a/Master/bin/i386-darwin/cef5conv
+++ b/Master/bin/i386-darwin/cef5conv
diff --git a/Master/bin/i386-darwin/cefconv b/Master/bin/i386-darwin/cefconv
index b46e102812d..f9a5198f36f 100755
--- a/Master/bin/i386-darwin/cefconv
+++ b/Master/bin/i386-darwin/cefconv
diff --git a/Master/bin/i386-darwin/cefsconv b/Master/bin/i386-darwin/cefsconv
index 3c504145406..2a12034d454 100755
--- a/Master/bin/i386-darwin/cefsconv
+++ b/Master/bin/i386-darwin/cefsconv
diff --git a/Master/bin/i386-darwin/cfftot1 b/Master/bin/i386-darwin/cfftot1
index e812771f837..58b19de7238 100755
--- a/Master/bin/i386-darwin/cfftot1
+++ b/Master/bin/i386-darwin/cfftot1
diff --git a/Master/bin/i386-darwin/cslatex b/Master/bin/i386-darwin/cslatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/cslatex
+++ b/Master/bin/i386-darwin/cslatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/csplain b/Master/bin/i386-darwin/csplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/csplain
+++ b/Master/bin/i386-darwin/csplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/ctangle b/Master/bin/i386-darwin/ctangle
index 132b69478af..d88f68a66b3 100755
--- a/Master/bin/i386-darwin/ctangle
+++ b/Master/bin/i386-darwin/ctangle
diff --git a/Master/bin/i386-darwin/ctie b/Master/bin/i386-darwin/ctie
index 5c7b805dbf0..b2929908cbc 100755
--- a/Master/bin/i386-darwin/ctie
+++ b/Master/bin/i386-darwin/ctie
diff --git a/Master/bin/i386-darwin/cweave b/Master/bin/i386-darwin/cweave
index 6b4d8fb9845..493fbddfd86 100755
--- a/Master/bin/i386-darwin/cweave
+++ b/Master/bin/i386-darwin/cweave
diff --git a/Master/bin/i386-darwin/detex b/Master/bin/i386-darwin/detex
index b6717a78e67..db096f760fe 100755
--- a/Master/bin/i386-darwin/detex
+++ b/Master/bin/i386-darwin/detex
diff --git a/Master/bin/i386-darwin/devnag b/Master/bin/i386-darwin/devnag
index cc567f96530..ef5c298fbcb 100755
--- a/Master/bin/i386-darwin/devnag
+++ b/Master/bin/i386-darwin/devnag
diff --git a/Master/bin/i386-darwin/disdvi b/Master/bin/i386-darwin/disdvi
index d3c5cc2911b..b22e434e8ad 100755
--- a/Master/bin/i386-darwin/disdvi
+++ b/Master/bin/i386-darwin/disdvi
diff --git a/Master/bin/i386-darwin/dmp b/Master/bin/i386-darwin/dmp
index 1a99afe69b3..3cfdf03b27c 100755
--- a/Master/bin/i386-darwin/dmp
+++ b/Master/bin/i386-darwin/dmp
diff --git a/Master/bin/i386-darwin/dt2dv b/Master/bin/i386-darwin/dt2dv
index d2ee85b36b0..5e29c47c90e 100755
--- a/Master/bin/i386-darwin/dt2dv
+++ b/Master/bin/i386-darwin/dt2dv
diff --git a/Master/bin/i386-darwin/dv2dt b/Master/bin/i386-darwin/dv2dt
index 1715931c7d9..f282818fbfc 100755
--- a/Master/bin/i386-darwin/dv2dt
+++ b/Master/bin/i386-darwin/dv2dt
diff --git a/Master/bin/i386-darwin/dvi2tty b/Master/bin/i386-darwin/dvi2tty
index 174d491c6fe..90ffc1418e9 100755
--- a/Master/bin/i386-darwin/dvi2tty
+++ b/Master/bin/i386-darwin/dvi2tty
diff --git a/Master/bin/i386-darwin/dvibook b/Master/bin/i386-darwin/dvibook
index 4838d2c24d5..3da37fa6571 100755
--- a/Master/bin/i386-darwin/dvibook
+++ b/Master/bin/i386-darwin/dvibook
diff --git a/Master/bin/i386-darwin/dviconcat b/Master/bin/i386-darwin/dviconcat
index 563ba3175a0..c2c0c04dca9 100755
--- a/Master/bin/i386-darwin/dviconcat
+++ b/Master/bin/i386-darwin/dviconcat
diff --git a/Master/bin/i386-darwin/dvicopy b/Master/bin/i386-darwin/dvicopy
index 99896d42122..8cd94cf75f0 100755
--- a/Master/bin/i386-darwin/dvicopy
+++ b/Master/bin/i386-darwin/dvicopy
diff --git a/Master/bin/i386-darwin/dvidvi b/Master/bin/i386-darwin/dvidvi
index 10c337dcce0..53b7c75c47e 100755
--- a/Master/bin/i386-darwin/dvidvi
+++ b/Master/bin/i386-darwin/dvidvi
diff --git a/Master/bin/i386-darwin/dvilj b/Master/bin/i386-darwin/dvilj
index 1073647cba3..251733d1089 100755
--- a/Master/bin/i386-darwin/dvilj
+++ b/Master/bin/i386-darwin/dvilj
diff --git a/Master/bin/i386-darwin/dvilj2p b/Master/bin/i386-darwin/dvilj2p
index b93f6fbc877..f0af58fe067 100755
--- a/Master/bin/i386-darwin/dvilj2p
+++ b/Master/bin/i386-darwin/dvilj2p
diff --git a/Master/bin/i386-darwin/dvilj4 b/Master/bin/i386-darwin/dvilj4
index 3092c18205a..ce1a55ab121 100755
--- a/Master/bin/i386-darwin/dvilj4
+++ b/Master/bin/i386-darwin/dvilj4
diff --git a/Master/bin/i386-darwin/dvilj4l b/Master/bin/i386-darwin/dvilj4l
index 0b3d820dc43..25c1421e18d 100755
--- a/Master/bin/i386-darwin/dvilj4l
+++ b/Master/bin/i386-darwin/dvilj4l
diff --git a/Master/bin/i386-darwin/dvipdfm b/Master/bin/i386-darwin/dvipdfm
index d1f064c5a86..0f838658f32 100755
--- a/Master/bin/i386-darwin/dvipdfm
+++ b/Master/bin/i386-darwin/dvipdfm
diff --git a/Master/bin/i386-darwin/dvipdfmx b/Master/bin/i386-darwin/dvipdfmx
index 6a7828a6ac1..52f23b3289e 100755
--- a/Master/bin/i386-darwin/dvipdfmx
+++ b/Master/bin/i386-darwin/dvipdfmx
diff --git a/Master/bin/i386-darwin/dvipng b/Master/bin/i386-darwin/dvipng
index 6e48604e379..0be58a01de0 100755
--- a/Master/bin/i386-darwin/dvipng
+++ b/Master/bin/i386-darwin/dvipng
diff --git a/Master/bin/i386-darwin/dvips b/Master/bin/i386-darwin/dvips
index 281a7f6a1e1..1230d02c735 100755
--- a/Master/bin/i386-darwin/dvips
+++ b/Master/bin/i386-darwin/dvips
diff --git a/Master/bin/i386-darwin/dviselect b/Master/bin/i386-darwin/dviselect
index 92066a6462a..8b911af34bc 100755
--- a/Master/bin/i386-darwin/dviselect
+++ b/Master/bin/i386-darwin/dviselect
diff --git a/Master/bin/i386-darwin/dvitodvi b/Master/bin/i386-darwin/dvitodvi
index 1c8d71b4da9..f49e88f3ca3 100755
--- a/Master/bin/i386-darwin/dvitodvi
+++ b/Master/bin/i386-darwin/dvitodvi
diff --git a/Master/bin/i386-darwin/dvitomp b/Master/bin/i386-darwin/dvitomp
index ebced795cc6..81f1f944f36 100755
--- a/Master/bin/i386-darwin/dvitomp
+++ b/Master/bin/i386-darwin/dvitomp
diff --git a/Master/bin/i386-darwin/dvitype b/Master/bin/i386-darwin/dvitype
index 8a164b502ac..375bc75ad56 100755
--- a/Master/bin/i386-darwin/dvitype
+++ b/Master/bin/i386-darwin/dvitype
diff --git a/Master/bin/i386-darwin/ebb b/Master/bin/i386-darwin/ebb
index adc74199854..2323cffb804 100755
--- a/Master/bin/i386-darwin/ebb
+++ b/Master/bin/i386-darwin/ebb
diff --git a/Master/bin/i386-darwin/eplain b/Master/bin/i386-darwin/eplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/eplain
+++ b/Master/bin/i386-darwin/eplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/epsffit b/Master/bin/i386-darwin/epsffit
index b9ee86d4341..ae315af3972 100755
--- a/Master/bin/i386-darwin/epsffit
+++ b/Master/bin/i386-darwin/epsffit
diff --git a/Master/bin/i386-darwin/epstopdf b/Master/bin/i386-darwin/epstopdf
index e7ea5f239df..0fb015d4420 100755
--- a/Master/bin/i386-darwin/epstopdf
+++ b/Master/bin/i386-darwin/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-darwin/etex b/Master/bin/i386-darwin/etex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/etex
+++ b/Master/bin/i386-darwin/etex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/extconv b/Master/bin/i386-darwin/extconv
index 6e030ecff6e..5ace4f11fc4 100755
--- a/Master/bin/i386-darwin/extconv
+++ b/Master/bin/i386-darwin/extconv
diff --git a/Master/bin/i386-darwin/gftodvi b/Master/bin/i386-darwin/gftodvi
index 114d7a65b89..d4e174d550f 100755
--- a/Master/bin/i386-darwin/gftodvi
+++ b/Master/bin/i386-darwin/gftodvi
diff --git a/Master/bin/i386-darwin/gftopk b/Master/bin/i386-darwin/gftopk
index a18133ad587..c68fa12d5c1 100755
--- a/Master/bin/i386-darwin/gftopk
+++ b/Master/bin/i386-darwin/gftopk
diff --git a/Master/bin/i386-darwin/gftype b/Master/bin/i386-darwin/gftype
index 1c49561280f..8f3dbe6fb36 100755
--- a/Master/bin/i386-darwin/gftype
+++ b/Master/bin/i386-darwin/gftype
diff --git a/Master/bin/i386-darwin/gsftopk b/Master/bin/i386-darwin/gsftopk
index 8fa164b1247..f08ea5db47b 100755
--- a/Master/bin/i386-darwin/gsftopk
+++ b/Master/bin/i386-darwin/gsftopk
diff --git a/Master/bin/i386-darwin/hbf2gf b/Master/bin/i386-darwin/hbf2gf
index 63de55c2296..7b3556c6122 100755
--- a/Master/bin/i386-darwin/hbf2gf
+++ b/Master/bin/i386-darwin/hbf2gf
diff --git a/Master/bin/i386-darwin/info b/Master/bin/i386-darwin/info
index 57336747d90..b307259ff03 100755
--- a/Master/bin/i386-darwin/info
+++ b/Master/bin/i386-darwin/info
diff --git a/Master/bin/i386-darwin/infokey b/Master/bin/i386-darwin/infokey
index 18850d4f44b..61b8b864333 100755
--- a/Master/bin/i386-darwin/infokey
+++ b/Master/bin/i386-darwin/infokey
diff --git a/Master/bin/i386-darwin/install-info b/Master/bin/i386-darwin/install-info
index 0cb77312600..e71bac61fcb 100755
--- a/Master/bin/i386-darwin/install-info
+++ b/Master/bin/i386-darwin/install-info
diff --git a/Master/bin/i386-darwin/jadetex b/Master/bin/i386-darwin/jadetex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/jadetex
+++ b/Master/bin/i386-darwin/jadetex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/kpseaccess b/Master/bin/i386-darwin/kpseaccess
index 78ec4138066..e6d2ca85ac6 100755
--- a/Master/bin/i386-darwin/kpseaccess
+++ b/Master/bin/i386-darwin/kpseaccess
diff --git a/Master/bin/i386-darwin/kpsereadlink b/Master/bin/i386-darwin/kpsereadlink
index 9548c05f970..3f061b91b66 100755
--- a/Master/bin/i386-darwin/kpsereadlink
+++ b/Master/bin/i386-darwin/kpsereadlink
diff --git a/Master/bin/i386-darwin/kpsestat b/Master/bin/i386-darwin/kpsestat
index c8ff9e910bb..020c0ac54ed 100755
--- a/Master/bin/i386-darwin/kpsestat
+++ b/Master/bin/i386-darwin/kpsestat
diff --git a/Master/bin/i386-darwin/kpsewhich b/Master/bin/i386-darwin/kpsewhich
index cdfe96c2cb0..d651c822237 100755
--- a/Master/bin/i386-darwin/kpsewhich
+++ b/Master/bin/i386-darwin/kpsewhich
diff --git a/Master/bin/i386-darwin/lacheck b/Master/bin/i386-darwin/lacheck
index ef08ea7706c..229f58c1cd2 100755
--- a/Master/bin/i386-darwin/lacheck
+++ b/Master/bin/i386-darwin/lacheck
diff --git a/Master/bin/i386-darwin/latex b/Master/bin/i386-darwin/latex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/latex
+++ b/Master/bin/i386-darwin/latex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/mag b/Master/bin/i386-darwin/mag
index eb01ddc6023..08207319003 100755
--- a/Master/bin/i386-darwin/mag
+++ b/Master/bin/i386-darwin/mag
diff --git a/Master/bin/i386-darwin/makeindex b/Master/bin/i386-darwin/makeindex
index 8f387b108ae..a8120c0f9f0 100755
--- a/Master/bin/i386-darwin/makeindex
+++ b/Master/bin/i386-darwin/makeindex
diff --git a/Master/bin/i386-darwin/makeinfo b/Master/bin/i386-darwin/makeinfo
index da2ae5cf1de..e4120355943 100755
--- a/Master/bin/i386-darwin/makeinfo
+++ b/Master/bin/i386-darwin/makeinfo
diff --git a/Master/bin/i386-darwin/makempx b/Master/bin/i386-darwin/makempx
index f0a3be5aed5..fa2ca92a036 100755
--- a/Master/bin/i386-darwin/makempx
+++ b/Master/bin/i386-darwin/makempx
diff --git a/Master/bin/i386-darwin/mex b/Master/bin/i386-darwin/mex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/mex
+++ b/Master/bin/i386-darwin/mex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/mf b/Master/bin/i386-darwin/mf
index 77d64b69100..50adefba908 100755
--- a/Master/bin/i386-darwin/mf
+++ b/Master/bin/i386-darwin/mf
diff --git a/Master/bin/i386-darwin/mf-nowin b/Master/bin/i386-darwin/mf-nowin
index 7f2c485d7c9..7bd71916dae 100755
--- a/Master/bin/i386-darwin/mf-nowin
+++ b/Master/bin/i386-darwin/mf-nowin
diff --git a/Master/bin/i386-darwin/mft b/Master/bin/i386-darwin/mft
index d6ba7550b8b..8afd7bf499e 100755
--- a/Master/bin/i386-darwin/mft
+++ b/Master/bin/i386-darwin/mft
diff --git a/Master/bin/i386-darwin/mllatex b/Master/bin/i386-darwin/mllatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/mllatex
+++ b/Master/bin/i386-darwin/mllatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/mltex b/Master/bin/i386-darwin/mltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/mltex
+++ b/Master/bin/i386-darwin/mltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/mmafm b/Master/bin/i386-darwin/mmafm
index 34564be30ea..5510138adff 100755
--- a/Master/bin/i386-darwin/mmafm
+++ b/Master/bin/i386-darwin/mmafm
diff --git a/Master/bin/i386-darwin/mmpfb b/Master/bin/i386-darwin/mmpfb
index 57c301c0212..3cb01bf4eac 100755
--- a/Master/bin/i386-darwin/mmpfb
+++ b/Master/bin/i386-darwin/mmpfb
diff --git a/Master/bin/i386-darwin/mpost b/Master/bin/i386-darwin/mpost
index 8c901c0aa8b..ad93b280567 100755
--- a/Master/bin/i386-darwin/mpost
+++ b/Master/bin/i386-darwin/mpost
diff --git a/Master/bin/i386-darwin/mpto b/Master/bin/i386-darwin/mpto
index f42ddc60dba..3583ccb3335 100755
--- a/Master/bin/i386-darwin/mpto
+++ b/Master/bin/i386-darwin/mpto
diff --git a/Master/bin/i386-darwin/musixflx b/Master/bin/i386-darwin/musixflx
index aa8df5b1fb4..04f4a7fa2b8 100755
--- a/Master/bin/i386-darwin/musixflx
+++ b/Master/bin/i386-darwin/musixflx
diff --git a/Master/bin/i386-darwin/newer b/Master/bin/i386-darwin/newer
index 0ad5426c69e..ccb5b9dbb92 100755
--- a/Master/bin/i386-darwin/newer
+++ b/Master/bin/i386-darwin/newer
diff --git a/Master/bin/i386-darwin/odvicopy b/Master/bin/i386-darwin/odvicopy
index e8c7d23b9ee..10828ee412a 100755
--- a/Master/bin/i386-darwin/odvicopy
+++ b/Master/bin/i386-darwin/odvicopy
diff --git a/Master/bin/i386-darwin/odvitype b/Master/bin/i386-darwin/odvitype
index 3b29d6fa44f..5c7ce1884d9 100755
--- a/Master/bin/i386-darwin/odvitype
+++ b/Master/bin/i386-darwin/odvitype
diff --git a/Master/bin/i386-darwin/omega b/Master/bin/i386-darwin/omega
index 9950bf7c432..e4adfc92ba2 100755
--- a/Master/bin/i386-darwin/omega
+++ b/Master/bin/i386-darwin/omega
diff --git a/Master/bin/i386-darwin/omfonts b/Master/bin/i386-darwin/omfonts
index 26021c4b97c..d12babd58c0 100755
--- a/Master/bin/i386-darwin/omfonts
+++ b/Master/bin/i386-darwin/omfonts
diff --git a/Master/bin/i386-darwin/otangle b/Master/bin/i386-darwin/otangle
index 6b093e9f2f4..567bdf539fe 100755
--- a/Master/bin/i386-darwin/otangle
+++ b/Master/bin/i386-darwin/otangle
diff --git a/Master/bin/i386-darwin/otfinfo b/Master/bin/i386-darwin/otfinfo
index e554140c8c6..9d0ee83b716 100755
--- a/Master/bin/i386-darwin/otfinfo
+++ b/Master/bin/i386-darwin/otfinfo
diff --git a/Master/bin/i386-darwin/otftotfm b/Master/bin/i386-darwin/otftotfm
index 63b38fdf0fb..e12abcd72ab 100755
--- a/Master/bin/i386-darwin/otftotfm
+++ b/Master/bin/i386-darwin/otftotfm
diff --git a/Master/bin/i386-darwin/otp2ocp b/Master/bin/i386-darwin/otp2ocp
index fe27e5bbd35..7b84d0398f2 100755
--- a/Master/bin/i386-darwin/otp2ocp
+++ b/Master/bin/i386-darwin/otp2ocp
diff --git a/Master/bin/i386-darwin/outocp b/Master/bin/i386-darwin/outocp
index 80cf0141688..1867f9bdb80 100755
--- a/Master/bin/i386-darwin/outocp
+++ b/Master/bin/i386-darwin/outocp
diff --git a/Master/bin/i386-darwin/patgen b/Master/bin/i386-darwin/patgen
index 94da715503c..05c6a09b8b6 100755
--- a/Master/bin/i386-darwin/patgen
+++ b/Master/bin/i386-darwin/patgen
diff --git a/Master/bin/i386-darwin/pdfcslatex b/Master/bin/i386-darwin/pdfcslatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/pdfcslatex
+++ b/Master/bin/i386-darwin/pdfcslatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pdfcsplain b/Master/bin/i386-darwin/pdfcsplain
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/pdfcsplain
+++ b/Master/bin/i386-darwin/pdfcsplain
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pdfetex b/Master/bin/i386-darwin/pdfetex
new file mode 120000
index 00000000000..f68cc91498e
--- /dev/null
+++ b/Master/bin/i386-darwin/pdfetex
@@ -0,0 +1 @@
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pdfjadetex b/Master/bin/i386-darwin/pdfjadetex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/pdfjadetex
+++ b/Master/bin/i386-darwin/pdfjadetex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pdflatex b/Master/bin/i386-darwin/pdflatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/pdflatex
+++ b/Master/bin/i386-darwin/pdflatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pdfmex b/Master/bin/i386-darwin/pdfmex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/pdfmex
+++ b/Master/bin/i386-darwin/pdfmex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pdfplatex b/Master/bin/i386-darwin/pdfplatex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/pdfplatex
+++ b/Master/bin/i386-darwin/pdfplatex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pdftex b/Master/bin/i386-darwin/pdftex
new file mode 100755
index 00000000000..7b7d2a839e0
--- /dev/null
+++ b/Master/bin/i386-darwin/pdftex
diff --git a/Master/bin/i386-darwin/pdfxmltex b/Master/bin/i386-darwin/pdfxmltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/pdfxmltex
+++ b/Master/bin/i386-darwin/pdfxmltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pfb2pfa b/Master/bin/i386-darwin/pfb2pfa
index d3765a72066..f1654dcc535 100755
--- a/Master/bin/i386-darwin/pfb2pfa
+++ b/Master/bin/i386-darwin/pfb2pfa
diff --git a/Master/bin/i386-darwin/physe b/Master/bin/i386-darwin/physe
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/physe
+++ b/Master/bin/i386-darwin/physe
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/phyzzx b/Master/bin/i386-darwin/phyzzx
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/phyzzx
+++ b/Master/bin/i386-darwin/phyzzx
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pk2bm b/Master/bin/i386-darwin/pk2bm
index b0198e3a0ac..b85523fb1c9 100755
--- a/Master/bin/i386-darwin/pk2bm
+++ b/Master/bin/i386-darwin/pk2bm
diff --git a/Master/bin/i386-darwin/pktogf b/Master/bin/i386-darwin/pktogf
index fbe0158610f..61d550c10cd 100755
--- a/Master/bin/i386-darwin/pktogf
+++ b/Master/bin/i386-darwin/pktogf
diff --git a/Master/bin/i386-darwin/pktype b/Master/bin/i386-darwin/pktype
index e3f2aaaef29..3201bca000f 100755
--- a/Master/bin/i386-darwin/pktype
+++ b/Master/bin/i386-darwin/pktype
diff --git a/Master/bin/i386-darwin/platex b/Master/bin/i386-darwin/platex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/platex
+++ b/Master/bin/i386-darwin/platex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/pltotf b/Master/bin/i386-darwin/pltotf
index e9a19dc4de4..75cc6284010 100755
--- a/Master/bin/i386-darwin/pltotf
+++ b/Master/bin/i386-darwin/pltotf
diff --git a/Master/bin/i386-darwin/pooltype b/Master/bin/i386-darwin/pooltype
index 99e74d31385..9b648c22780 100755
--- a/Master/bin/i386-darwin/pooltype
+++ b/Master/bin/i386-darwin/pooltype
diff --git a/Master/bin/i386-darwin/ps2pk b/Master/bin/i386-darwin/ps2pk
index bebe2758a69..8070e965710 100755
--- a/Master/bin/i386-darwin/ps2pk
+++ b/Master/bin/i386-darwin/ps2pk
diff --git a/Master/bin/i386-darwin/psbook b/Master/bin/i386-darwin/psbook
index b2f6035867c..662fb7b456b 100755
--- a/Master/bin/i386-darwin/psbook
+++ b/Master/bin/i386-darwin/psbook
diff --git a/Master/bin/i386-darwin/psnup b/Master/bin/i386-darwin/psnup
index cafe18e372e..26c9b9e5fdf 100755
--- a/Master/bin/i386-darwin/psnup
+++ b/Master/bin/i386-darwin/psnup
diff --git a/Master/bin/i386-darwin/psresize b/Master/bin/i386-darwin/psresize
index 466dc144b9d..5f00ba10450 100755
--- a/Master/bin/i386-darwin/psresize
+++ b/Master/bin/i386-darwin/psresize
diff --git a/Master/bin/i386-darwin/psselect b/Master/bin/i386-darwin/psselect
index 83e5bdc93d3..dbeefb08905 100755
--- a/Master/bin/i386-darwin/psselect
+++ b/Master/bin/i386-darwin/psselect
diff --git a/Master/bin/i386-darwin/pstops b/Master/bin/i386-darwin/pstops
index cdd3b994f42..fc097e7f50a 100755
--- a/Master/bin/i386-darwin/pstops
+++ b/Master/bin/i386-darwin/pstops
diff --git a/Master/bin/i386-darwin/sjisconv b/Master/bin/i386-darwin/sjisconv
index 9a3a736598a..50592865275 100755
--- a/Master/bin/i386-darwin/sjisconv
+++ b/Master/bin/i386-darwin/sjisconv
diff --git a/Master/bin/i386-darwin/t1ascii b/Master/bin/i386-darwin/t1ascii
index 01e03483d14..09380bb2d2d 100755
--- a/Master/bin/i386-darwin/t1ascii
+++ b/Master/bin/i386-darwin/t1ascii
diff --git a/Master/bin/i386-darwin/t1asm b/Master/bin/i386-darwin/t1asm
index c68bb4133fc..68129e5fcff 100755
--- a/Master/bin/i386-darwin/t1asm
+++ b/Master/bin/i386-darwin/t1asm
diff --git a/Master/bin/i386-darwin/t1binary b/Master/bin/i386-darwin/t1binary
index fe2b2f13a55..2fef456dfa1 100755
--- a/Master/bin/i386-darwin/t1binary
+++ b/Master/bin/i386-darwin/t1binary
diff --git a/Master/bin/i386-darwin/t1disasm b/Master/bin/i386-darwin/t1disasm
index 9f9f0bf193f..3fa0f680fdc 100755
--- a/Master/bin/i386-darwin/t1disasm
+++ b/Master/bin/i386-darwin/t1disasm
diff --git a/Master/bin/i386-darwin/t1dotlessj b/Master/bin/i386-darwin/t1dotlessj
index 868af0694f2..e9fa1c4c3dd 100755
--- a/Master/bin/i386-darwin/t1dotlessj
+++ b/Master/bin/i386-darwin/t1dotlessj
diff --git a/Master/bin/i386-darwin/t1lint b/Master/bin/i386-darwin/t1lint
index f6e1e35986b..5864db667da 100755
--- a/Master/bin/i386-darwin/t1lint
+++ b/Master/bin/i386-darwin/t1lint
diff --git a/Master/bin/i386-darwin/t1mac b/Master/bin/i386-darwin/t1mac
index dbf59e56783..bf644f89ea5 100755
--- a/Master/bin/i386-darwin/t1mac
+++ b/Master/bin/i386-darwin/t1mac
diff --git a/Master/bin/i386-darwin/t1reencode b/Master/bin/i386-darwin/t1reencode
index fa4d656ea99..c3c22d8ca2c 100755
--- a/Master/bin/i386-darwin/t1reencode
+++ b/Master/bin/i386-darwin/t1reencode
diff --git a/Master/bin/i386-darwin/t1testpage b/Master/bin/i386-darwin/t1testpage
index 2296ddee62c..faee32b4ba7 100755
--- a/Master/bin/i386-darwin/t1testpage
+++ b/Master/bin/i386-darwin/t1testpage
diff --git a/Master/bin/i386-darwin/t1unmac b/Master/bin/i386-darwin/t1unmac
index 98f98aed945..54ee90d6f02 100755
--- a/Master/bin/i386-darwin/t1unmac
+++ b/Master/bin/i386-darwin/t1unmac
diff --git a/Master/bin/i386-darwin/t4ht b/Master/bin/i386-darwin/t4ht
index f927c85bc3a..3979cadc869 100755
--- a/Master/bin/i386-darwin/t4ht
+++ b/Master/bin/i386-darwin/t4ht
diff --git a/Master/bin/i386-darwin/tangle b/Master/bin/i386-darwin/tangle
index 4e825018629..96f37620e94 100755
--- a/Master/bin/i386-darwin/tangle
+++ b/Master/bin/i386-darwin/tangle
diff --git a/Master/bin/i386-darwin/tcdialog b/Master/bin/i386-darwin/tcdialog
index 59a625bbdb5..f719d1cfae7 100755
--- a/Master/bin/i386-darwin/tcdialog
+++ b/Master/bin/i386-darwin/tcdialog
diff --git a/Master/bin/i386-darwin/tex b/Master/bin/i386-darwin/tex
index 471f2dff0e9..fec61c09574 100755
--- a/Master/bin/i386-darwin/tex
+++ b/Master/bin/i386-darwin/tex
diff --git a/Master/bin/i386-darwin/tex4ht b/Master/bin/i386-darwin/tex4ht
index 793712e43c4..885b0325c48 100755
--- a/Master/bin/i386-darwin/tex4ht
+++ b/Master/bin/i386-darwin/tex4ht
diff --git a/Master/bin/i386-darwin/texi2html b/Master/bin/i386-darwin/texi2html
index ea9fea942a7..9b45e2044e3 100755
--- a/Master/bin/i386-darwin/texi2html
+++ b/Master/bin/i386-darwin/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 = '/Volumes/Beta/texlive/Build/source/inst';
+my $prefix = '/Users/jonathan/texlive/Build/source/inst';
 my $sysconfdir;
 my $pkgdatadir;
 my $datadir;
@@ -92,10 +92,10 @@ else
     $sysconfdir = "/usr/local/etc";
 }
 
-if ('/Volumes/Beta/texlive/Build/source/inst' ne '@' . 'datadir@')
+if ('/Users/jonathan/texlive/Build/source/inst' ne '@' . 'datadir@')
 {
-    $pkgdatadir = eval '"/Volumes/Beta/texlive/Build/source/inst/texi2html"';
-    $datadir = eval '"/Volumes/Beta/texlive/Build/source/inst"';
+    $pkgdatadir = eval '"/Users/jonathan/texlive/Build/source/inst/texi2html"';
+    $datadir = eval '"/Users/jonathan/texlive/Build/source/inst"';
 }
 else
 {
diff --git a/Master/bin/i386-darwin/texindex b/Master/bin/i386-darwin/texindex
index abeedf88041..444a9c93f65 100755
--- a/Master/bin/i386-darwin/texindex
+++ b/Master/bin/i386-darwin/texindex
diff --git a/Master/bin/i386-darwin/texsis b/Master/bin/i386-darwin/texsis
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/texsis
+++ b/Master/bin/i386-darwin/texsis
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/tftopl b/Master/bin/i386-darwin/tftopl
index fa0fc776f46..28c7a6f0f68 100755
--- a/Master/bin/i386-darwin/tftopl
+++ b/Master/bin/i386-darwin/tftopl
diff --git a/Master/bin/i386-darwin/tie b/Master/bin/i386-darwin/tie
index 98daaed364f..56c93e2c9cd 100755
--- a/Master/bin/i386-darwin/tie
+++ b/Master/bin/i386-darwin/tie
diff --git a/Master/bin/i386-darwin/ttf2afm b/Master/bin/i386-darwin/ttf2afm
index e02f98fa728..bca87086a73 100755
--- a/Master/bin/i386-darwin/ttf2afm
+++ b/Master/bin/i386-darwin/ttf2afm
diff --git a/Master/bin/i386-darwin/ttf2pk b/Master/bin/i386-darwin/ttf2pk
index 897fa74199d..379765c75fe 100755
--- a/Master/bin/i386-darwin/ttf2pk
+++ b/Master/bin/i386-darwin/ttf2pk
diff --git a/Master/bin/i386-darwin/ttf2tfm b/Master/bin/i386-darwin/ttf2tfm
index 0cfc803b2b2..ad194a5d7df 100755
--- a/Master/bin/i386-darwin/ttf2tfm
+++ b/Master/bin/i386-darwin/ttf2tfm
diff --git a/Master/bin/i386-darwin/ttftotype42 b/Master/bin/i386-darwin/ttftotype42
index 104eccd98c8..1a806932e33 100755
--- a/Master/bin/i386-darwin/ttftotype42
+++ b/Master/bin/i386-darwin/ttftotype42
diff --git a/Master/bin/i386-darwin/updmap b/Master/bin/i386-darwin/updmap
index ced046f76b9..0f8cc469a83 100755
--- a/Master/bin/i386-darwin/updmap
+++ b/Master/bin/i386-darwin/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-darwin/utf8mex b/Master/bin/i386-darwin/utf8mex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/utf8mex
+++ b/Master/bin/i386-darwin/utf8mex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/vftovp b/Master/bin/i386-darwin/vftovp
index 719c8bce463..fcf0da2efc2 100755
--- a/Master/bin/i386-darwin/vftovp
+++ b/Master/bin/i386-darwin/vftovp
diff --git a/Master/bin/i386-darwin/vptovf b/Master/bin/i386-darwin/vptovf
index 2490c6033b4..97b892d92a4 100755
--- a/Master/bin/i386-darwin/vptovf
+++ b/Master/bin/i386-darwin/vptovf
diff --git a/Master/bin/i386-darwin/weave b/Master/bin/i386-darwin/weave
index a0c9276dfb3..b5583682f21 100755
--- a/Master/bin/i386-darwin/weave
+++ b/Master/bin/i386-darwin/weave
diff --git a/Master/bin/i386-darwin/xdv2pdf b/Master/bin/i386-darwin/xdv2pdf
index 4c277532e1f..a69abcc1196 100755
--- a/Master/bin/i386-darwin/xdv2pdf
+++ b/Master/bin/i386-darwin/xdv2pdf
diff --git a/Master/bin/i386-darwin/xdvi-xaw.bin b/Master/bin/i386-darwin/xdvi-xaw.bin
index 8bd17dfb1bd..d243b9371a6 100755
--- a/Master/bin/i386-darwin/xdvi-xaw.bin
+++ b/Master/bin/i386-darwin/xdvi-xaw.bin
diff --git a/Master/bin/i386-darwin/xdvipdfmx b/Master/bin/i386-darwin/xdvipdfmx
index abe8abe155b..188677113cd 100755
--- a/Master/bin/i386-darwin/xdvipdfmx
+++ b/Master/bin/i386-darwin/xdvipdfmx
diff --git a/Master/bin/i386-darwin/xetex b/Master/bin/i386-darwin/xetex
index a84ed115300..d796ad99ad3 100755
--- a/Master/bin/i386-darwin/xetex
+++ b/Master/bin/i386-darwin/xetex
diff --git a/Master/bin/i386-darwin/xmltex b/Master/bin/i386-darwin/xmltex
index eb4e1e5aff7..f68cc91498e 120000
--- a/Master/bin/i386-darwin/xmltex
+++ b/Master/bin/i386-darwin/xmltex
@@ -1 +1 @@
-pdfetex
\ No newline at end of file
+pdftex
\ No newline at end of file