merge bin-tex4htk to tex4ht, add some new executables

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

5 files changed, 94 insertions, 96 deletions

diff --git a/Master/tlpkg/tlpsrc/bin-tex4htk.tlpsrc b/Master/tlpkg/tlpsrc/bin-tex4htk.tlpsrc
deleted file mode 100644
index db6115afd7a..00000000000
--- a/Master/tlpkg/tlpsrc/bin-tex4htk.tlpsrc
+++ /dev/null
@@ -1,92 +0,0 @@
-name bin-tex4htk
-category TLCore
-runpattern f texmf/scripts/tex4ht/*
-binpattern f bin/${ARCH}/ht
-binpattern f bin/${ARCH}/htcontext
-binpattern f bin/${ARCH}/htlatex
-binpattern f bin/${ARCH}/htmex
-binpattern f bin/${ARCH}/httex
-binpattern f bin/${ARCH}/httexexec
-binpattern f bin/${ARCH}/httexi
-binpattern f bin/${ARCH}/mk4ht
-binpattern f bin/${ARCH}/t4ht
-binpattern f bin/${ARCH}/tex4ht
-binpattern f bin/win32/dbcontext.bat
-binpattern f bin/win32/dblatex.bat
-binpattern f bin/win32/dbmcontext.bat
-binpattern f bin/win32/dbmex.bat
-binpattern f bin/win32/dbmlatex.bat
-binpattern f bin/win32/dbmmex.bat
-binpattern f bin/win32/dbmtex.bat
-binpattern f bin/win32/dbmtexi.bat
-binpattern f bin/win32/dbtex.bat
-binpattern f bin/win32/dbtexi.bat
-binpattern f bin/win32/escontext.bat
-binpattern f bin/win32/eslatex.bat
-binpattern f bin/win32/esmex.bat
-binpattern f bin/win32/estex.bat
-binpattern f bin/win32/estexi.bat
-binpattern f bin/win32/htcmd.exe
-binpattern f bin/win32/htcopy.exe
-binpattern f bin/win32/htmove.exe
-binpattern f bin/win32/jh1context.bat
-binpattern f bin/win32/jh1latex.bat
-binpattern f bin/win32/jh1mex.bat
-binpattern f bin/win32/jh1tex.bat
-binpattern f bin/win32/jh1texi.bat
-binpattern f bin/win32/jhcontext.bat
-binpattern f bin/win32/jhlatex.bat
-binpattern f bin/win32/jhmex.bat
-binpattern f bin/win32/jhtex.bat
-binpattern f bin/win32/jhtexi.bat
-binpattern f bin/win32/jmcontext.bat
-binpattern f bin/win32/jmlatex.bat
-binpattern f bin/win32/jmmex.bat
-binpattern f bin/win32/jmtex.bat
-binpattern f bin/win32/jmtexi.bat
-binpattern f bin/win32/jscontext.bat
-binpattern f bin/win32/jslatex.bat
-binpattern f bin/win32/jsmex.bat
-binpattern f bin/win32/jstex.bat
-binpattern f bin/win32/jstexi.bat
-binpattern f bin/win32/mzcontext.bat
-binpattern f bin/win32/mzlatex.bat
-binpattern f bin/win32/mzmex.bat
-binpattern f bin/win32/mztex.bat
-binpattern f bin/win32/mztexi.bat
-binpattern f bin/win32/oocontext.bat
-binpattern f bin/win32/oolatex.bat
-binpattern f bin/win32/oomex.bat
-binpattern f bin/win32/ootex.bat
-binpattern f bin/win32/ootexi.bat
-binpattern f bin/win32/pdf2dsc.bat
-binpattern f bin/win32/teicontext.bat
-binpattern f bin/win32/teilatex.bat
-binpattern f bin/win32/teimcontext.bat
-binpattern f bin/win32/teimex.bat
-binpattern f bin/win32/teimlatex.bat
-binpattern f bin/win32/teimmex.bat
-binpattern f bin/win32/teimtex.bat
-binpattern f bin/win32/teimtexi.bat
-binpattern f bin/win32/teitex.bat
-binpattern f bin/win32/teitexi.bat
-binpattern f bin/win32/uxhcontext.bat
-binpattern f bin/win32/uxhlatex.bat
-binpattern f bin/win32/uxhmex.bat
-binpattern f bin/win32/uxhtex.bat
-binpattern f bin/win32/uxhtexi.bat
-binpattern f bin/win32/wcontext.bat
-binpattern f bin/win32/wlatex.bat
-binpattern f bin/win32/wmex.bat
-binpattern f bin/win32/wtex.bat
-binpattern f bin/win32/wtexi.bat
-binpattern f bin/win32/xhcontext.bat
-binpattern f bin/win32/xhlatex.bat
-binpattern f bin/win32/xhmcontext.bat
-binpattern f bin/win32/xhmex.bat
-binpattern f bin/win32/xhmlatex.bat
-binpattern f bin/win32/xhmmex.bat
-binpattern f bin/win32/xhmtex.bat
-binpattern f bin/win32/xhmtexi.bat
-binpattern f bin/win32/xhtex.bat
-binpattern f bin/win32/xhtexi.bat
diff --git a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
index e0d123486d7..cd56372e3ea 100644
--- a/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-htmlxml.tlpsrc
@@ -8,7 +8,6 @@ depend tex4ht
 depend xmlplay
 depend xmltex
 depend bin-jadetex
-depend bin-tex4htk
 depend bin-xmltex
 depend collection-basic
 depend collection-fontsrecommended
diff --git a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
index 12289b6742d..ae98226a5ca 100644
--- a/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-gust.tlpsrc
@@ -28,7 +28,6 @@ depend bin-bibtex8
 depend bin-dvidvi
 depend bin-dviljk
 depend bin-seetexk
-depend bin-tex4htk
 depend bin-texdoc
 depend collection-basic
 depend collection-context
diff --git a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
index 4cb1f20eaf8..2c6d92dfddb 100644
--- a/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-xml.tlpsrc
@@ -21,7 +21,6 @@ depend xmltex
 depend bin-context
 depend bin-jadetex
 depend bin-metapost
-depend bin-tex4htk
 depend bin-xmltex
 depend collection-basic
 depend collection-fontsrecommended
diff --git a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
index 1161b6260ce..28e0b6cc2f2 100644
--- a/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tex4ht.tlpsrc
@@ -1,5 +1,98 @@
 name tex4ht
 category Package
+binpattern f bin/${ARCH}/ht
+binpattern f bin/${ARCH}/htcontext
+binpattern f bin/${ARCH}/htlatex
+binpattern f bin/${ARCH}/htmex
+binpattern f bin/${ARCH}/httex
+binpattern f bin/${ARCH}/httexexec
+binpattern f bin/${ARCH}/httexi
+binpattern f bin/${ARCH}/htxelatex
+binpattern f bin/${ARCH}/htxetex
+binpattern f bin/${ARCH}/mk4ht
+binpattern f bin/${ARCH}/t4ht
+binpattern f bin/${ARCH}/tex4ht
+binpattern f bin/win32/dbcontext.bat
+binpattern f bin/win32/dblatex.bat
+binpattern f bin/win32/dbmcontext.bat
+binpattern f bin/win32/dbmex.bat
+binpattern f bin/win32/dbmlatex.bat
+binpattern f bin/win32/dbmmex.bat
+binpattern f bin/win32/dbmtex.bat
+binpattern f bin/win32/dbmtexi.bat
+binpattern f bin/win32/dbtex.bat
+binpattern f bin/win32/dbtexi.bat
+binpattern f bin/win32/escontext.bat
+binpattern f bin/win32/eslatex.bat
+binpattern f bin/win32/esmex.bat
+binpattern f bin/win32/estex.bat
+binpattern f bin/win32/estexi.bat
+binpattern f bin/win32/htcmd.exe
+binpattern f bin/win32/htcopy.exe
+binpattern f bin/win32/htmove.exe
+binpattern f bin/win32/jh1context.bat
+binpattern f bin/win32/jh1latex.bat
+binpattern f bin/win32/jh1mex.bat
+binpattern f bin/win32/jh1tex.bat
+binpattern f bin/win32/jh1texi.bat
+binpattern f bin/win32/jhcontext.bat
+binpattern f bin/win32/jhlatex.bat
+binpattern f bin/win32/jhmex.bat
+binpattern f bin/win32/jhtex.bat
+binpattern f bin/win32/jhtexi.bat
+binpattern f bin/win32/jmcontext.bat
+binpattern f bin/win32/jmlatex.bat
+binpattern f bin/win32/jmmex.bat
+binpattern f bin/win32/jmtex.bat
+binpattern f bin/win32/jmtexi.bat
+binpattern f bin/win32/jscontext.bat
+binpattern f bin/win32/jslatex.bat
+binpattern f bin/win32/jsmex.bat
+binpattern f bin/win32/jstex.bat
+binpattern f bin/win32/jstexi.bat
+binpattern f bin/win32/mzcontext.bat
+binpattern f bin/win32/mzlatex.bat
+binpattern f bin/win32/mzmex.bat
+binpattern f bin/win32/mztex.bat
+binpattern f bin/win32/mztexi.bat
+binpattern f bin/win32/oocontext.bat
+binpattern f bin/win32/oolatex.bat
+binpattern f bin/win32/oomex.bat
+binpattern f bin/win32/ootex.bat
+binpattern f bin/win32/ootexi.bat
+binpattern f bin/win32/pdf2dsc.bat
+binpattern f bin/win32/teicontext.bat
+binpattern f bin/win32/teilatex.bat
+binpattern f bin/win32/teimcontext.bat
+binpattern f bin/win32/teimex.bat
+binpattern f bin/win32/teimlatex.bat
+binpattern f bin/win32/teimmex.bat
+binpattern f bin/win32/teimtex.bat
+binpattern f bin/win32/teimtexi.bat
+binpattern f bin/win32/teitex.bat
+binpattern f bin/win32/teitexi.bat
+binpattern f bin/win32/uxhcontext.bat
+binpattern f bin/win32/uxhlatex.bat
+binpattern f bin/win32/uxhmex.bat
+binpattern f bin/win32/uxhtex.bat
+binpattern f bin/win32/uxhtexi.bat
+binpattern f bin/win32/wcontext.bat
+binpattern f bin/win32/wlatex.bat
+binpattern f bin/win32/wmex.bat
+binpattern f bin/win32/wtex.bat
+binpattern f bin/win32/wtexi.bat
+binpattern f bin/win32/xhcontext.bat
+binpattern f bin/win32/xhlatex.bat
+binpattern f bin/win32/xhmcontext.bat
+binpattern f bin/win32/xhmex.bat
+binpattern f bin/win32/xhmlatex.bat
+binpattern f bin/win32/xhmmex.bat
+binpattern f bin/win32/xhmtex.bat
+binpattern f bin/win32/xhmtexi.bat
+binpattern f bin/win32/xhtex.bat
+binpattern f bin/win32/xhtexi.bat
+docpattern d texmf-dist/doc/generic/tex4ht
+runpattern d texmf-dist/scripts/tex4ht
 runpattern d texmf-dist/tex/generic/tex4ht
 runpattern d texmf-dist/tex4ht
-docpattern d texmf-dist/doc/generic/tex4ht
+runpattern d texmf/scripts/tex4ht