adjust for 2014 binaries: luajittex, womegaware, psutils

git-svn-id: svn://tug.org/texlive/trunk@33487 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 42 insertions, 25 deletions

diff --git a/Master/tlpkg/tlpsrc/context.tlpsrc b/Master/tlpkg/tlpsrc/context.tlpsrc
index 1e2112534e2..dd4d8751a21 100644
--- a/Master/tlpkg/tlpsrc/context.tlpsrc
+++ b/Master/tlpkg/tlpsrc/context.tlpsrc
@@ -20,8 +20,6 @@ execute AddFormat name=cont-en engine=xetex \
         patterns=cont-usr.tex options="-8bit *cont-en.mkii" 
 #
 # disabled context formats:
-execute AddFormat name=cont-de mode=disabled engine=pdftex \
-        patterns=cont-usr.tex options="-8bit *cont-de.mkii"
 execute AddFormat name=cont-fr mode=disabled engine=pdftex \
         patterns=cont-usr.tex options="-8bit *cont-fr.mkii"
 execute AddFormat name=cont-it mode=disabled engine=pdftex \
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index a0b8acaed5a..40a5d7f25dc 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -25,3 +25,9 @@ execute AddFormat name=lualatex engine=luatex \
 #
 docpattern f texmf-dist/doc/man/man1/latex.*
 docpattern f texmf-dist/doc/man/man1/pdflatex.*
+#
+# disabled luajitlatex format (just PDF until someone wants DVI?):
+binpattern f bin/${ARCH}/luajitlatex
+execute AddFormat name=luajitlatex mode=disabled engine=luajittex \
+                             patterns=language.dat,language.dat.lua \
+                             options="lualatex.ini" 
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index 0f6e270d579..7bb70fa3d13 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -7,6 +7,10 @@ execute AddFormat \
   name=dviluatex engine=luatex patterns=language.def,language.dat.lua \
   options="dviluatex.ini"
 #
+execute AddFormat \
+  name=luajittex engine=luajittex patterns=language.def,language.dat.lua \
+  options="luatex.ini"
+#
 docpattern d texmf-dist/doc/luatex/base
 docpattern f texmf-dist/doc/man/man1/luatex.*
 docpattern f texmf-dist/doc/man/man1/texlua*
@@ -17,7 +21,10 @@ runpattern f texmf-dist/web2c/texmfcnf.lua
 #
 binpattern f bin/${ARCH}/dviluatex
 binpattern f bin/${ARCH}/luatex
+binpattern f bin/${ARCH}/luajittex
 binpattern f bin/${ARCH}/texlua
+binpattern f bin/${ARCH}/texluajit
 binpattern f bin/${ARCH}/texluac
+binpattern f bin/${ARCH}/texluajitc
 #
 binpattern f bin/win32/lua*.dll
diff --git a/Master/tlpkg/tlpsrc/omegaware.tlpsrc b/Master/tlpkg/tlpsrc/omegaware.tlpsrc
index 7506c5f9633..9edc472fd26 100644
--- a/Master/tlpkg/tlpsrc/omegaware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/omegaware.tlpsrc
@@ -18,3 +18,6 @@ binpattern f bin/${ARCH}/otp2ocp
 binpattern f bin/${ARCH}/outocp
 binpattern f bin/${ARCH}/ovf2ovp
 binpattern f bin/${ARCH}/ovp2ovf
+binpattern f bin/${ARCH}/wofm2opl
+binpattern f bin/${ARCH}/wopl2ofm
+binpattern f bin/${ARCH}/wovf2ovp
diff --git a/Master/tlpkg/tlpsrc/psutils.tlpsrc b/Master/tlpkg/tlpsrc/psutils.tlpsrc
index f6661f9224c..8332a0a0ffc 100644
--- a/Master/tlpkg/tlpsrc/psutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/psutils.tlpsrc
@@ -1,42 +1,45 @@
 category TLCore
 docpattern f texmf-dist/doc/man/man1/epsffit.*
 docpattern f texmf-dist/doc/man/man1/extractres.*
