62 files changed, 43 insertions, 19 deletions

diff --git a/Master/bin/i386-openbsd/afm2pl b/Master/bin/i386-openbsd/afm2pl
index b5a7494e16e..92c676ef44e 100755
--- a/Master/bin/i386-openbsd/afm2pl
+++ b/Master/bin/i386-openbsd/afm2pl
diff --git a/Master/bin/i386-openbsd/afm2tfm b/Master/bin/i386-openbsd/afm2tfm
index 3a0b2d97b02..e2f262ab318 100755
--- a/Master/bin/i386-openbsd/afm2tfm
+++ b/Master/bin/i386-openbsd/afm2tfm
diff --git a/Master/bin/i386-openbsd/aleph b/Master/bin/i386-openbsd/aleph
index e4d991157b5..ac4a7063765 100755
--- a/Master/bin/i386-openbsd/aleph
+++ b/Master/bin/i386-openbsd/aleph
diff --git a/Master/bin/i386-openbsd/bibtex b/Master/bin/i386-openbsd/bibtex
index 1b578d619d3..834f7ec4857 100755
--- a/Master/bin/i386-openbsd/bibtex
+++ b/Master/bin/i386-openbsd/bibtex
diff --git a/Master/bin/i386-openbsd/bibtex8 b/Master/bin/i386-openbsd/bibtex8
index b6f90127198..6d12d0aa5c7 100755
--- a/Master/bin/i386-openbsd/bibtex8
+++ b/Master/bin/i386-openbsd/bibtex8
diff --git a/Master/bin/i386-openbsd/ctangle b/Master/bin/i386-openbsd/ctangle
index 089a472857e..666a31fa790 100755
--- a/Master/bin/i386-openbsd/ctangle
+++ b/Master/bin/i386-openbsd/ctangle
diff --git a/Master/bin/i386-openbsd/ctie b/Master/bin/i386-openbsd/ctie
index 974c03018d1..4dcc6e490ad 100755
--- a/Master/bin/i386-openbsd/ctie
+++ b/Master/bin/i386-openbsd/ctie
diff --git a/Master/bin/i386-openbsd/cweave b/Master/bin/i386-openbsd/cweave
index c31b63ab1a3..eed0571b1aa 100755
--- a/Master/bin/i386-openbsd/cweave
+++ b/Master/bin/i386-openbsd/cweave
diff --git a/Master/bin/i386-openbsd/detex b/Master/bin/i386-openbsd/detex
index 248513ce669..a666f5524f6 100755
--- a/Master/bin/i386-openbsd/detex
+++ b/Master/bin/i386-openbsd/detex
diff --git a/Master/bin/i386-openbsd/dmp b/Master/bin/i386-openbsd/dmp
index 4e1ed46ae44..27b762f0b86 100755
--- a/Master/bin/i386-openbsd/dmp
+++ b/Master/bin/i386-openbsd/dmp
diff --git a/Master/bin/i386-openbsd/dt2dv b/Master/bin/i386-openbsd/dt2dv
index 44f51d0adbf..dec23f22dfe 100755
--- a/Master/bin/i386-openbsd/dt2dv
+++ b/Master/bin/i386-openbsd/dt2dv
diff --git a/Master/bin/i386-openbsd/dvicopy b/Master/bin/i386-openbsd/dvicopy
index 59697dc9c82..8486d13e07a 100755
--- a/Master/bin/i386-openbsd/dvicopy
+++ b/Master/bin/i386-openbsd/dvicopy
diff --git a/Master/bin/i386-openbsd/dvilj b/Master/bin/i386-openbsd/dvilj
index 736115abdcc..fc2b0b97523 100755
--- a/Master/bin/i386-openbsd/dvilj
+++ b/Master/bin/i386-openbsd/dvilj
diff --git a/Master/bin/i386-openbsd/dvilj2p b/Master/bin/i386-openbsd/dvilj2p
index 6bb32c99fab..8610ada6333 100755
--- a/Master/bin/i386-openbsd/dvilj2p
+++ b/Master/bin/i386-openbsd/dvilj2p
diff --git a/Master/bin/i386-openbsd/dvilj4 b/Master/bin/i386-openbsd/dvilj4
index 65542464bf5..2b841727d09 100755
--- a/Master/bin/i386-openbsd/dvilj4
+++ b/Master/bin/i386-openbsd/dvilj4
diff --git a/Master/bin/i386-openbsd/dvilj4l b/Master/bin/i386-openbsd/dvilj4l
index 41000649ebb..d0a07d39e15 100755
--- a/Master/bin/i386-openbsd/dvilj4l
+++ b/Master/bin/i386-openbsd/dvilj4l
diff --git a/Master/bin/i386-openbsd/dvipdfm b/Master/bin/i386-openbsd/dvipdfm
index f2e254ed1af..d967c675de3 100755
--- a/Master/bin/i386-openbsd/dvipdfm
+++ b/Master/bin/i386-openbsd/dvipdfm
diff --git a/Master/bin/i386-openbsd/dvipdfmx b/Master/bin/i386-openbsd/dvipdfmx
index cc7113823e2..e3457895cf4 100755
--- a/Master/bin/i386-openbsd/dvipdfmx
+++ b/Master/bin/i386-openbsd/dvipdfmx
diff --git a/Master/bin/i386-openbsd/dvipng b/Master/bin/i386-openbsd/dvipng
index 27bcba2f75e..d98a90b8b4f 100755
--- a/Master/bin/i386-openbsd/dvipng
+++ b/Master/bin/i386-openbsd/dvipng
diff --git a/Master/bin/i386-openbsd/dvipos b/Master/bin/i386-openbsd/dvipos
index fb0bdaef736..150e3b38e42 100755
--- a/Master/bin/i386-openbsd/dvipos
+++ b/Master/bin/i386-openbsd/dvipos
diff --git a/Master/bin/i386-openbsd/dvips b/Master/bin/i386-openbsd/dvips
index f0895ace684..ac893af6b07 100755
--- a/Master/bin/i386-openbsd/dvips
+++ b/Master/bin/i386-openbsd/dvips
diff --git a/Master/bin/i386-openbsd/dvitomp b/Master/bin/i386-openbsd/dvitomp
index e78e555c6d0..e5abe47d5d8 100755
--- a/Master/bin/i386-openbsd/dvitomp
+++ b/Master/bin/i386-openbsd/dvitomp
diff --git a/Master/bin/i386-openbsd/dvitype b/Master/bin/i386-openbsd/dvitype
index 29ebd701130..063a5e97313 100755
--- a/Master/bin/i386-openbsd/dvitype
+++ b/Master/bin/i386-openbsd/dvitype
diff --git a/Master/bin/i386-openbsd/ebb b/Master/bin/i386-openbsd/ebb
index ada695bd386..d8f14d744cb 100755
--- a/Master/bin/i386-openbsd/ebb
+++ b/Master/bin/i386-openbsd/ebb
diff --git a/Master/bin/i386-openbsd/gftodvi b/Master/bin/i386-openbsd/gftodvi
index 43e00840a96..b5714c4ae04 100755
--- a/Master/bin/i386-openbsd/gftodvi
+++ b/Master/bin/i386-openbsd/gftodvi
diff --git a/Master/bin/i386-openbsd/gftopk b/Master/bin/i386-openbsd/gftopk
index 823bf66f104..e66231981de 100755
--- a/Master/bin/i386-openbsd/gftopk
+++ b/Master/bin/i386-openbsd/gftopk
diff --git a/Master/bin/i386-openbsd/gftype b/Master/bin/i386-openbsd/gftype
index 7cb6098ab15..83c480f50bb 100755
--- a/Master/bin/i386-openbsd/gftype
+++ b/Master/bin/i386-openbsd/gftype
diff --git a/Master/bin/i386-openbsd/gsftopk b/Master/bin/i386-openbsd/gsftopk
index 2355264e73b..4bf06525b26 100755
--- a/Master/bin/i386-openbsd/gsftopk
+++ b/Master/bin/i386-openbsd/gsftopk
diff --git a/Master/bin/i386-openbsd/hbf2gf b/Master/bin/i386-openbsd/hbf2gf
index a3b6cc604ef..58f2d6ae7cb 100755
--- a/Master/bin/i386-openbsd/hbf2gf
+++ b/Master/bin/i386-openbsd/hbf2gf
diff --git a/Master/bin/i386-openbsd/kpsewhich b/Master/bin/i386-openbsd/kpsewhich
index 6d11727600e..27ac5f41b73 100755
--- a/Master/bin/i386-openbsd/kpsewhich
+++ b/Master/bin/i386-openbsd/kpsewhich
diff --git a/Master/bin/i386-openbsd/makeindex b/Master/bin/i386-openbsd/makeindex
index d4b3a3f1212..c6d80dbee16 100755
--- a/Master/bin/i386-openbsd/makeindex
+++ b/Master/bin/i386-openbsd/makeindex
diff --git a/Master/bin/i386-openbsd/makempx b/Master/bin/i386-openbsd/makempx
index e4af8067fba..f5a6f727a19 100755
--- a/Master/bin/i386-openbsd/makempx
+++ b/Master/bin/i386-openbsd/makempx
diff --git a/Master/bin/i386-openbsd/mf b/Master/bin/i386-openbsd/mf
index f06e5d6f7ee..f101c15f3a4 100755
--- a/Master/bin/i386-openbsd/mf
+++ b/Master/bin/i386-openbsd/mf
diff --git a/Master/bin/i386-openbsd/mf-nowin b/Master/bin/i386-openbsd/mf-nowin
index 905428f46f4..e5a301861ed 100755
--- a/Master/bin/i386-openbsd/mf-nowin
+++ b/Master/bin/i386-openbsd/mf-nowin
diff --git a/Master/bin/i386-openbsd/mft b/Master/bin/i386-openbsd/mft
index 4767bb97f65..29cd380ba5c 100755
--- a/Master/bin/i386-openbsd/mft
+++ b/Master/bin/i386-openbsd/mft
diff --git a/Master/bin/i386-openbsd/mpost b/Master/bin/i386-openbsd/mpost
index 5b03281f003..a45e5896080 100755
--- a/Master/bin/i386-openbsd/mpost
+++ b/Master/bin/i386-openbsd/mpost
diff --git a/Master/bin/i386-openbsd/odvicopy b/Master/bin/i386-openbsd/odvicopy
index 4602b139f77..2752e49c1ed 100755
--- a/Master/bin/i386-openbsd/odvicopy
+++ b/Master/bin/i386-openbsd/odvicopy
diff --git a/Master/bin/i386-openbsd/odvitype b/Master/bin/i386-openbsd/odvitype
index 7ad7bbe2fe2..a7097133b27 100755
--- a/Master/bin/i386-openbsd/odvitype
+++ b/Master/bin/i386-openbsd/odvitype
diff --git a/Master/bin/i386-openbsd/omega b/Master/bin/i386-openbsd/omega
index 72303751a63..03af109b06e 100755
--- a/Master/bin/i386-openbsd/omega
+++ b/Master/bin/i386-openbsd/omega
diff --git a/Master/bin/i386-openbsd/omfonts b/Master/bin/i386-openbsd/omfonts
index b4b64ab0e66..6e1bde68174 100755
--- a/Master/bin/i386-openbsd/omfonts
+++ b/Master/bin/i386-openbsd/omfonts
diff --git a/Master/bin/i386-openbsd/otftotfm b/Master/bin/i386-openbsd/otftotfm
index 7228ec82b72..f593e894638 100755
--- a/Master/bin/i386-openbsd/otftotfm
+++ b/Master/bin/i386-openbsd/otftotfm
diff --git a/Master/bin/i386-openbsd/otp2ocp b/Master/bin/i386-openbsd/otp2ocp
index 9d65ca2f74a..5d206f0ae81 100755
--- a/Master/bin/i386-openbsd/otp2ocp
+++ b/Master/bin/i386-openbsd/otp2ocp
diff --git a/Master/bin/i386-openbsd/outocp b/Master/bin/i386-openbsd/outocp
index 5b011ea4ab0..8aa39881fcf 100755
--- a/Master/bin/i386-openbsd/outocp
+++ b/Master/bin/i386-openbsd/outocp
diff --git a/Master/bin/i386-openbsd/pdftex b/Master/bin/i386-openbsd/pdftex
index aabe0def998..ecafdd8ec74 100755
--- a/Master/bin/i386-openbsd/pdftex
+++ b/Master/bin/i386-openbsd/pdftex
diff --git a/Master/bin/i386-openbsd/pktogf b/Master/bin/i386-openbsd/pktogf
index 9cfad6b47f4..b8ded6421ee 100755
--- a/Master/bin/i386-openbsd/pktogf
+++ b/Master/bin/i386-openbsd/pktogf
diff --git a/Master/bin/i386-openbsd/pktype b/Master/bin/i386-openbsd/pktype
index 8ae448be821..d236fb556c7 100755
--- a/Master/bin/i386-openbsd/pktype
+++ b/Master/bin/i386-openbsd/pktype
diff --git a/Master/bin/i386-openbsd/ps2pk b/Master/bin/i386-openbsd/ps2pk
index 5f0894f5282..be1c7fb8794 100755
--- a/Master/bin/i386-openbsd/ps2pk
+++ b/Master/bin/i386-openbsd/ps2pk
diff --git a/Master/bin/i386-openbsd/t4ht b/Master/bin/i386-openbsd/t4ht
index 362e222406b..a0c58ff2acd 100755
--- a/Master/bin/i386-openbsd/t4ht
+++ b/Master/bin/i386-openbsd/t4ht
diff --git a/Master/bin/i386-openbsd/tangle b/Master/bin/i386-openbsd/tangle
index 07a413e26af..6cea86d6699 100755
--- a/Master/bin/i386-openbsd/tangle
+++ b/Master/bin/i386-openbsd/tangle
diff --git a/Master/bin/i386-openbsd/tex b/Master/bin/i386-openbsd/tex
index 5632b6de2f7..387843584b1 100755
--- a/Master/bin/i386-openbsd/tex
+++ b/Master/bin/i386-openbsd/tex
diff --git a/Master/bin/i386-openbsd/tex4ht b/Master/bin/i386-openbsd/tex4ht
index 0e48d985d1c..79c69df67dc 100755
--- a/Master/bin/i386-openbsd/tex4ht
+++ b/Master/bin/i386-openbsd/tex4ht
diff --git a/Master/bin/i386-openbsd/texconfig b/Master/bin/i386-openbsd/texconfig
index f5a85098e0d..3f02cebb312 100755
--- a/Master/bin/i386-openbsd/texconfig
+++ b/Master/bin/i386-openbsd/texconfig
@@ -1257,7 +1257,7 @@ Valid PAPER settings:
                 set x `getRes "$tcBatchPdftexMode"`; shift
                 fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1"
                 if $fmgrConfigReplaceChanged; then
