summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-12-13 23:54:25 +0000
committerKarl Berry <karl@freefriends.org>2009-12-13 23:54:25 +0000
commit2ab664c5350e187fe6a3a00e3c1ad0bd43b7eb10 (patch)
treeb2aadf034cb07adce41b6ab8ad7587934f80fdbf
parenta39926adf941704c29c009f1ca51679c44482ff9 (diff)
merge mft support files into mfware, where the binary is
git-svn-id: svn://tug.org/texlive/trunk@16392 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/mft.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/mfware.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/pdftex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/pslatex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/tetex.tlpsrc1
6 files changed, 3 insertions, 4 deletions
diff --git a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
index 9dbaefc904d..6aefaf26e62 100644
--- a/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-fontutils.tlpsrc
@@ -16,6 +16,5 @@ depend dvipsconfig
depend fontinst
depend fontools
depend getafm
-depend mft
depend t1utils
depend ttfutils
diff --git a/Master/tlpkg/tlpsrc/mft.tlpsrc b/Master/tlpkg/tlpsrc/mft.tlpsrc
deleted file mode 100644
index d04b35cb6f9..00000000000
--- a/Master/tlpkg/tlpsrc/mft.tlpsrc
+++ /dev/null
@@ -1 +0,0 @@
-runpattern d texmf-dist/mft/base
diff --git a/Master/tlpkg/tlpsrc/mfware.tlpsrc b/Master/tlpkg/tlpsrc/mfware.tlpsrc
index 0e1988f7036..55bb4cfafba 100644
--- a/Master/tlpkg/tlpsrc/mfware.tlpsrc
+++ b/Master/tlpkg/tlpsrc/mfware.tlpsrc
@@ -11,3 +11,4 @@ binpattern f bin/${ARCH}/gftype
binpattern f bin/${ARCH}/mft
binpattern f bin/${ARCH}/pktogf
binpattern f bin/${ARCH}/pktype
+runpattern d texmf-dist/mft/base
diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
index 14db8843edc..1b6c85c0954 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -10,7 +10,6 @@ runpattern f texmf/fonts/map/pdftex/updmap/*
runpattern f texmf/tex/generic/config/pdftex*.tex
runpattern f texmf/tex/generic/pdftex/*
runpattern d texmf/scripts/simpdftex
-docpattern f texmf/doc/man/man1/etex.*
docpattern f texmf/doc/man/man1/pdfetex.*
docpattern f texmf/doc/man/man1/pdftex.*
docpattern d texmf-dist/doc/pdftex
diff --git a/Master/tlpkg/tlpsrc/pslatex.tlpsrc b/Master/tlpkg/tlpsrc/pslatex.tlpsrc
index e69de29bb2d..5119e172cb3 100644
--- a/Master/tlpkg/tlpsrc/pslatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pslatex.tlpsrc
@@ -0,0 +1,2 @@
+# don't get pslatex.man, that's part of pstools.
+docpattern f null
diff --git a/Master/tlpkg/tlpsrc/tetex.tlpsrc b/Master/tlpkg/tlpsrc/tetex.tlpsrc
index 3bf77a7ece1..3c8fa442951 100644
--- a/Master/tlpkg/tlpsrc/tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/tetex.tlpsrc
@@ -12,7 +12,6 @@ docpattern f texmf/doc/man/man1/allneeded.*
docpattern f texmf/doc/man/man1/dvi2fax.*
docpattern f texmf/doc/man/man1/dvired.*
docpattern f texmf/doc/man/man1/fmtutil*
-docpattern f texmf/doc/man/man1/fontinst.*
docpattern f texmf/doc/man/man1/texlinks.*
docpattern f texmf/doc/man/man1/updmap*
docpattern f texmf/doc/man/man5/fmtutil.cnf.*