-docpattern f texmf-dist/doc/man/man1/fixdlsrps.*
-docpattern f texmf-dist/doc/man/man1/fixfmps.*
-docpattern f texmf-dist/doc/man/man1/fixpsditps.*
-docpattern f texmf-dist/doc/man/man1/fixpspps.*
-docpattern f texmf-dist/doc/man/man1/fixscribeps.*
-docpattern f texmf-dist/doc/man/man1/fixtpps.*
-docpattern f texmf-dist/doc/man/man1/fixwfwps.*
-docpattern f texmf-dist/doc/man/man1/fixwpps.*
-docpattern f texmf-dist/doc/man/man1/fixwwps.*
-docpattern f texmf-dist/doc/man/man1/getafm.*
+#docpattern f texmf-dist/doc/man/man1/fixdlsrps.*
+#docpattern f texmf-dist/doc/man/man1/fixfmps.*
+#docpattern f texmf-dist/doc/man/man1/fixpsditps.*
+#docpattern f texmf-dist/doc/man/man1/fixpspps.*
+#docpattern f texmf-dist/doc/man/man1/fixscribeps.*
+#docpattern f texmf-dist/doc/man/man1/fixtpps.*
+#docpattern f texmf-dist/doc/man/man1/fixwfwps.*
+#docpattern f texmf-dist/doc/man/man1/fixwpps.*
+#docpattern f texmf-dist/doc/man/man1/fixwwps.*
+#docpattern f texmf-dist/doc/man/man1/getafm.*
 docpattern f texmf-dist/doc/man/man1/includeres.*
 docpattern f texmf-dist/doc/man/man1/psbook.*
-docpattern f texmf-dist/doc/man/man1/psmerge.*
+#docpattern f texmf-dist/doc/man/man1/psmerge.*
 docpattern f texmf-dist/doc/man/man1/psnup.*
 docpattern f texmf-dist/doc/man/man1/psresize.*
 docpattern f texmf-dist/doc/man/man1/psselect.*
 docpattern f texmf-dist/doc/man/man1/pstops.*
+#
 runpattern d texmf-dist/scripts/psutils
 runpattern f texmf-dist/dvips/getafm/*
+#
 binpattern f bin/${ARCH}/epsffit
 binpattern f bin/${ARCH}/extractres
-binpattern f bin/${ARCH}/fixdlsrps
-binpattern f bin/${ARCH}/fixfmps
-binpattern f bin/${ARCH}/fixpsditps
-binpattern f bin/${ARCH}/fixpspps
-binpattern f bin/${ARCH}/fixscribeps
-binpattern f bin/${ARCH}/fixtpps
-binpattern f bin/${ARCH}/fixwfwps
-binpattern f bin/${ARCH}/fixwpps
-binpattern f bin/${ARCH}/fixwwps
-binpattern f bin/${ARCH}/getafm
+#binpattern f bin/${ARCH}/fixdlsrps
+#binpattern f bin/${ARCH}/fixfmps
+#binpattern f bin/${ARCH}/fixpsditps
+#binpattern f bin/${ARCH}/fixpspps
+#binpattern f bin/${ARCH}/fixscribeps
+#binpattern f bin/${ARCH}/fixtpps
+#binpattern f bin/${ARCH}/fixwfwps
+#binpattern f bin/${ARCH}/fixwpps
+#binpattern f bin/${ARCH}/fixwwps
+#binpattern f bin/${ARCH}/getafm
 binpattern f bin/${ARCH}/includeres
 binpattern f bin/${ARCH}/psbook
-binpattern f bin/${ARCH}/psmerge
+binpattern f bin/${ARCH}/psjoin
+#binpattern f bin/${ARCH}/psmerge
 binpattern f bin/${ARCH}/psnup
 binpattern f bin/${ARCH}/psresize
 binpattern f bin/${ARCH}/psselect
 binpattern f bin/${ARCH}/pstops
-binpattern f bin/${ARCH}/showchar
+#binpattern f bin/${ARCH}/showchar