-                  fmtutil --all
+                  fmtutil --refresh
                 fi
               else
                 echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2
@@ -1276,7 +1276,7 @@ Valid PAPER settings:
               wChanged=$fmgrConfigReplaceChanged
               fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
               if $wChanged || $fmgrConfigReplaceChanged; then
-                fmtutil --all
+                fmtutil --refresh
               fi
               ;;
             a4)
@@ -1285,7 +1285,7 @@ Valid PAPER settings:
               wChanged=$fmgrConfigReplaceChanged
               fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
               if $wChanged || $fmgrConfigReplaceChanged; then
-                fmtutil --all
+                fmtutil --refresh
               fi
               ;;
             "") echo "$help" >&2; rc=1;;
diff --git a/Master/bin/i386-openbsd/texmfstart b/Master/bin/i386-openbsd/texmfstart
index a886b2aa142..4d1e2976145 100755
--- a/Master/bin/i386-openbsd/texmfstart
+++ b/Master/bin/i386-openbsd/texmfstart
@@ -425,7 +425,7 @@ class KpseFast
         @rootpath    = ''
         @treepath    = ''
         @progname    = 'kpsewhich'
-        @engine      = 'pdfetex'
+        @engine      = 'pdftex'
         @variables   = Hash.new
         @expansions  = Hash.new
         @files       = Hash.new
