| @@ -1,55 +1,55 @@ | | | @@ -1,55 +1,55 @@ |
1 | $NetBSD: patch-aa,v 1.14 2017/06/20 20:50:50 markd Exp $ | | 1 | $NetBSD: patch-aa,v 1.15 2018/05/13 12:36:28 markd Exp $ |
2 | | | 2 | |
3 | Set paths to texmf trees for pkgsrc. | | 3 | Set paths to texmf trees for pkgsrc. |
4 | | | 4 | |
5 | --- texmf.cnf.orig 2014-04-22 21:07:54.000000000 +0000 | | 5 | --- texmf.cnf.orig 2018-03-26 12:23:43.000000000 +0000 |
6 | +++ texmf.cnf | | 6 | +++ texmf.cnf |
7 | @@ -51,7 +51,7 @@ | | 7 | @@ -58,7 +58,7 @@ |
8 | % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. | | 8 | % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and |
9 | % Kpathsea sets SELFAUTOLOC (the directory with the binary), | | 9 | % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive). |
10 | % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). | | 10 | % Sorry for the off-by-one-generation names. |
11 | -TEXMFROOT = $SELFAUTOPARENT | | 11 | -TEXMFROOT = $SELFAUTOPARENT |
12 | +TEXMFROOT = $SELFAUTODIR/share | | 12 | +TEXMFROOT = $SELFAUTODIR/share |
13 | | | 13 | |
14 | % The main tree of distributed packages and programs: | | 14 | % The main tree of distributed packages and programs: |
15 | TEXMFDIST = $TEXMFROOT/texmf-dist | | 15 | TEXMFDIST = $TEXMFROOT/texmf-dist |
16 | @@ -61,13 +61,13 @@ TEXMFDIST = $TEXMFROOT/texmf-dist | | 16 | @@ -68,13 +68,13 @@ TEXMFDIST = $TEXMFROOT/texmf-dist |
17 | TEXMFMAIN = $TEXMFDIST | | 17 | TEXMFMAIN = $TEXMFDIST |
18 | | | 18 | |
19 | % Local additions to the distribution trees. | | 19 | % Local additions to the distribution trees. |
20 | -TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local | | 20 | -TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local |
21 | +TEXMFLOCAL = @TEXMFLOCAL@ | | 21 | +TEXMFLOCAL = @TEXMFLOCAL@ |
22 | | | 22 | |
23 | % TEXMFSYSVAR, where *-sys store cached runtime data. | | 23 | % TEXMFSYSVAR, where *-sys store cached runtime data. |
24 | -TEXMFSYSVAR = $TEXMFROOT/texmf-var | | 24 | -TEXMFSYSVAR = $TEXMFROOT/texmf-var |
25 | +TEXMFSYSVAR = @VARBASE@/lib/texmf | | 25 | +TEXMFSYSVAR = @VARBASE@/lib/texmf |
26 | | | 26 | |
27 | % TEXMFSYSCONFIG, where *-sys store configuration data. | | 27 | % TEXMFSYSCONFIG, where *-sys store configuration data. |
28 | -TEXMFSYSCONFIG = $TEXMFROOT/texmf-config | | 28 | -TEXMFSYSCONFIG = $TEXMFROOT/texmf-config |
29 | +TEXMFSYSCONFIG = @PKG_SYSCONFDIR@ | | 29 | +TEXMFSYSCONFIG = @PKG_SYSCONFDIR@ |
30 | | | 30 | |
31 | % Per-user texmf tree(s) -- organized per the TDS, as usual. To define | | 31 | % Per-user texmf tree(s) -- organized per the TDS, as usual. To define |
32 | % more than one per-user tree, set this to a list of directories in | | 32 | % more than one per-user tree, set this to a list of directories in |
33 | @@ -116,7 +116,7 @@ TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR | | 33 | @@ -132,7 +132,7 @@ TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR |
34 | % Where generated fonts may be written. This tree is used when the sources | | 34 | % Where generated fonts may be written. This tree is used when the sources |
35 | % were found in a system tree and either that tree wasn't writable, or the | | 35 | % were found in a system tree and either that tree wasn't writable, or the |
36 | % varfonts feature was enabled in MT_FEATURES in mktex.cnf. | | 36 | % varfonts feature was enabled in MT_FEATURES in mktex.cnf. |
37 | -VARTEXFONTS = $TEXMFVAR/fonts | | 37 | -VARTEXFONTS = $TEXMFVAR/fonts |
38 | +VARTEXFONTS = $TEXMFSYSVAR/fonts | | 38 | +VARTEXFONTS = $TEXMFSYSVAR/fonts |
39 | | | 39 | |
40 | % On some systems, there will be a system tree which contains all the font | | 40 | % On some systems, there will be a system tree which contains all the font |
41 | % files that may be created as well as the formats. For example | | 41 | % files that may be created as well as the formats. For example |
42 | @@ -481,33 +481,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna | | 42 | @@ -511,33 +511,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna |
43 | % since we don't want to scatter ../'s throughout the value. Hence we | | 43 | % since we don't want to scatter ../'s throughout the value. Hence we |
44 | % explicitly list every directory. Arguably more understandable anyway. | | 44 | % explicitly list every directory. Arguably more understandable anyway. |
45 | % | | 45 | % |
46 | -TEXMFCNF = {\ | | 46 | -TEXMFCNF = {\ |
47 | -$SELFAUTOLOC,\ | | 47 | -$SELFAUTOLOC,\ |
48 | -$SELFAUTOLOC/share/texmf-local/web2c,\ | | 48 | -$SELFAUTOLOC/share/texmf-local/web2c,\ |
49 | -$SELFAUTOLOC/share/texmf-dist/web2c,\ | | 49 | -$SELFAUTOLOC/share/texmf-dist/web2c,\ |
50 | -$SELFAUTOLOC/share/texmf/web2c,\ | | 50 | -$SELFAUTOLOC/share/texmf/web2c,\ |
51 | -$SELFAUTOLOC/texmf-local/web2c,\ | | 51 | -$SELFAUTOLOC/texmf-local/web2c,\ |
52 | -$SELFAUTOLOC/texmf-dist/web2c,\ | | 52 | -$SELFAUTOLOC/texmf-dist/web2c,\ |
53 | -$SELFAUTOLOC/texmf/web2c,\ | | 53 | -$SELFAUTOLOC/texmf/web2c,\ |
54 | -\ | | 54 | -\ |
55 | -$SELFAUTODIR,\ | | 55 | -$SELFAUTODIR,\ |