Update kpathsea to 6.2.0 Changes: * mktexlsr outputs normal msgs to stdout instead of stderr. * do not ignore a non-terminated last line of a file. * new texmf.cnf variables SELFAUTOGRANDPARENT, guess_input_kanji_encoding.diff -r1.19 -r1.20 pkgsrc/print/kpathsea/Makefile
(minskim)
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.19 2013/11/17 16:45:32 minskim Exp $ | 1 | # $NetBSD: Makefile,v 1.20 2015/01/09 22:13:13 minskim Exp $ | |
2 | 2 | |||
3 | DISTNAME= texlive-20130530-source | 3 | DISTNAME= texlive-20140525-source | |
4 | PKGNAME= kpathsea-6.1.1 | 4 | PKGNAME= kpathsea-6.2.0 | |
5 | CATEGORIES= print | 5 | CATEGORIES= print | |
6 | MASTER_SITES= ftp://tug.org/historic/systems/texlive/2013/ | 6 | MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/ | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | 8 | |||
9 | MAINTAINER= minskim@NetBSD.org | 9 | MAINTAINER= minskim@NetBSD.org | |
10 | HOMEPAGE= http://www.tug.org/kpathsea/ | 10 | HOMEPAGE= http://www.tug.org/kpathsea/ | |
11 | COMMENT= Path searching library for TeX-related files | 11 | COMMENT= Path searching library for TeX-related files | |
12 | LICENSE= gnu-lgpl-v2.1 | 12 | LICENSE= gnu-lgpl-v2.1 | |
13 | 13 | |||
14 | CONFLICTS+= teTeX-bin<=3.0nb46 | 14 | CONFLICTS+= teTeX-bin<=3.0nb46 | |
15 | CONFLICTS+= teTeX-texmf<=3.0nb5 | 15 | CONFLICTS+= teTeX-texmf<=3.0nb5 | |
16 | CONFLICTS+= texlive-tetex<2010 | 16 | CONFLICTS+= texlive-tetex<2010 | |
17 | 17 | |||
18 | EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ | 18 | EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ | |
19 | ${DISTNAME}/texk/kpathsea | 19 | ${DISTNAME}/texk/kpathsea |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.8 2013/11/17 16:45:32 minskim Exp $ | 1 | @comment $NetBSD: PLIST,v 1.9 2015/01/09 22:13:13 minskim Exp $ | |
2 | bin/kpseaccess | 2 | bin/kpseaccess | |
3 | bin/kpsereadlink | 3 | bin/kpsereadlink | |
4 | bin/kpsestat | 4 | bin/kpsestat | |
5 | bin/kpsewhich | 5 | bin/kpsewhich | |
6 | bin/mktexlsr | 6 | bin/mktexlsr | |
7 | bin/mktexmf | 7 | bin/mktexmf | |
8 | bin/mktexpk | 8 | bin/mktexpk | |
9 | bin/mktextfm | 9 | bin/mktextfm | |
10 | bin/texhash | 10 | bin/texhash | |
11 | include/kpathsea/absolute.h | 11 | include/kpathsea/absolute.h | |
12 | include/kpathsea/c-auto.h | 12 | include/kpathsea/c-auto.h | |
13 | include/kpathsea/c-ctype.h | 13 | include/kpathsea/c-ctype.h | |
14 | include/kpathsea/c-dir.h | 14 | include/kpathsea/c-dir.h | |
@@ -32,26 +32,27 @@ include/kpathsea/expand.h | @@ -32,26 +32,27 @@ include/kpathsea/expand.h | |||
32 | include/kpathsea/getopt.h | 32 | include/kpathsea/getopt.h | |
33 | include/kpathsea/hash.h | 33 | include/kpathsea/hash.h | |
34 | include/kpathsea/knj.h | 34 | include/kpathsea/knj.h | |
35 | include/kpathsea/kpathsea.h | 35 | include/kpathsea/kpathsea.h | |
36 | include/kpathsea/lib.h | 36 | include/kpathsea/lib.h | |
37 | include/kpathsea/line.h | 37 | include/kpathsea/line.h | |
38 | include/kpathsea/magstep.h | 38 | include/kpathsea/magstep.h | |
39 | include/kpathsea/mingw32.h | 39 | include/kpathsea/mingw32.h | |
40 | include/kpathsea/paths.h | 40 | include/kpathsea/paths.h | |
41 | include/kpathsea/pathsearch.h | 41 | include/kpathsea/pathsearch.h | |
42 | include/kpathsea/proginit.h | 42 | include/kpathsea/proginit.h | |
43 | include/kpathsea/progname.h | 43 | include/kpathsea/progname.h | |
44 | include/kpathsea/readable.h | 44 | include/kpathsea/readable.h | |
45 | include/kpathsea/simpletypes.h | |||
45 | include/kpathsea/str-list.h | 46 | include/kpathsea/str-list.h | |
46 | include/kpathsea/str-llist.h | 47 | include/kpathsea/str-llist.h | |
47 | include/kpathsea/systypes.h | 48 | include/kpathsea/systypes.h | |
48 | include/kpathsea/tex-file.h | 49 | include/kpathsea/tex-file.h | |
49 | include/kpathsea/tex-glyph.h | 50 | include/kpathsea/tex-glyph.h | |
50 | include/kpathsea/tex-hush.h | 51 | include/kpathsea/tex-hush.h | |
51 | include/kpathsea/tex-make.h | 52 | include/kpathsea/tex-make.h | |
52 | include/kpathsea/types.h | 53 | include/kpathsea/types.h | |
53 | include/kpathsea/variable.h | 54 | include/kpathsea/variable.h | |
54 | include/kpathsea/version.h | 55 | include/kpathsea/version.h | |
55 | include/kpathsea/win32lib.h | 56 | include/kpathsea/win32lib.h | |
56 | info/kpathsea.info | 57 | info/kpathsea.info | |
57 | lib/libkpathsea.la | 58 | lib/libkpathsea.la |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: distinfo,v 1.14 2013/11/17 16:45:32 minskim Exp $ | 1 | $NetBSD: distinfo,v 1.15 2015/01/09 22:13:13 minskim Exp $ | |
2 | 2 | |||
3 | SHA1 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61 | 3 | SHA1 (texlive-20140525-source.tar.xz) = 8cb283ad26b1fe18e1089820cf64ecc63d8224e8 | |
4 | RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18 | 4 | RMD160 (texlive-20140525-source.tar.xz) = c9fb954e63e700d06aa0cf40c37cdb40eaac84a2 | |
5 | Size (texlive-20130530-source.tar.xz) = 179963948 bytes | 5 | Size (texlive-20140525-source.tar.xz) = 41657688 bytes | |
6 | SHA1 (patch-aa) = 3f26a00fd7057e42b7e0ef76095f3b30106f67a6 | 6 | SHA1 (patch-aa) = b585b9c0755bcac61465d0370540f98312ac06ea | |
7 | SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0 | 7 | SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0 | |
8 | SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40 | 8 | SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40 | |
9 | SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf | 9 | SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf | |
10 | SHA1 (patch-af) = 390783ba6ad88208df1b7be0bf9e52e2ceb81c13 | 10 | SHA1 (patch-af) = 390783ba6ad88208df1b7be0bf9e52e2ceb81c13 | |
11 | SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe | 11 | SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe | |
12 | SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e | 12 | SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e | |
13 | SHA1 (patch-ai) = ceef76e53a9146161be23bb22287b4f768d3cb3c | 13 | SHA1 (patch-ai) = ceef76e53a9146161be23bb22287b4f768d3cb3c | |
14 | SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4 | 14 | SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4 | |
15 | SHA1 (patch-ak) = 2cee0c54ee5d2f02c08a6d19d8bfb7aa6316b69c | 15 | SHA1 (patch-ak) = 2cee0c54ee5d2f02c08a6d19d8bfb7aa6316b69c | |
16 | SHA1 (patch-xputenv.c) = 75edfd8abdf2f0373a084095cfdd37865e628590 | 16 | SHA1 (patch-xputenv.c) = 75edfd8abdf2f0373a084095cfdd37865e628590 |
@@ -1,76 +1,76 @@ | @@ -1,76 +1,76 @@ | |||
1 | $NetBSD: patch-aa,v 1.11 2013/11/17 16:45:32 minskim Exp $ | 1 | $NetBSD: patch-aa,v 1.12 2015/01/09 22:13:13 minskim 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 2013-04-15 16:58:08.000000000 +0000 | 5 | --- texmf.cnf.orig 2014-04-22 21:07:54.000000000 +0000 | |
6 | +++ texmf.cnf | 6 | +++ texmf.cnf | |
7 | @@ -51,7 +51,7 @@ | 7 | @@ -51,7 +51,7 @@ | |
8 | % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. | 8 | % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. | |
9 | % Kpathsea sets SELFAUTOLOC (the directory with the binary), | 9 | % Kpathsea sets SELFAUTOLOC (the directory with the binary), | |
10 | % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). | 10 | % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent). | |
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 | @@ -61,13 +61,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 = $TEXMFROOT/../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 | @@ -116,7 +116,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 | @@ -485,33 +485,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna | 42 | @@ -481,33 +481,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,\ | |
56 | -$SELFAUTODIR/share/texmf-local/web2c,\ | 56 | -$SELFAUTODIR/share/texmf-local/web2c,\ | |
57 | -$SELFAUTODIR/share/texmf-dist/web2c,\ | 57 | -$SELFAUTODIR/share/texmf-dist/web2c,\ | |
58 | -$SELFAUTODIR/share/texmf/web2c,\ | 58 | -$SELFAUTODIR/share/texmf/web2c,\ | |
59 | -$SELFAUTODIR/texmf-local/web2c,\ | 59 | -$SELFAUTODIR/texmf-local/web2c,\ | |
60 | -$SELFAUTODIR/texmf-dist/web2c,\ | 60 | -$SELFAUTODIR/texmf-dist/web2c,\ | |
61 | -$SELFAUTODIR/texmf/web2c,\ | 61 | -$SELFAUTODIR/texmf/web2c,\ | |
62 | -\ | 62 | -\ | |
63 | -$SELFAUTOPARENT/../texmf-local/web2c,\ | 63 | -$SELFAUTOGRANDPARENT/texmf-local/web2c,\ | |
64 | -$SELFAUTOPARENT,\ | 64 | -$SELFAUTOPARENT,\ | |
65 | -\ | 65 | -\ | |
66 | -$SELFAUTOPARENT/share/texmf-local/web2c,\ | 66 | -$SELFAUTOPARENT/share/texmf-local/web2c,\ | |
67 | -$SELFAUTOPARENT/share/texmf-dist/web2c,\ | 67 | -$SELFAUTOPARENT/share/texmf-dist/web2c,\ | |
68 | -$SELFAUTOPARENT/share/texmf/web2c,\ | 68 | -$SELFAUTOPARENT/share/texmf/web2c,\ | |
69 | -$SELFAUTOPARENT/texmf-local/web2c,\ | 69 | -$SELFAUTOPARENT/texmf-local/web2c,\ | |
70 | -$SELFAUTOPARENT/texmf-dist/web2c,\ | 70 | -$SELFAUTOPARENT/texmf-dist/web2c,\ | |
71 | -$SELFAUTOPARENT/texmf/web2c\ | 71 | -$SELFAUTOPARENT/texmf/web2c\ | |
72 | -} | 72 | -} | |
73 | +TEXMFCNF = @PKG_SYSCONFDIR@ | 73 | +TEXMFCNF = @PKG_SYSCONFDIR@ | |
74 | % | 74 | % | |
75 | % For reference, here is the old brace-using definition: | 75 | % For reference, here is the old brace-using definition: | |
76 | %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} | 76 | %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} |