@@ -1074,7 +1074,7 @@ end
     # puts k.expansion("$TEXMF")
     # puts k.expanded_path("TEXINPUTS","context")
 
-    # k.progname, k.engine, k.format = 'context', 'pdfetex', 'tfm'
+    # k.progname, k.engine, k.format = 'context', 'pdftex', 'tfm'
     # k.scandisk = false # == must_exist
     # k.expand_variables
 
@@ -1429,7 +1429,7 @@ end
 
 $mswindows = Config::CONFIG['host_os'] =~ /mswin/
 $separator = File::PATH_SEPARATOR
-$version   = "2.0.2"
+$version   = "2.0.3"
 $ownpath   = File.dirname($0)
 
 if $mswindows then
@@ -1520,7 +1520,7 @@ def set_applications(page=1)
     $applications['perl']     = $applications['pl']  = 'perl'
     $applications['ruby']     = $applications['rb']  = 'ruby'
     $applications['python']   = $applications['py']  = 'python'
-    $applications['lua']      = $applications['lua'] = 'lua'
+    $applications['lua']      = $applications['lua'] = 'luatex --luaonly'
     $applications['java']     = $applications['jar'] = 'java'
 
     if $mswindows then
@@ -1804,14 +1804,16 @@ def changeddir?(path)
     if path.empty? then
         return true
     else
