summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-15 16:52:18 +0000
committerKarl Berry <karl@freefriends.org>2016-05-15 16:52:18 +0000
commit1cb2aef94442156a40e74989c7ae03092e3cc29a (patch)
tree498cf7eb5bd14e2facc5d8e49292e370e09ac33f
parentde4ec5d00677ea578e624144b048cee822a25671 (diff)
updmap-map: new package for the font map conglomerations updated with
every new font. collection-basic: depend on it. dvips: category TLCore for consistency. dvipdfmx, dvips, pdftex: do not include the fonts/map/*/updmap/* files. git-svn-id: svn://tug.org/texlive/trunk@41149 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/tlpsrc/collection-basic.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/dvips.tlpsrc6
-rw-r--r--Master/tlpkg/tlpsrc/pdftex.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/updmap-map.tlpsrc9
5 files changed, 15 insertions, 3 deletions
diff --git a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
index e2f44641086..6a420076ea7 100644
--- a/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-basic.tlpsrc
@@ -44,4 +44,5 @@ depend texlive-en
depend texlive-msg-translations
depend texlive-scripts
depend unicode-data
+depend updmap-map
depend xdvi
diff --git a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
index 326c2234a76..d25210a20f4 100644
--- a/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvipdfmx.tlpsrc
@@ -7,7 +7,6 @@ postaction script file=tlpkg/tlpostcode/dvipdfmx.pl
runpattern f tlpkg/tlpostcode/dvipdfmx.pl
runpattern d texmf-dist/dvipdfmx
runpattern d texmf-dist/fonts/cmap/dvipdfmx
-runpattern d texmf-dist/fonts/map/dvipdfmx/updmap
runpattern f texmf-dist/fonts/map/dvipdfmx/*.map
#
binpattern f bin/${ARCH}/dvipdfm
diff --git a/Master/tlpkg/tlpsrc/dvips.tlpsrc b/Master/tlpkg/tlpsrc/dvips.tlpsrc
index fe40e699733..b17101beb29 100644
--- a/Master/tlpkg/tlpsrc/dvips.tlpsrc
+++ b/Master/tlpkg/tlpsrc/dvips.tlpsrc
@@ -1,13 +1,17 @@
+category TLCore
+
srcpattern f ignore
+
runpattern d texmf-dist/dvips/base
runpattern d texmf-dist/fonts/enc/dvips/base
runpattern d texmf-dist/tex/generic/dvips
runpattern f texmf-dist/dvips/base/*
runpattern f texmf-dist/dvips/config/*
-runpattern f texmf-dist/fonts/map/dvips/updmap/*
+
docpattern f texmf-dist/doc/dvips/*
docpattern f texmf-dist/doc/info/dvips*
docpattern f texmf-dist/doc/man/man1/afm2tfm.*
docpattern f texmf-dist/doc/man/man1/dvips.*
+
binpattern f bin/${ARCH}/afm2tfm
binpattern f bin/${ARCH}/dvips
diff --git a/Master/tlpkg/tlpsrc/pdftex.tlpsrc b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
index 1b7fec01aa3..e949efe2d4a 100644
--- a/Master/tlpkg/tlpsrc/pdftex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pdftex.tlpsrc
@@ -20,7 +20,6 @@ execute addMap dummy-space.map
runpattern f texmf-dist/tex/generic/config/pdftex*.tex
runpattern d texmf-dist/tex/generic/pdftex
-runpattern d texmf-dist/fonts/map/pdftex/updmap
runpattern d texmf-dist/fonts/map/dvips/dummy-space
runpattern d texmf-dist/fonts/tfm/public/pdftex
runpattern d texmf-dist/fonts/type1/public/pdftex
diff --git a/Master/tlpkg/tlpsrc/updmap-map.tlpsrc b/Master/tlpkg/tlpsrc/updmap-map.tlpsrc
new file mode 100644
index 00000000000..98346a1c4f3
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/updmap-map.tlpsrc
@@ -0,0 +1,9 @@
+# The map files in these dirs are regenerated every time we add a font.
+# There is no need to rebuild formats or update binaries
+# because of such updates, so make them a separate package.
+#
+# The program packages have excludes for these directories.
+
+runpattern d texmf-dist/fonts/map/dvipdfmx/updmap
+runpattern d texmf-dist/fonts/map/dvips/updmap
+runpattern d texmf-dist/fonts/map/pdftex/updmap