Update tex-tetex{,-doc} to 3.0.32132 - Files in share/texmf have been moved to share/texmf-dist. - 'updmap --sys' replaces 'updmap-sys'.diff -r1.17 -r1.18 pkgsrc/print/tex-tetex/Makefile
(minskim)
@@ -1,28 +1,27 @@ | @@ -1,28 +1,27 @@ | |||
1 | # $NetBSD: Makefile,v 1.17 2013/05/31 12:41:50 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.18 2013/11/17 17:15:43 minskim Exp $ | |
2 | 2 | |||
3 | DISTNAME= tetex | 3 | DISTNAME= tetex | |
4 | PKGNAME= tex-${DISTNAME}-3.0.27774 | 4 | PKGNAME= tex-${DISTNAME}-3.0.32132 | |
5 | PKGREVISION= 2 | 5 | TEXLIVE_REV= 32132 | |
6 | TEXLIVE_REV= 27774 | |||
7 | 6 | |||
8 | MAINTAINER= minskim@NetBSD.org | 7 | MAINTAINER= minskim@NetBSD.org | |
9 | COMMENT= Supplementary files for updmap | 8 | COMMENT= Supplementary files for updmap | |
10 | 9 | |||
11 | CONFLICTS= texlive-tetex<=2011nb1 | 10 | CONFLICTS= texlive-tetex<=2011nb1 | |
12 | DEPENDS+= dialog>=1.0:../../misc/dialog | 11 | DEPENDS+= dialog>=1.0:../../misc/dialog | |
13 | DEPENDS+= kpathsea-[0-9]*:../../print/kpathsea | 12 | DEPENDS+= kpathsea-[0-9]*:../../print/kpathsea | |
14 | DEPENDS+= tex-kpathsea>=2012nb1:../../print/tex-kpathsea | 13 | DEPENDS+= tex-kpathsea>=2012nb1:../../print/tex-kpathsea | |
15 | DEPENDS+= tex-texconfig-[0-9]*:../../print/tex-texconfig | 14 | DEPENDS+= tex-texconfig>=2013:../../print/tex-texconfig | |
16 | DEPENDS+= tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra | 15 | DEPENDS+= tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra | |
17 | 16 | |||
18 | USE_TOOLS+= perl:run sh:run | 17 | USE_TOOLS+= perl:run sh:run | |
19 | 18 | |||
20 | FILES_SUBST+= UPDMAP_SYS=${PREFIX}/bin/updmap-sys | 19 | FILES_SUBST+= UPDMAP_SYS=${PREFIX}/bin/updmap-sys | |
21 | 20 | |||
22 | EVAL_PREFIX+= DIALOG_PREFIX=dialog | 21 | EVAL_PREFIX+= DIALOG_PREFIX=dialog | |
23 | EVAL_PREFIX+= KPATHSEA_PREFIX=kpathsea | 22 | EVAL_PREFIX+= KPATHSEA_PREFIX=kpathsea | |
24 | EVAL_PREFIX+= TEXCONFIG_PREFIX=tex-texconfig | 23 | EVAL_PREFIX+= TEXCONFIG_PREFIX=tex-texconfig | |
25 | 24 | |||
26 | SUBST_CLASSES+= paths | 25 | SUBST_CLASSES+= paths | |
27 | SUBST_MESSAGE.paths= Setting paths to commands. | 26 | SUBST_MESSAGE.paths= Setting paths to commands. | |
28 | SUBST_STAGE.paths= pre-configure | 27 | SUBST_STAGE.paths= pre-configure | |
@@ -37,39 +36,38 @@ SUBST_SED.paths+= -e 's,@UPDMAP@,${PREFI | @@ -37,39 +36,38 @@ SUBST_SED.paths+= -e 's,@UPDMAP@,${PREFI | |||
37 | 36 | |||
38 | REPLACE_PERL= bin/updmap | 37 | REPLACE_PERL= bin/updmap | |
39 | REPLACE_SH= bin/allcm bin/allneeded bin/dvi2fax bin/dvired \ | 38 | REPLACE_SH= bin/allcm bin/allneeded bin/dvi2fax bin/dvired \ | |
40 | bin/fmtutil-sys bin/fmtutil bin/kpsetool bin/kpsewhere \ | 39 | bin/fmtutil-sys bin/fmtutil bin/kpsetool bin/kpsewhere \ | |
41 | bin/texconfig-dialog bin/texconfig-sys bin/texlinks \ | 40 | bin/texconfig-dialog bin/texconfig-sys bin/texlinks \ | |
42 | bin/updmap-sys | 41 | bin/updmap-sys | |
43 | 42 | |||
44 | PKG_SYSCONFSUBDIR= texmf | 43 | PKG_SYSCONFSUBDIR= texmf | |
45 | 44 | |||
46 | MAKE_DIRS+= ${PKG_SYSCONFDIR}/web2c | 45 | MAKE_DIRS+= ${PKG_SYSCONFDIR}/web2c | |
47 | CONF_FILES+= ${PREFIX}/share/texmf-dist/web2c/updmap.cfg \ | 46 | CONF_FILES+= ${PREFIX}/share/texmf-dist/web2c/updmap.cfg \ | |
48 | ${PKG_SYSCONFDIR}/web2c/updmap.cfg | 47 | ${PKG_SYSCONFDIR}/web2c/updmap.cfg | |
49 | 48 | |||
50 | TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} \ | 49 | TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} ${PREFIX}/share/texmf-dist | |
51 | ${PREFIX}/share/texmf ${PREFIX}/share/texmf-dist | |||
52 | 50 | |||
53 | .include "../../print/texlive/package.mk" | 51 | .include "../../print/texlive/package.mk" | |
54 | 52 | |||
55 | post-extract: | 53 | post-extract: | |
56 | ${MKDIR} ${WRKSRC}/bin | 54 | ${MKDIR} ${WRKSRC}/bin | |
57 | .for script in fmtutil-sys.sh fmtutil.sh texconfig-dialog.sh \ | 55 | .for script in fmtutil-sys.sh fmtutil.sh texconfig-dialog.sh \ | |
58 | texconfig-sys.sh texlinks.sh | 56 | texconfig-sys.sh texlinks.sh | |
59 | ${MV} ${WRKSRC}/texmf/scripts/tetex/${script} \ | 57 | ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \ | |
60 | ${WRKSRC}/bin/${script:S/.sh//} | 58 | ${WRKSRC}/bin/${script:S/.sh//} | |
61 | .endfor | 59 | .endfor | |
62 | .for script in allcm.sh allneeded.sh dvi2fax.sh dvired.sh kpsetool.sh \ | 60 | .for script in allcm.sh allneeded.sh dvi2fax.sh dvired.sh kpsetool.sh \ | |
63 | kpsewhere.sh updmap-sys.sh updmap.pl | 61 | kpsewhere.sh updmap-sys.sh updmap.pl | |
64 | ${MV} ${WRKSRC}/texmf-dist/scripts/tetex/${script} \ | 62 | ${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \ | |
65 | ${WRKSRC}/bin/${script:S/.pl//:S/.sh//} | 63 | ${WRKSRC}/bin/${script:S/.pl//:S/.sh//} | |
66 | .endfor | 64 | .endfor | |
67 | ${RMDIR} -p ${WRKSRC}/texmf/scripts/tetex 2>/dev/null || ${TRUE} | 65 | ${RMDIR} -p ${WRKSRC}/texmf-dist/scripts/texlive 2>/dev/null || ${TRUE} | |
68 | 66 | |||
69 | post-install: | 67 | post-install: | |
70 | ${LN} -sf allcm ${DESTDIR}${PREFIX}/bin/allec | 68 | ${LN} -sf allcm ${DESTDIR}${PREFIX}/bin/allec | |
71 | ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsepath | 69 | ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsepath | |
72 | ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsexpand | 70 | ${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsexpand | |
73 | ${LN} -sf fmtutil ${DESTDIR}${PREFIX}/bin/mktexfmt | 71 | ${LN} -sf fmtutil ${DESTDIR}${PREFIX}/bin/mktexfmt | |
74 | 72 | |||
75 | .include "../../mk/bsd.pkg.mk" | 73 | .include "../../mk/bsd.pkg.mk" |
@@ -1,48 +1,50 @@ | @@ -1,48 +1,50 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.7 2012/10/14 21:25:22 minskim Exp $ | 1 | @comment $NetBSD: PLIST,v 1.8 2013/11/17 17:15:43 minskim Exp $ | |
2 | bin/allcm | 2 | bin/allcm | |
3 | bin/allec | 3 | bin/allec | |
4 | bin/allneeded | 4 | bin/allneeded | |
5 | bin/dvi2fax | 5 | bin/dvi2fax | |
6 | bin/dvired | 6 | bin/dvired | |
7 | bin/fmtutil | 7 | bin/fmtutil | |
8 | bin/fmtutil-sys | 8 | bin/fmtutil-sys | |
9 | bin/kpsepath | 9 | bin/kpsepath | |
10 | bin/kpsetool | 10 | bin/kpsetool | |
11 | bin/kpsewhere | 11 | bin/kpsewhere | |
12 | bin/kpsexpand | 12 | bin/kpsexpand | |
13 | bin/mktexfmt | 13 | bin/mktexfmt | |
14 | bin/texconfig-dialog | 14 | bin/texconfig-dialog | |
15 | bin/texconfig-sys | 15 | bin/texconfig-sys | |
16 | bin/texlinks | 16 | bin/texlinks | |
17 | bin/updmap | 17 | bin/updmap | |
18 | bin/updmap-sys | 18 | bin/updmap-sys | |
19 | share/texmf-dist/dvips/tetex/config.builtin35 | |||
20 | share/texmf-dist/dvips/tetex/config.dfaxhigh | |||
21 | share/texmf-dist/dvips/tetex/config.dfaxlo | |||
22 | share/texmf-dist/dvips/tetex/config.download35 | |||
23 | share/texmf-dist/dvips/tetex/config.gsftopk | |||
24 | share/texmf-dist/dvips/tetex/config.maxmem | |||
25 | share/texmf-dist/dvips/tetex/config.outline | |||
26 | share/texmf-dist/dvips/tetex/config.pdf | |||
27 | share/texmf-dist/dvips/tetex/config.pk | |||
28 | share/texmf-dist/dvips/tetex/config.www | |||
29 | share/texmf-dist/fonts/enc/dvips/tetex/09fbbfac.enc | |||
30 | share/texmf-dist/fonts/enc/dvips/tetex/0ef0afca.enc | |||
31 | share/texmf-dist/fonts/enc/dvips/tetex/10037936.enc | |||
32 | share/texmf-dist/fonts/enc/dvips/tetex/1b6d048e.enc | |||
33 | share/texmf-dist/fonts/enc/dvips/tetex/71414f53.enc | |||
34 | share/texmf-dist/fonts/enc/dvips/tetex/74afc74c.enc | |||
35 | share/texmf-dist/fonts/enc/dvips/tetex/aae443f0.enc | |||
36 | share/texmf-dist/fonts/enc/dvips/tetex/b6a4d7c7.enc | |||
37 | share/texmf-dist/fonts/enc/dvips/tetex/bbad153f.enc | |||
38 | share/texmf-dist/fonts/enc/dvips/tetex/d9b29452.enc | |||
39 | share/texmf-dist/fonts/enc/dvips/tetex/f7b6d320.enc | |||
40 | share/texmf-dist/fonts/enc/dvips/tetex/mtex.enc | |||
41 | share/texmf-dist/fonts/map/dvips/tetex/Makefile | |||
42 | share/texmf-dist/fonts/map/dvips/tetex/README | |||
43 | share/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx | |||
44 | share/texmf-dist/fonts/map/dvips/tetex/base14flags.tex | |||
45 | share/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.map | |||
46 | share/texmf-dist/fonts/map/dvips/tetex/dvips35.map | |||
47 | share/texmf-dist/fonts/map/dvips/tetex/mathpple.map | |||
48 | share/texmf-dist/fonts/map/dvips/tetex/pdftex35.map | |||
49 | share/texmf-dist/fonts/map/dvips/tetex/ps2pk35.map | |||
19 | share/texmf-dist/web2c/updmap.cfg | 50 | share/texmf-dist/web2c/updmap.cfg | |
20 | share/texmf/dvips/tetex/config.builtin35 | |||
21 | share/texmf/dvips/tetex/config.dfaxhigh | |||
22 | share/texmf/dvips/tetex/config.dfaxlo | |||
23 | share/texmf/dvips/tetex/config.download35 | |||
24 | share/texmf/dvips/tetex/config.gsftopk | |||
25 | share/texmf/dvips/tetex/config.outline | |||
26 | share/texmf/dvips/tetex/config.pdf | |||
27 | share/texmf/dvips/tetex/config.pk | |||
28 | share/texmf/dvips/tetex/config.www | |||
29 | share/texmf/fonts/enc/dvips/tetex/09fbbfac.enc | |||
30 | share/texmf/fonts/enc/dvips/tetex/0ef0afca.enc | |||
31 | share/texmf/fonts/enc/dvips/tetex/10037936.enc | |||
32 | share/texmf/fonts/enc/dvips/tetex/1b6d048e.enc | |||
33 | share/texmf/fonts/enc/dvips/tetex/71414f53.enc | |||
34 | share/texmf/fonts/enc/dvips/tetex/74afc74c.enc | |||
35 | share/texmf/fonts/enc/dvips/tetex/aae443f0.enc | |||
36 | share/texmf/fonts/enc/dvips/tetex/b6a4d7c7.enc | |||
37 | share/texmf/fonts/enc/dvips/tetex/bbad153f.enc | |||
38 | share/texmf/fonts/enc/dvips/tetex/d9b29452.enc | |||
39 | share/texmf/fonts/enc/dvips/tetex/f7b6d320.enc | |||
40 | share/texmf/fonts/enc/dvips/tetex/mtex.enc | |||
41 | share/texmf/fonts/map/dvips/tetex/README | |||
42 | share/texmf/fonts/map/dvips/tetex/dvipdfm35.map | |||
43 | share/texmf/fonts/map/dvips/tetex/dvips35.map | |||
44 | share/texmf/fonts/map/dvips/tetex/mathpple.map | |||
45 | share/texmf/fonts/map/dvips/tetex/pdftex35.map | |||
46 | share/texmf/fonts/map/dvips/tetex/ps2pk35.map | |||
47 | share/texmf/web2c/updmap.cfg | |||
48 | @pkgdir share/texmf-dist/scripts/tetex |
@@ -1,15 +1,15 @@ | @@ -1,15 +1,15 @@ | |||
1 | $NetBSD: distinfo,v 1.13 2012/10/13 22:38:20 minskim Exp $ | 1 | $NetBSD: distinfo,v 1.14 2013/11/17 17:15:43 minskim Exp $ | |
2 | 2 | |||
3 | SHA1 (tex-tetex-27774/tetex.tar.xz) = 325de417b58edb930d3931f1de1a4304b97faf47 | 3 | SHA1 (tex-tetex-32132/tetex.tar.xz) = a3d48983771318668f75085f89c291d8f074986a | |
4 | RMD160 (tex-tetex-27774/tetex.tar.xz) = 56b1823fa3d3a39675bc418ecdfb746ca7c4b3f4 | 4 | RMD160 (tex-tetex-32132/tetex.tar.xz) = 4b853290e39fb6b1d251398865b5876114e79f09 | |
5 | Size (tex-tetex-27774/tetex.tar.xz) = 45068 bytes | 5 | Size (tex-tetex-32132/tetex.tar.xz) = 50824 bytes | |
6 | SHA1 (patch-bin_fmtutil) = 236e785100421eb544cf6c2ba37aa54d584b11cd | 6 | SHA1 (patch-bin_fmtutil) = 236e785100421eb544cf6c2ba37aa54d584b11cd | |
7 | SHA1 (patch-bin_fmtutil-sys) = 9503b6ab417676b8ad390a8fb02a07593da4084e | 7 | SHA1 (patch-bin_fmtutil-sys) = 9503b6ab417676b8ad390a8fb02a07593da4084e | |
8 | SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb | 8 | SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb | |
9 | SHA1 (patch-bin_kpsewhere) = d442bf917f9fbd5f6a0bc3c461b01cf4ad03346e | 9 | SHA1 (patch-bin_kpsewhere) = d442bf917f9fbd5f6a0bc3c461b01cf4ad03346e | |
10 | SHA1 (patch-bin_texconfig-dialog) = 6d4522833219687fcbc2b4b91047254fe97052aa | 10 | SHA1 (patch-bin_texconfig-dialog) = 6d4522833219687fcbc2b4b91047254fe97052aa | |
11 | SHA1 (patch-bin_texconfig-sys) = 5f72cf599cfde3af0bd21797aa8ad77f78287459 | 11 | SHA1 (patch-bin_texconfig-sys) = 5f72cf599cfde3af0bd21797aa8ad77f78287459 | |
12 | SHA1 (patch-bin_texlinks) = da88d185d7610afae9a84b5d0ce34c8fac957e0b | 12 | SHA1 (patch-bin_texlinks) = da88d185d7610afae9a84b5d0ce34c8fac957e0b | |
13 | SHA1 (patch-bin_updmap) = b2982af8d74176f473710fadf67fc81fc3be5f31 | 13 | SHA1 (patch-bin_updmap) = 9472a7e1fd0842e1baa39378266017946be3aa03 | |
14 | SHA1 (patch-bin_updmap-sys) = adf818f5e13cb20f104d3d590eb4a7d1b4598139 | 14 | SHA1 (patch-bin_updmap-sys) = 4671c8a8bade0e282f72a76f34debbd502a5c905 | |
15 | SHA1 (patch-texmf-dist_web2c_updmap.cfg) = f87dfc7759a8e49453f99c02134fa0bd94bb3912 | 15 | SHA1 (patch-texmf-dist_web2c_updmap.cfg) = e5ef9f07b356916a35fc43c1f157d3a3e61f3cfe |
@@ -1,16 +1,14 @@ | @@ -1,16 +1,14 @@ | |||
1 | # $NetBSD: Makefile,v 1.12 2012/10/13 22:38:20 minskim Exp $ | 1 | # $NetBSD: Makefile,v 1.13 2013/11/17 17:15:43 minskim Exp $ | |
2 | 2 | |||
3 | DISTNAME= tetex.doc | 3 | DISTNAME= tetex.doc | |
4 | PKGNAME= tex-${DISTNAME:S/./-/}-3.0.27774 | 4 | PKGNAME= tex-${DISTNAME:S/./-/}-3.0.32132 | |
5 | TEXLIVE_REV= 27774 | 5 | TEXLIVE_REV= 32132 | |
6 | 6 | |||
7 | MAINTAINER= minskim@NetBSD.org | 7 | MAINTAINER= minskim@NetBSD.org | |
8 | COMMENT= Documentation for tex-tetex | 8 | COMMENT= Documentation for tex-tetex | |
9 | 9 | |||
10 | CONFLICTS+= teTeX-bin<=3.0nb42 | 10 | CONFLICTS+= teTeX-bin<=3.0nb42 | |
11 | CONFLICTS+= texlive-tetex<=2011nb1 | 11 | CONFLICTS+= texlive-tetex<=2011nb1 | |
12 | 12 | |||
13 | TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf | |||
14 | ||||
15 | .include "../../print/texlive/package.mk" | 13 | .include "../../print/texlive/package.mk" | |
16 | .include "../../mk/bsd.pkg.mk" | 14 | .include "../../mk/bsd.pkg.mk" |
@@ -1,5 +1,5 @@ | @@ -1,5 +1,5 @@ | |||
1 | $NetBSD: distinfo,v 1.12 2012/10/13 22:38:20 minskim Exp $ | 1 | $NetBSD: distinfo,v 1.13 2013/11/17 17:15:43 minskim Exp $ | |
2 | 2 | |||
3 | SHA1 (tex-tetex-27774/tetex.doc.tar.xz) = 881f862b15cb960b41cd866fe464e4e8d0452963 | 3 | SHA1 (tex-tetex-32132/tetex.doc.tar.xz) = 19681519510bf8794aba8c0848dedb1a03cd34f9 | |
4 | RMD160 (tex-tetex-27774/tetex.doc.tar.xz) = e5e224cb8715752b0a77f4034e3cdd29ae35c6a8 | 4 | RMD160 (tex-tetex-32132/tetex.doc.tar.xz) = 92da273d09c33bdaa9786e480173c6d7b5d99b69 | |
5 | Size (tex-tetex-27774/tetex.doc.tar.xz) = 339860 bytes | 5 | Size (tex-tetex-32132/tetex.doc.tar.xz) = 340524 bytes |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.3 2012/10/13 22:38:20 minskim Exp $ | 1 | @comment $NetBSD: PLIST,v 1.4 2013/11/17 17:15:43 minskim Exp $ | |
2 | man/man1/allcm.1 | 2 | man/man1/allcm.1 | |
3 | man/man1/allec.1 | 3 | man/man1/allec.1 | |
4 | man/man1/allneeded.1 | 4 | man/man1/allneeded.1 | |
5 | man/man1/dvi2fax.1 | 5 | man/man1/dvi2fax.1 | |
6 | man/man1/dvired.1 | 6 | man/man1/dvired.1 | |
7 | man/man1/fmtutil-sys.1 | 7 | man/man1/fmtutil-sys.1 | |
8 | man/man1/fmtutil.1 | 8 | man/man1/fmtutil.1 | |
9 | man/man1/kpsepath.1 | 9 | man/man1/kpsepath.1 | |
10 | man/man1/kpsetool.1 | 10 | man/man1/kpsetool.1 | |
11 | man/man1/kpsewhere.1 | 11 | man/man1/kpsewhere.1 | |
12 | man/man1/kpsexpand.1 | 12 | man/man1/kpsexpand.1 | |
13 | man/man1/texlinks.1 | 13 | man/man1/texlinks.1 | |
14 | man/man1/updmap-sys.1 | 14 | man/man1/updmap-sys.1 | |
15 | man/man1/updmap.1 | 15 | man/man1/updmap.1 | |
16 | man/man5/fmtutil.cnf.5 | 16 | man/man5/fmtutil.cnf.5 | |
17 | man/man5/updmap.cfg.5 | 17 | man/man5/updmap.cfg.5 | |
18 | share/texmf/doc/tetex/TETEXDOC.pdf | 18 | share/texmf-dist/doc/tetex/TETEXDOC.pdf | |
19 | share/texmf/doc/tetex/teTeX-FAQ | 19 | share/texmf-dist/doc/tetex/teTeX-FAQ |
@@ -1,68 +1,334 @@ | @@ -1,68 +1,334 @@ | |||
1 | $NetBSD: patch-bin_updmap,v 1.3 2012/10/13 22:38:20 minskim Exp $ | 1 | $NetBSD: patch-bin_updmap,v 1.4 2013/11/17 17:15:43 minskim Exp $ | |
2 | 2 | |||
3 | --- bin/updmap.orig 2012-09-13 03:38:21.000000000 +0000 | 3 | --- bin/updmap.orig 2013-10-07 22:58:25.000000000 +0000 | |
4 | +++ bin/updmap | 4 | +++ bin/updmap | |
5 | @@ -23,7 +23,7 @@ my $TEXMFROOT; | 5 | @@ -3,5 +3,5 @@ | |
6 | 6 | # updmap - maintain map files for outline fonts. | ||
7 | # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) | |||
8 | -# | |||
9 | +# | |||
10 | # Copyright 2011, 2012, 2013 Norbert Preining | |||
11 | # This file is licensed under the GNU General Public License version 2 | |||
12 | @@ -24,5 +24,5 @@ my $TEXMFROOT; | |||
7 | BEGIN { | 13 | BEGIN { | |
8 | $^W=1; | 14 | $^W=1; | |
9 | - $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; | 15 | - $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; | |
10 | + $TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`; | 16 | + $TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`; | |
11 | if ($?) { | 17 | if ($?) { | |
12 | print STDERR "updmap: Cannot find TEXMFROOT, aborting!\n"; | 18 | print STDERR "updmap: Cannot find TEXMFROOT, aborting!\n"; | |
13 | exit 1; | 19 | @@ -38,5 +38,5 @@ my $version = '$Id: updmap.pl 31853 2013 | |
14 | @@ -50,10 +50,10 @@ use TeXLive::TLUtils qw(mkdirhier mktexu | 20 | use Getopt::Long qw(:config no_autoabbrev ignore_case_always); | |
15 | # this function checks by itself whether it is running on windows or not | 21 | use strict; | |
22 | -use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname | |||
23 | +use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname | |||
24 | sort_uniq member touch); | |||
25 | ||||
26 | @@ -51,10 +51,10 @@ use TeXLive::TLUtils qw(mkdirhier mktexu | |||
16 | reset_root_home(); | 27 | reset_root_home(); | |
17 | 28 | |||
18 | -chomp(my $TEXMFMAIN = `kpsewhich --var-value=TEXMFMAIN`); | 29 | -chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`); | |
19 | -chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); | 30 | -chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); | |
31 | -chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); | |||
20 | -chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); | 32 | -chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); | |
33 | -chomp(my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); | |||
21 | -chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`); | 34 | -chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`); | |
22 | +chomp(my $TEXMFMAIN = `@KPSEWHICH@ --var-value=TEXMFMAIN`); | 35 | +chomp(my $TEXMFDIST = `@KPSEWHICH@ --var-value=TEXMFDIST`); | |
23 | +chomp(my $TEXMFVAR = `@KPSEWHICH@ -var-value=TEXMFVAR`); | 36 | +chomp(my $TEXMFVAR = `@KPSEWHICH@ -var-value=TEXMFVAR`); | |
37 | +chomp(my $TEXMFSYSVAR = `@KPSEWHICH@ -var-value=TEXMFSYSVAR`); | |||
24 | +chomp(my $TEXMFCONFIG = `@KPSEWHICH@ -var-value=TEXMFCONFIG`); | 38 | +chomp(my $TEXMFCONFIG = `@KPSEWHICH@ -var-value=TEXMFCONFIG`); | |
39 | +chomp(my $TEXMFSYSCONFIG = `@KPSEWHICH@ -var-value=TEXMFSYSCONFIG`); | |||
25 | +chomp(my $TEXMFHOME = `@KPSEWHICH@ -var-value=TEXMFHOME`); | 40 | +chomp(my $TEXMFHOME = `@KPSEWHICH@ -var-value=TEXMFHOME`); | |
26 | 41 | |||
27 | # make sure that on windows *everything* is in lower case for comparison | 42 | # make sure that on windows *everything* is in lower case for comparison | |
28 | if (win32()) { | 43 | @@ -80,6 +80,6 @@ my @cmdline_options = ( | |
29 | @@ -215,7 +215,7 @@ sub main { | 44 | "sys", | |
30 | # in the list is the one where changes will be written to. | 45 | "listfiles", | |
46 | - "cnffile=s@", | |||
47 | - "copy", | |||
48 | + "cnffile=s@", | |||
49 | + "copy", | |||
50 | "disable=s@", | |||
51 | "dvipdfmoutputdir=s", | |||
52 | @@ -191,5 +191,5 @@ sub main { | |||
53 | exit 0; | |||
54 | } | |||
55 | - | |||
56 | + | |||
57 | if ($opts{'showoptions'}) { | |||
58 | for my $o (@{$opts{'showoptions'}}) { | |||
59 | @@ -231,5 +231,5 @@ sub main { | |||
31 | ($changes_config_file) = @{$opts{'cnffile'}}; | 60 | ($changes_config_file) = @{$opts{'cnffile'}}; | |
32 | } else { | 61 | } else { | |
33 | - my @all_files = `kpsewhich -all updmap.cfg`; | 62 | - my @all_files = `kpsewhich -all updmap.cfg`; | |
34 | + my @all_files = `@KPSEWHICH@ -all updmap.cfg`; | 63 | + my @all_files = `@KPSEWHICH@ -all updmap.cfg`; | |
35 | chomp(@all_files); | 64 | chomp(@all_files); | |
36 | my @used_files; | 65 | my @used_files; | |
37 | for my $f (@all_files) { | 66 | @@ -241,8 +241,8 @@ sub main { | |
38 | @@ -225,10 +225,10 @@ sub main { | |||
39 | my $TEXMFLOCALVAR; | |||
40 | my @TEXMFLOCAL; | 67 | my @TEXMFLOCAL; | |
41 | if (win32()) { | 68 | if (win32()) { | |
42 | - chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`); | 69 | - chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`); | |
43 | + chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path=\$TEXMFLOCAL`); | 70 | + chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path=\$TEXMFLOCAL`); | |
44 | @TEXMFLOCAL = map { lc } split(/;/ , $TEXMFLOCALVAR); | 71 | @TEXMFLOCAL = map { lc } split(/;/ , $TEXMFLOCALVAR); | |
45 | } else { | 72 | } else { | |
46 | - chomp($TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`); | 73 | - chomp($TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`); | |
47 | + chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path='\$TEXMFLOCAL'`); | 74 | + chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path='\$TEXMFLOCAL'`); | |
48 | @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR; | 75 | @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR; | |
49 | } | 76 | } | |
50 | # | 77 | @@ -280,5 +280,5 @@ sub main { | |
51 | @@ -1139,7 +1139,7 @@ sub mkMaps { | 78 | # TEXMFLOCAL $TEXLIVE/texmf-local/web2c/updmap.cfg | |
79 | # TEXMFDIST $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg | |||
80 | - # | |||
81 | + # | |||
82 | # updmap-sys (root): | |||
83 | # ================== | |||
84 | @@ -415,5 +415,5 @@ sub main { | |||
85 | ||||
86 | if ($cmd && !$opts{'force'} && !$changed) { | |||
87 | - print "$changes_config_file unchanged. Map files not recreated.\n" | |||
88 | + print "$changes_config_file unchanged. Map files not recreated.\n" | |||
89 | if !$opts{'quiet'}; | |||
90 | } else { | |||
91 | @@ -435,5 +435,5 @@ sub main { | |||
92 | my @missing = read_map_files(); | |||
93 | if (@missing) { | |||
94 | - print STDERR "\nERROR: The following map file(s) couldn't be found:\n"; | |||
95 | + print STDERR "\nERROR: The following map file(s) couldn't be found:\n"; | |||
96 | for my $m (@missing) { | |||
97 | my $orig = $alldata->{'maps'}{$m}{'origin'}; | |||
98 | @@ -913,5 +913,5 @@ sub cidx2dvips_old { | |||
99 | elsif ($_ =~ /^[^ ][^ ]* unicode /) {next;} | |||
100 | s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Oo][Tt][Ff]/$1/; | |||
101 | - s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Tt][Tt][FfCc]/$1/; | |||
102 | + s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Tt][Tt][FfCc]/$1/; | |||
103 | s/$/ %/; | |||
104 | s/^(([^ ]*).*)/$1$2/; | |||
105 | @@ -961,9 +961,9 @@ sub mkMaps { | |||
106 | ||||
107 | my ($mode, $mode_origin) = get_cfg('LW35'); | |||
108 | - my ($dvipsPreferOutline, $dvipsPreferOutline_origin) = | |||
109 | + my ($dvipsPreferOutline, $dvipsPreferOutline_origin) = | |||
110 | get_cfg('dvipsPreferOutline'); | |||
111 | - my ($dvipsDownloadBase35, $dvipsDownloadBase35_origin) = | |||
112 | + my ($dvipsDownloadBase35, $dvipsDownloadBase35_origin) = | |||
113 | get_cfg('dvipsDownloadBase35'); | |||
114 | - my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) = | |||
115 | + my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) = | |||
116 | get_cfg('pdftexDownloadBase14'); | |||
117 | my ($pxdviUse, $pxdviUse_origin) = get_cfg('pxdviUse'); | |||
118 | @@ -1120,5 +1120,5 @@ sub mkMaps { | |||
119 | push @ps2pk_map, @mixedmaps_fonts; | |||
120 | push @ps2pk_map, @notmixedmaps_fonts; | |||
121 | - &writeLines(">$dvipsoutputdir/ps2pk.map", | |||
122 | + &writeLines(">$dvipsoutputdir/ps2pk.map", | |||
123 | normalizeLines(@ps2pk_map)); | |||
52 | 124 | |||
125 | @@ -1127,5 +1127,5 @@ sub mkMaps { | |||
126 | push @download35_map, "% ps2pk35.map"; | |||
127 | push @download35_map, transLW35($mode, @ps2pk_fonts); | |||
128 | - &writeLines(">$dvipsoutputdir/download35.map", | |||
129 | + &writeLines(">$dvipsoutputdir/download35.map", | |||
130 | normalizeLines(@download35_map)); | |||
131 | ||||
132 | @@ -1133,8 +1133,8 @@ sub mkMaps { | |||
133 | push @builtin35_map, "% dvips35.map"; | |||
134 | push @builtin35_map, transLW35($mode, @dvips35_fonts); | |||
135 | - &writeLines(">$dvipsoutputdir/builtin35.map", | |||
136 | + &writeLines(">$dvipsoutputdir/builtin35.map", | |||
137 | normalizeLines(@builtin35_map)); | |||
138 | ||||
139 | - my @dftdvips_fonts = | |||
140 | + my @dftdvips_fonts = | |||
141 | (($dvipsDownloadBase35 eq "true") ? @ps2pk_fonts : @dvips35_fonts); | |||
142 | ||||
143 | @@ -1152,5 +1152,5 @@ sub mkMaps { | |||
144 | push @psfonts_t1_map, @notmixedmaps_fonts; | |||
145 | push @psfonts_t1_map, @tmpkanji2; | |||
146 | - &writeLines(">$dvipsoutputdir/psfonts_t1.map", | |||
147 | + &writeLines(">$dvipsoutputdir/psfonts_t1.map", | |||
148 | normalizeLines(@psfonts_t1_map)); | |||
149 | ||||
150 | @@ -1159,5 +1159,5 @@ sub mkMaps { | |||
151 | push @psfonts_pk_map, @notmixedmaps_fonts; | |||
152 | push @psfonts_pk_map, @tmpkanji2; | |||
153 | - &writeLines(">$dvipsoutputdir/psfonts_pk.map", | |||
154 | + &writeLines(">$dvipsoutputdir/psfonts_pk.map", | |||
155 | normalizeLines(@psfonts_pk_map)); | |||
156 | ||||
157 | @@ -1216,5 +1216,5 @@ sub mkMaps { | |||
158 | } else { | |||
159 | print STDERR "$prg: Warning: File $d/$f doesn't exist.\n"; | |||
160 | - print LOG "Warning: File $d/$f doesn't exist.\n" | |||
161 | + print LOG "Warning: File $d/$f doesn't exist.\n" | |||
162 | unless $opts{'dry-run'}; | |||
163 | } | |||
164 | @@ -1223,5 +1223,5 @@ sub mkMaps { | |||
165 | sub check_mismatch { | |||
166 | my ($mm, $d, $f, $prog) = @_; | |||
167 | - chomp (my $kpsefound = `kpsewhich --progname=$prog $f`); | |||
168 | + chomp (my $kpsefound = `@KPSEWHICH@ --progname=$prog $f`); | |||
169 | if (lc("$d/$f") ne lc($kpsefound)) { | |||
170 | $mm->{$f} = $kpsefound; | |||
171 | @@ -1332,5 +1332,5 @@ listed below). | |||
53 | sub locateMap { | 172 | sub locateMap { | |
54 | my $map = shift; | 173 | my $map = shift; | |
55 | - my $ret = `kpsewhich --format=map $map`; | 174 | - my $ret = `kpsewhich --format=map $map`; | |
56 | + my $ret = `@KPSEWHICH@ --format=map $map`; | 175 | + my $ret = `@KPSEWHICH@ --format=map $map`; | |
57 | chomp($ret); | 176 | chomp($ret); | |
58 | return $ret; | 177 | return $ret; | |
178 | @@ -1376,5 +1376,5 @@ sub processOptions { | |||
179 | # now continue with normal option handling | |||
180 | ||||
181 | - GetOptions(\%opts, @cmdline_options) or | |||
182 | + GetOptions(\%opts, @cmdline_options) or | |||
183 | die "Try \"$prg --help\" for more information.\n"; | |||
59 | } | 184 | } | |
60 | @@ -1787,7 +1787,7 @@ sub read_map_files { | 185 | @@ -1408,5 +1408,5 @@ sub setupOutputDir { | |
61 | $alldata->{'maps'}{$m}{'status'} = 'enabled'; | 186 | # in process_options | |
187 | # (These were the values provided to --setoption.) | |||
188 | -# | |||
189 | +# | |||
190 | sub setOptions { | |||
191 | my (@options) = @_; | |||
192 | @@ -1415,5 +1415,5 @@ sub setOptions { | |||
193 | ||||
194 | my ($key,$val) = split (/=/, $o, 2); | |||
195 | - | |||
196 | + | |||
197 | die "$prg: unexpected empty key or val for options (@options), goodbye.\n" | |||
198 | if !$key || !defined($val); | |||
199 | @@ -1497,5 +1497,5 @@ sub disable_map { | |||
200 | # add a new entry to the top level where we disable it | |||
201 | # copy over the type from the last entry | |||
202 | - $alldata->{'updmap'}{$tc}{'maps'}{$map}{'type'} = | |||
203 | + $alldata->{'updmap'}{$tc}{'maps'}{$map}{'type'} = | |||
204 | $alldata->{'updmap'}{$orig}{'maps'}{$map}{'type'}; | |||
205 | $alldata->{'updmap'}{$tc}{'maps'}{$map}{'status'} = "disabled"; | |||
206 | @@ -1595,5 +1595,5 @@ sub save_updmap { | |||
207 | sub check_option { | |||
208 | my ($opt, $val) = @_; | |||
209 | - if ((($settings{$opt}{'type'} eq "binary") && | |||
210 | + if ((($settings{$opt}{'type'} eq "binary") && | |||
211 | $val ne "true" && $val ne "false") || | |||
212 | (($settings{$opt}{'type'} eq "string") && | |||
213 | @@ -1613,10 +1613,10 @@ sub setOption { | |||
214 | ||||
215 | die "$prg: Unsupported option $opt." if (!defined($settings{$opt})); | |||
216 | - die "$0: Invalid value $val for option $opt." | |||
217 | + die "$0: Invalid value $val for option $opt." | |||
218 | if (!check_option($opt, $val)); | |||
219 | ||||
220 | # silently accept this old option name, just in case. | |||
221 | return if $opt eq "dvipdfmDownloadBase14"; | |||
222 | - | |||
223 | + | |||
224 | #print "Setting option $opt to $val...\n" if !$opts{'quiet'}; | |||
225 | my $tc = $alldata->{'changes_config'}; | |||
226 | @@ -1766,7 +1766,7 @@ sub normalizeLines { | |||
227 | # $alldata->{'updmap'}{$full_path_name_of_updmap}{'setting'}{$key}{'val'} = $val | |||
228 | # $alldata->{'updmap'}{$full_path_name_of_updmap}{'setting'}{$key}{'line'} = $i | |||
229 | -# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'type'} | |||
230 | +# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'type'} | |||
231 | # = 'Map'|'MixedMap'|'KanjiMap'|'disabled' | |||
232 | -# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'status'} | |||
233 | +# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'status'} | |||
234 | # = 'enabled'|'disabled' | |||
235 | # $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'line'} = $i | |||
236 | @@ -1978,5 +1978,5 @@ sub read_map_files { | |||
62 | } | 237 | } | |
63 | @maps = sort_uniq(@maps); | 238 | @maps = sort_uniq(@maps); | |
64 | - my @fullpath = `kpsewhich --format=map @maps`; | 239 | - my @fullpath = `kpsewhich --format=map @maps`; | |
65 | + my @fullpath = `@KPSEWHICH@ --format=map @maps`; | 240 | + my @fullpath = `@KPSEWHICH@ --format=map @maps`; | |
66 | chomp @fullpath; | 241 | chomp @fullpath; | |
67 | foreach my $map (@maps) { | 242 | foreach my $map (@maps) { | |
68 | my ($ff) = grep /\/$map(\.map)?$/, @fullpath; | 243 | @@ -1985,5 +1985,5 @@ sub read_map_files { | |
244 | $alldata->{'maps'}{$map}{'fullpath'} = $ff; | |||
245 | } else { | |||
246 | - # if the map file is not found, then push it onto the list of | |||
247 | + # if the map file is not found, then push it onto the list of | |||
248 | # missing map files, since we know that it is enabled | |||
249 | push @missing, $map; | |||
250 | @@ -2087,11 +2087,11 @@ sub merge_data { | |||
251 | # use the font definition only for those fonts where the origin matches | |||
252 | if ($alldata->{'fonts'}{$f}{'origin'} eq $m) { | |||
253 | - $alldata->{'merged'}{'allMaps'}{'fonts'}{$f} = | |||
254 | + $alldata->{'merged'}{'allMaps'}{'fonts'}{$f} = | |||
255 | $alldata->{'maps'}{$m}{'fonts'}{$f} | |||
256 | if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} ne "KanjiMap"); | |||
257 | - $alldata->{'merged'}{'noMixedMaps'}{'fonts'}{$f} = | |||
258 | + $alldata->{'merged'}{'noMixedMaps'}{'fonts'}{$f} = | |||
259 | $alldata->{'maps'}{$m}{'fonts'}{$f} | |||
260 | if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} eq "Map"); | |||
261 | - $alldata->{'merged'}{'KanjiMap'}{'fonts'}{$f} = | |||
262 | + $alldata->{'merged'}{'KanjiMap'}{'fonts'}{$f} = | |||
263 | $alldata->{'maps'}{$m}{'fonts'}{$f} | |||
264 | if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} eq "KanjiMap"); | |||
265 | @@ -2105,5 +2105,5 @@ sub merge_data { | |||
266 | # $HOME and sudo and updmap-sys horror | |||
267 | # some instances of sudo do not reset $HOME to the home of root | |||
268 | -# as an effect of "sudo updmap" creates root owned files in the home | |||
269 | +# as an effect of "sudo updmap" creates root owned files in the home | |||
270 | # of a normal user, and "sudo updmap-sys" uses map files and updmap.cfg | |||
271 | # files from the directory of a normal user, but creating files | |||
272 | @@ -2133,5 +2133,5 @@ sub reset_root_home { | |||
273 | # envhome and roothome do agree, nothing to do, that is the good case | |||
274 | } | |||
275 | - } else { | |||
276 | + } else { | |||
277 | warning("$prg: home of root not defined, strange!\n"); | |||
278 | } | |||
279 | @@ -2158,5 +2158,5 @@ Usage: $prg [OPTION] ... [COMMAND] | |||
280 | ||||
281 | Update the default font map files used by pdftex, dvips, and dvipdfm(x), | |||
282 | -and optionally pxdvi, as determined by all configuration files updmap.cfg | |||
283 | +and optionally pxdvi, as determined by all configuration files updmap.cfg | |||
284 | (the ones returned by running "kpsewhich --all updmap.cfg", but see below). | |||
285 | ||||
286 | @@ -2174,5 +2174,5 @@ By default, the TeX filename database (l | |||
287 | ||||
288 | Options: | |||
289 | - --cnffile FILE read FILE for the updmap configuration | |||
290 | + --cnffile FILE read FILE for the updmap configuration | |||
291 | (can be given multiple times, in which case | |||
292 | all the files are used) | |||
293 | @@ -2261,5 +2261,5 @@ Explanation of trees and files normally | |||
294 | layout is used as shipped with TeX Live, the following files are | |||
295 | read, in the given order. | |||
296 | - | |||
297 | + | |||
298 | For updmap-sys: | |||
299 | TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg | |||
300 | @@ -2276,7 +2276,7 @@ Explanation of trees and files normally | |||
301 | TEXMFLOCAL \$TEXLIVE/texmf-local/web2c/updmap.cfg | |||
302 | TEXMFDIST \$TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg | |||
303 | - | |||
304 | + | |||
305 | (where YYYY is the TeX Live release version). | |||
306 | - | |||
307 | + | |||
308 | There is one exception to keep upgradability from earlier versions | |||
309 | of TeX Live: if a file TEXMFLOCAL/web2c/updmap-local.cfg exists | |||
310 | @@ -2299,8 +2299,8 @@ Explanation of trees and files normally | |||
311 | kpsewhich --all (equivalently, the one returned by kpsewhich | |||
312 | updmap.cfg), is used. | |||
313 | - | |||
314 | + | |||
315 | 2) If neither of the above two are present and changes are made, a | |||
316 | new config file is created in \$TEXMFCONFIG/web2c/updmap.cfg. | |||
317 | - | |||
318 | + | |||
319 | In general, the idea is that if a given config file is not writable, a | |||
320 | higher-level one can be used. That way, the distribution's settings | |||
321 | @@ -2321,5 +2321,5 @@ Explanation of trees and files normally | |||
322 | or | |||
323 | \#! MixedMap mapname.map | |||
324 | - in the higher-priority updmap.cfg file. | |||
325 | + in the higher-priority updmap.cfg file. | |||
326 | ||||
327 | As an example, suppose you have a copy of MathTime Pro fonts | |||
328 | @@ -2334,5 +2334,5 @@ Explanation of trees and files normally | |||
329 | updmap writes the map files for dvips (psfonts.map) and pdftex | |||
330 | (pdftex.map) to the TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/ | |||
331 | - directories. | |||
332 | + directories. | |||
333 | ||||
334 | The log file is written to TEXMFVAR/web2c/updmap.log. |
@@ -1,19 +1,10 @@ | @@ -1,19 +1,10 @@ | |||
1 | $NetBSD: patch-bin_updmap-sys,v 1.1 2011/11/06 08:43:28 minskim Exp $ | 1 | $NetBSD: patch-bin_updmap-sys,v 1.2 2013/11/17 17:15:43 minskim Exp $ | |
2 | 2 | |||
3 | --- bin/updmap-sys.orig 2011-05-20 09:20:02.000000000 +0000 | 3 | --- bin/updmap-sys.orig 2013-07-31 01:51:21.000000000 +0000 | |
4 | +++ bin/updmap-sys | 4 | +++ bin/updmap-sys | |
5 | @@ -20,11 +20,11 @@ export PATH | 5 | @@ -27,4 +27,4 @@ test -n "${ZSH_VERSION+set}" && alias -g | |
6 | # hack around a bug in zsh: | 6 | # TEXMFCONFIG="$c" | |
7 | test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"' | 7 | # export TEXMFVAR TEXMFCONFIG | |
8 | 8 | |||
9 | -v=`kpsewhich -var-value TEXMFSYSVAR` | 9 | -exec updmap --sys ${1+"$@"} | |
10 | -c=`kpsewhich -var-value TEXMFSYSCONFIG` | 10 | +exec @UPDMAP@ --sys ${1+"$@"} | |
11 | +v=`@KPSEWHICH@ -var-value TEXMFSYSVAR` | |||
12 | +c=`@KPSEWHICH@ -var-value TEXMFSYSCONFIG` | |||
13 | ||||
14 | TEXMFVAR="$v" | |||
15 | TEXMFCONFIG="$c" | |||
16 | export TEXMFVAR TEXMFCONFIG | |||
17 | ||||
18 | -exec updmap ${1+"$@"} | |||
19 | +exec @UPDMAP@ ${1+"$@"} |
@@ -1,214 +1,247 @@ | @@ -1,214 +1,247 @@ | |||
1 | $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp $ | 1 | $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.3 2013/11/17 17:15:43 minskim Exp $ | |
2 | 2 | |||
3 | --- texmf-dist/web2c/updmap.cfg.orig 2012-09-22 02:28:30.000000000 +0000 | 3 | --- texmf-dist/web2c/updmap.cfg.orig 2013-11-12 02:23:56.000000000 +0000 | |
4 | +++ texmf-dist/web2c/updmap.cfg | 4 | +++ texmf-dist/web2c/updmap.cfg | |
5 | @@ -26,227 +26,4 @@ | 5 | @@ -100,263 +100,3 @@ kanjiEmbed noEmbed | |
6 | # The default settings of the updmap options (not maps) are specified in | 6 | ||
7 | # TEXMFMAIN/web2c/updmap.cfg and can be overridden by an updmap.cfg in | 7 | ||
8 | # any other tree. | 8 | # (end of updmap-hdr.cfg) | |
9 | -Map accanthis.map | |||
9 | -Map OrnementsADF.map | 10 | -Map OrnementsADF.map | |
10 | -Map ArrowsADF.map | 11 | -Map ArrowsADF.map | |
11 | -Map BulletsADF.map | 12 | -Map BulletsADF.map | |
13 | -Map alegreya.map | |||
12 | -MixedMap allrunes.map | 14 | -MixedMap allrunes.map | |
13 | -Map euler.map | 15 | -Map euler.map | |
14 | -MixedMap cm.map | 16 | -MixedMap cm.map | |
15 | -MixedMap cmextra.map | 17 | -MixedMap cmextra.map | |
16 | -MixedMap cyrillic.map | 18 | -MixedMap cyrillic.map | |
17 | -MixedMap latxfont.map | 19 | -MixedMap latxfont.map | |
18 | -MixedMap symbols.map | 20 | -MixedMap symbols.map | |
19 | -Map uaq.map | 21 | -Map uaq.map | |
20 | -Map antt.map | 22 | -Map antt.map | |
21 | -Map arabi.map | 23 | -Map arabi.map | |
22 | -MixedMap arabtex.map | 24 | -MixedMap arabtex.map | |
25 | -Map syriac.map | |||
23 | -Map archaicprw.map | 26 | -Map archaicprw.map | |
24 | -Map arev.map | 27 | -Map arev.map | |
25 | -Map bkaiu.map | 28 | -Map bkaiu.map | |
26 | -Map bsmiu.map | 29 | -Map bsmiu.map | |
27 | -Map gbsnu.map | 30 | -Map gbsnu.map | |
28 | -Map gkaiu.map | 31 | -Map gkaiu.map | |
29 | -Map ascii.map | 32 | -Map ascii.map | |
30 | -Map aspectratio.map | 33 | -Map aspectratio.map | |
31 | -Map augie.map | 34 | -Map augie.map | |
32 | -Map auncial.map | 35 | -Map auncial.map | |
33 | -Map aurical.map | 36 | -Map aurical.map | |
37 | -Map uag.map | |||
34 | -Map ybv.map | 38 | -Map ybv.map | |
35 | -MixedMap bbold.map | 39 | -MixedMap bbold.map | |
36 | -Map belleek.map | 40 | -Map belleek.map | |
37 | -Map bera.map | 41 | -Map bera.map | |
38 | -Map ybd.map | 42 | -Map ybd.map | |
39 | -Map bguq.map | 43 | -Map bguq.map | |
40 | -Map biolinum-type1.map | |||
41 | -Map sqrcaps.map | 44 | -Map sqrcaps.map | |
45 | -Map ubk.map | |||
42 | -Map boondox.map | 46 | -Map boondox.map | |
43 | -Map pbsi.map | 47 | -Map pbsi.map | |
44 | -Map burmese.map | 48 | -Map burmese.map | |
49 | -Map cabin.map | |||
45 | -Map calligra.map | 50 | -Map calligra.map | |
46 | -Map cantarell.map | 51 | -Map cantarell.map | |
47 | -Map cmin.map | 52 | -Map cmin.map | |
48 | -MixedMap cbgreek-full.map | 53 | -MixedMap cbgreek-full.map | |
49 | -MixedMap ccpl.map | 54 | -MixedMap ccpl.map | |
50 | -Map ccicons.map | 55 | -Map ccicons.map | |
51 | -Map clm.map | 56 | -Map clm.map | |
52 | -Map chemarrow.map | 57 | -Map chemarrow.map | |
53 | -Map cjhebrew.map | 58 | -Map cjhebrew.map | |
54 | -MixedMap cmtext-bsr-interpolated.map | 59 | -MixedMap cmtext-bsr-interpolated.map | |
55 | -Map cm-lgc.map | 60 | -Map cm-lgc.map | |
56 | -MixedMap cm-super-t1.map | 61 | -MixedMap cm-super-t1.map | |
57 | -MixedMap cm-super-t2a.map | 62 | -MixedMap cm-super-t2a.map | |
58 | -MixedMap cm-super-t2b.map | 63 | -MixedMap cm-super-t2b.map | |
59 | -MixedMap cm-super-t2c.map | 64 | -MixedMap cm-super-t2c.map | |
60 | -MixedMap cm-super-ts1.map | 65 | -MixedMap cm-super-ts1.map | |
61 | -MixedMap cm-super-x2.map | 66 | -MixedMap cm-super-x2.map | |
62 | -Map cmcyr.map | 67 | -Map cmcyr.map | |
63 | -MixedMap cmll.map | 68 | -MixedMap cmll.map | |
64 | -Map comfortaa.map | 69 | -Map comfortaa.map | |
65 | -Map original-context-symbol.map | 70 | -Map original-context-symbol.map | |
66 | -Map CountriesOfEurope.map | 71 | -Map CountriesOfEurope.map | |
67 | -MixedMap csother.map | 72 | -Map ucr.map | |
68 | -MixedMap cstext.map | 73 | -Map cs-charter.map | |
74 | -Map csfonts.map | |||
69 | -Map cyklop.map | 75 | -Map cyklop.map | |
70 | -Map dejavu-type1.map | 76 | -Map dejavu-type1.map | |
71 | -Map dictsym.map | 77 | -Map dictsym.map | |
72 | -Map dstroke.map | 78 | -Map dstroke.map | |
73 | -Map droid.map | 79 | -Map droid.map | |
74 | -Map dutchcal.map | 80 | -Map dutchcal.map | |
81 | -Map EBGaramond.map | |||
75 | -Map yes.map | 82 | -Map yes.map | |
76 | -Map epigrafica.map | 83 | -Map epigrafica.map | |
77 | -Map epiolmec.map | 84 | -Map epiolmec.map | |
78 | -MixedMap esint.map | 85 | -MixedMap esint.map | |
79 | -Map ESSTIX.map | 86 | -Map ESSTIX.map | |
80 | -Map esvect.map | 87 | -Map esvect.map | |
81 | -MixedMap ethiop.map | 88 | -MixedMap ethiop.map | |
82 | -MixedMap eurosym.map | 89 | -MixedMap eurosym.map | |
90 | -Map fbb.map | |||
83 | -Map fdsymbol.map | 91 | -Map fdsymbol.map | |
84 | -Map fge.map | 92 | -Map fge.map | |
85 | -Map foekfont.map | 93 | -Map foekfont.map | |
86 | -Map fonetika.map | 94 | -Map fonetika.map | |
95 | -Map nectec.map | |||
96 | -Map nf.map | |||
87 | -Map tlwg.map | 97 | -Map tlwg.map | |
88 | -Map fourier-utopia-expert.map | 98 | -Map fourier-utopia-expert.map | |
89 | -Map fourier.map | 99 | -Map fourier.map | |
90 | -Map frcursive.map | 100 | -Map frcursive.map | |
91 | -Map garuda-c90.map | 101 | -Map garuda-c90.map | |
102 | -Map gentium-type1.map | |||
92 | -Map gfsartemisia.map | 103 | -Map gfsartemisia.map | |
93 | -Map gfsbaskerville.map | 104 | -Map gfsbaskerville.map | |
94 | -Map gfsbodoni.map | 105 | -Map gfsbodoni.map | |
95 | -Map gfscomplutum.map | 106 | -Map gfscomplutum.map | |
96 | -Map gfsdidot.map | 107 | -Map gfsdidot.map | |
97 | -Map gfsneohellenic.map | 108 | -Map gfsneohellenic.map | |
98 | -Map gfsporson.map | 109 | -Map gfsporson.map | |
99 | -Map gfssolomos.map | 110 | -Map gfssolomos.map | |
111 | -Map gillius.map | |||
100 | -Map yfrak.map | 112 | -Map yfrak.map | |
101 | -Map ugq.map | 113 | -Map ugq.map | |
102 | -Map grverb.map | |||
103 | -Map hacm.map | 114 | -Map hacm.map | |
115 | -Map uhv.map | |||
104 | -MixedMap hfbright.map | 116 | -MixedMap hfbright.map | |
105 | -MixedMap iby.map | 117 | -MixedMap iby.map | |
106 | -Map fi4.map | 118 | -Map zi4.map | |
107 | -Map Acorn.map | 119 | -Map Acorn.map | |
108 | -Map AnnSton.map | 120 | -Map AnnSton.map | |
109 | -Map ArtNouv.map | 121 | -Map ArtNouv.map | |
110 | -Map ArtNouvc.map | 122 | -Map ArtNouvc.map | |
111 | -Map Carrickc.map | 123 | -Map Carrickc.map | |
112 | -Map Eichenla.map | 124 | -Map Eichenla.map | |
113 | -Map Eileen.map | 125 | -Map Eileen.map | |
114 | -Map EileenBl.map | 126 | -Map EileenBl.map | |
115 | -Map Elzevier.map | 127 | -Map Elzevier.map | |
116 | -Map GotIn.map | 128 | -Map GotIn.map | |
117 | -Map GoudyIn.map | 129 | -Map GoudyIn.map | |
118 | -Map Kinigcap.map | 130 | -Map Kinigcap.map | |
119 | -Map Konanur.map | 131 | -Map Konanur.map | |
120 | -Map Kramer.map | 132 | -Map Kramer.map | |
121 | -Map MorrisIn.map | 133 | -Map MorrisIn.map | |
122 | -Map Nouveaud.map | 134 | -Map Nouveaud.map | |
123 | -Map Romantik.map | 135 | -Map Romantik.map | |
124 | -Map Rothdn.map | 136 | -Map Rothdn.map | |
125 | -Map RoyalIn.map | 137 | -Map RoyalIn.map | |
126 | -Map Sanremo.map | 138 | -Map Sanremo.map | |
127 | -Map Starburst.map | 139 | -Map Starburst.map | |
128 | -Map Typocaps.map | 140 | -Map Typocaps.map | |
129 | -Map Zallman.map | 141 | -Map Zallman.map | |
142 | -Map ipaex-type1.map | |||
130 | -Map iwona.map | 143 | -Map iwona.map | |
131 | -KanjiMap otf-@kanjiEmbed@.map | 144 | -KanjiMap otf-@kanjiEmbed@.map | |
132 | -KanjiMap otf-cktx.map | 145 | -KanjiMap otf-cktx.map | |
133 | -KanjiMap otf-up-@kanjiEmbed@.map | 146 | -KanjiMap otf-up-@kanjiEmbed@.map | |
134 | -Map kerkis.map | 147 | -Map kerkis.map | |
135 | -Map knitfont.map | 148 | -Map knitfont.map | |
136 | -Map kpfonts.map | 149 | -Map kpfonts.map | |
137 | -Map kurier.map | 150 | -Map kurier.map | |
138 | -Map lato.map | 151 | -Map lato.map | |
139 | -Map libertine-type1.map | 152 | -Map libertine.map | |
153 | -Map LibreBaskerville.map | |||
154 | -Map LibreCaslon.map | |||
140 | -Map yly.map | 155 | -Map yly.map | |
141 | -Map linearA.map | 156 | -Map linearA.map | |
142 | -Map l7x-urwvn.map | 157 | -Map l7x-urwvn.map | |
143 | -Map lm.map | 158 | -Map lm.map | |
144 | -MixedMap lxfonts.map | 159 | -MixedMap lxfonts.map | |
145 | -MixedMap manfnt.map | 160 | -MixedMap manfnt.map | |
146 | -Map marvosym.map | 161 | -Map marvosym.map | |
147 | -Map mathabx.map | 162 | -Map mathabx.map | |
148 | -Map mdbch.map | 163 | -Map mdbch.map | |
164 | -Map mdgreek.map | |||
165 | -Map mdici.map | |||
166 | -Map mdpgd.map | |||
167 | -Map mdpus.map | |||
149 | -Map mdput.map | 168 | -Map mdput.map | |
150 | -Map mdugm.map | 169 | -Map mdugm.map | |
151 | -Map mdsymbol.map | 170 | -Map mdsymbol.map | |
171 | -Map merriweather.map | |||
152 | -Map troff-updmap.map | 172 | -Map troff-updmap.map | |
153 | -MixedMap mflogo.map | 173 | -MixedMap mflogo.map | |
174 | -Map mintspirit.map | |||
154 | -Map MnSymbol.map | 175 | -Map MnSymbol.map | |
155 | -MixedMap mongolian.map | 176 | -MixedMap mongolian.map | |
156 | -MixedMap musix.map | 177 | -MixedMap musix.map | |
157 | -Map ntx.map | 178 | -Map mxedruli.map | |
179 | -Map nanumfonts.map | |||
180 | -Map unc.map | |||
181 | -Map newpx.map | |||
182 | -Map newtx.map | |||
158 | -Map norasi-c90.map | 183 | -Map norasi-c90.map | |
159 | -Map cherokee.map | 184 | -Map cherokee.map | |
160 | -Map ocrb.map | 185 | -Map ocrb.map | |
161 | -Map oinuit.map | 186 | -Map oinuit.map | |
162 | -Map omega.map | 187 | -Map omega.map | |
163 | -Map opensans.map | 188 | -Map opensans.map | |
189 | -Map upl.map | |||
164 | -Map paratype-type1.map | 190 | -Map paratype-type1.map | |
165 | -Map phaistos.map | 191 | -Map phaistos.map | |
166 | -MixedMap pigpen.map | 192 | -MixedMap pigpen.map | |
167 | -MixedMap plother.map | 193 | -MixedMap plother.map | |
168 | -MixedMap pltext.map | 194 | -MixedMap pltext.map | |
169 | -Map ap.map | 195 | -Map ap.map | |
170 | -Map prodint.map | 196 | -Map prodint.map | |
171 | -Map charter.map | 197 | -Map charter.map | |
172 | -Map fpls.map | 198 | -Map fpls.map | |
173 | -Map pazo.map | 199 | -Map pazo.map | |
174 | -Map utopia.map | 200 | -Map utopia.map | |
175 | -KanjiMap morisawa.map | 201 | -KanjiMap morisawa.map | |
176 | -KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map | 202 | -KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map | |
177 | -Map pxfonts.map | 203 | -Map pxfonts.map | |
178 | -Map pxtx.map | 204 | -Map pxtx.map | |
205 | -Map quattrocento.map | |||
206 | -Map Raleway.map | |||
179 | -Map recycle.map | 207 | -Map recycle.map | |
180 | -Map yrd.map | 208 | -Map yrd.map | |
181 | -MixedMap rsfs.map | 209 | -MixedMap rsfs.map | |
182 | -Map rsfso.map | 210 | -Map rsfso.map | |
183 | -Map skt.map | 211 | -Map skt.map | |
184 | -Map sansmathaccent.map | 212 | -Map sansmathaccent.map | |
213 | -Map sansmathfonts.map | |||
185 | -MixedMap semaf.map | 214 | -MixedMap semaf.map | |
186 | -Map SkakNew.map | 215 | -Map SkakNew.map | |
216 | -Map SourceCodePro.map | |||
217 | -Map SourceSansPro.map | |||
187 | -Map starfont.map | 218 | -Map starfont.map | |
188 | -Map icelandic.map | 219 | -Map icelandic.map | |
189 | -MixedMap stmaryrd.map | 220 | -MixedMap stmaryrd.map | |
190 | -Map superiors.map | 221 | -Map superiors.map | |
222 | -Map usy.map | |||
191 | -Map tabvar.map | 223 | -Map tabvar.map | |
192 | Map mathpple.map | 224 | -Map mathpple.map | |
193 | -Map qag.map | 225 | -Map qag.map | |
194 | -Map qbk.map | 226 | -Map qbk.map | |
195 | -Map qcr.map | 227 | -Map qcr.map | |
196 | -Map qcs.map | 228 | -Map qcs.map | |
197 | -Map qhv.map | 229 | -Map qhv.map | |
198 | -Map qpl.map | 230 | -Map qpl.map | |
199 | -Map qtm.map | 231 | -Map qtm.map | |
200 | -Map qzc.map | 232 | -Map qzc.map | |
201 | -Map tfrupee.map | 233 | -Map tfrupee.map | |
234 | -Map utm.map | |||
202 | -MixedMap tipa.map | 235 | -MixedMap tipa.map | |
203 | -MixedMap trajan.map | 236 | -MixedMap trajan.map | |
204 | -Map txfonts.map | 237 | -Map txfonts.map | |
205 | -Map gptimes.map | 238 | -Map gptimes.map | |
206 | -Map umj.map | 239 | -Map umj.map | |
207 | -KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map | 240 | -KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map | |
208 | -MixedMap dvng.map | 241 | -MixedMap dvng.map | |
209 | -Map yv1.map | 242 | -Map yv1.map | |
210 | -Map yv2.map | 243 | -Map yv2.map | |
211 | -Map yv3.map | 244 | -Map yv3.map | |
212 | -Map yvo.map | 245 | -Map yvo.map | |
213 | -Map yvt.map | 246 | -Map yvt.map | |
214 | -Map arevvn.map | 247 | -Map arevvn.map | |
@@ -218,15 +251,18 @@ $NetBSD: patch-texmf-dist_web2c_updmap.c | @@ -218,15 +251,18 @@ $NetBSD: patch-texmf-dist_web2c_updmap.c | |||
218 | -Map grotesqvn.map | 251 | -Map grotesqvn.map | |
219 | -Map txttvn.map | 252 | -Map txttvn.map | |
220 | -Map urwvn.map | 253 | -Map urwvn.map | |
221 | -MixedMap vnrother.map | 254 | -MixedMap vnrother.map | |
222 | -MixedMap vnrtext.map | 255 | -MixedMap vnrtext.map | |
223 | -Map vntopia.map | 256 | -Map vntopia.map | |
224 | -Map dgj.map | 257 | -Map dgj.map | |
225 | -Map dmj.map | 258 | -Map dmj.map | |
226 | -Map mc2j.map | 259 | -Map mc2j.map | |
227 | -Map mcj.map | 260 | -Map mcj.map | |
228 | -Map mr2j.map | 261 | -Map mr2j.map | |
229 | -Map mrj.map | 262 | -Map mrj.map | |
230 | -MixedMap wasy.map | 263 | -MixedMap wasy.map | |
264 | -Map XCharter.map | |||
231 | -MixedMap xypic.map | 265 | -MixedMap xypic.map | |
232 | -MixedMap yhmath.map | 266 | -MixedMap yhmath.map | |
267 | -Map uzc.map | |||
268 | -Map uzd.map |