+        oldpath = File.expand_path(path)
         begin
-            Dir.chdir(path) if ! path.empty?
+            Dir.chdir(path) if not path.empty?
         rescue
             report("unable to change to directory: #{path}")
         else
             report("changed to directory: #{path}")
         end
-        return File.expand_path(Dir.getwd) == File.expand_path(path)
+        newpath = File.expand_path(Dir.getwd)
+        return oldpath == newpath
     end
 end
 
@@ -1971,10 +1973,15 @@ def find(filename,program)
         end
         filename.sub!(/^.*[\\\/]/, '')
         # next we look at the current path and the callerpath
-        [ ['.','current'],
-          [$ownpath,'caller'], ["#{$ownpath}/../#{suffixlist[0]}",'caller'],
-          [registered("THREAD"),'thread'], ["#{registered("THREAD")}/../#{suffixlist[0]}",'thread'],
-        ].each do |p|
+        pathlist = [ ]
+        progpath = $applications[suffixlist[0]]
+        threadok = registered("THREAD") !~ /unknown/
+        pathlist << ['.','current']
+        pathlist << [$ownpath,'caller']                                 if $ownpath != '.'
+        pathlist << ["#{$ownpath}/../#{progpath}",'caller']             if progpath
+        pathlist << [registered("THREAD"),'thread']                     if threadok
+        pathlist << ["#{registered("THREAD")}/../#{progpath}",'thread'] if progpath && threadok
+        pathlist.each do |p|
             if p && ! p.empty? && ! (p[0] == 'unknown') then
                 suffixlist.each do |suffix|
                     fname = "#{filename}.#{suffix}"
@@ -2483,27 +2490,35 @@ def execute(arguments)
     if $selfmerge then
         output("ruby libraries are cleaned up") if SelfMerge::cleanup
         output("ruby libraries are merged")     if SelfMerge::merge
+        return true
     elsif $selfcleanup then
         output("ruby libraries are cleaned up") if SelfMerge::cleanup
+        return true
     elsif $serve then
         if ENV['KPSEMETHOD'] && ENV['KPSEPORT'] then
             # # kpse_merge_done: require 'base/kpseremote'
             begin
                 KpseRemote::start_server
             rescue
+                return false
+            else
+                return true
             end
         else
             usage
             puts("")
             puts("message  : set 'KPSEMETHOD' and 'KPSEPORT' variables")
+            return false
         end
     elsif $help || ! $filename || $filename.empty? then
         usage
         loadtree($tree)
         loadenvironment($environment)
         show_environment()
+        return true
     elsif $batch && $filename && ! $filename.empty? then
         # todo, take commands from file and avoid multiple starts and checks
+        return false
     else
         report("texmfstart version #{$version}")
         loadtree($tree)
@@ -2524,33 +2539,42 @@ def execute(arguments)
                     make(filename,$mswindows,!$mswindows,$remove)
                 end
             end
+            return true # guess
         elsif $browser && $filename =~ /^http\:\/\// then
-            launch($filename)
+            return launch($filename)
         else
             begin
                 process do
                     if $direct || $filename =~ /^bin\:/ then
-                        direct($filename)
+                        return direct($filename)
                     elsif $edit && ! $editor.empty? then
-                        edit($filename)
+                        return edit($filename)
                     else # script: or no prefix
                         command = find(shortpathname($filename),$program)
                         if command then
                             register("THREAD",File.dirname(File.expand_path(command)))
-                            run(command)
+                            return run(command)
                         else
                             report('unable to locate program')
+                            return false
                         end
                     end
                 end
             rescue
                 report('fatal error in starting process')
+                return false
             end
         end
     end
 
 end
 
-execute(ARGV)
+if execute(ARGV) then
+    report("\nexecution was successful") if $verbose
+    exit(0)
+else
+    report("\nexecution failed") if $verbose
+    exit(1)
+end
 
-exit (if ($?.to_i rescue 0) > 0 then 1 else 0 end)
+# exit (if ($?.to_i rescue 0) > 0 then 1 else 0 end)
diff --git a/Master/bin/i386-openbsd/tftopl b/Master/bin/i386-openbsd/tftopl
index 9c477c51fe2..bea705a89bd 100755
--- a/Master/bin/i386-openbsd/tftopl
+++ b/Master/bin/i386-openbsd/tftopl
diff --git a/Master/bin/i386-openbsd/ttf2afm b/Master/bin/i386-openbsd/ttf2afm
index eae1af03d96..fd4f2481159 100755
--- a/Master/bin/i386-openbsd/ttf2afm
+++ b/Master/bin/i386-openbsd/ttf2afm
diff --git a/Master/bin/i386-openbsd/ttf2pk b/Master/bin/i386-openbsd/ttf2pk
index 000c54de391..764d4ce38b8 100755
--- a/Master/bin/i386-openbsd/ttf2pk
+++ b/Master/bin/i386-openbsd/ttf2pk
diff --git a/Master/bin/i386-openbsd/ttf2tfm b/Master/bin/i386-openbsd/ttf2tfm
index 10ea54475b0..d79943ab3b0 100755
--- a/Master/bin/i386-openbsd/ttf2tfm
+++ b/Master/bin/i386-openbsd/ttf2tfm
diff --git a/Master/bin/i386-openbsd/vftovp b/Master/bin/i386-openbsd/vftovp
index 4202a1b4c89..e27bd574f56 100755
--- a/Master/bin/i386-openbsd/vftovp
+++ b/Master/bin/i386-openbsd/vftovp
diff --git a/Master/bin/i386-openbsd/weave b/Master/bin/i386-openbsd/weave
index f49904d42f8..d98253dc8f1 100755
--- a/Master/bin/i386-openbsd/weave
+++ b/Master/bin/i386-openbsd/weave
diff --git a/Master/bin/i386-openbsd/xdvi-xaw.bin b/Master/bin/i386-openbsd/xdvi-xaw.bin
index 46a946027d9..15290e95411 100755
--- a/Master/bin/i386-openbsd/xdvi-xaw.bin
+++ b/Master/bin/i386-openbsd/xdvi-xaw.bin
diff --git a/Master/bin/i386-openbsd/xdvipdfmx b/Master/bin/i386-openbsd/xdvipdfmx
index 540adaf1672..09c84838931 100755
--- a/Master/bin/i386-openbsd/xdvipdfmx
+++ b/Master/bin/i386-openbsd/xdvipdfmx
diff --git a/Master/bin/i386-openbsd/xetex b/Master/bin/i386-openbsd/xetex
index 56a17d189d0..46ca2af2f43 100755
--- a/Master/bin/i386-openbsd/xetex
+++ b/Master/bin/i386-openbsd/xetex