Fri Jan 9 22:13:13 2015 UTC ()
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.


(minskim)
diff -r1.19 -r1.20 pkgsrc/print/kpathsea/Makefile
diff -r1.8 -r1.9 pkgsrc/print/kpathsea/PLIST
diff -r1.14 -r1.15 pkgsrc/print/kpathsea/distinfo
diff -r1.11 -r1.12 pkgsrc/print/kpathsea/patches/patch-aa

cvs diff -r1.19 -r1.20 pkgsrc/print/kpathsea/Makefile (expand / switch to unified diff)

--- pkgsrc/print/kpathsea/Makefile 2013/11/17 16:45:32 1.19
+++ pkgsrc/print/kpathsea/Makefile 2015/01/09 22:13:13 1.20
@@ -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
3DISTNAME= texlive-20130530-source 3DISTNAME= texlive-20140525-source
4PKGNAME= kpathsea-6.1.1 4PKGNAME= kpathsea-6.2.0
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= ftp://tug.org/historic/systems/texlive/2013/ 6MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= minskim@NetBSD.org 9MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= http://www.tug.org/kpathsea/ 10HOMEPAGE= http://www.tug.org/kpathsea/
11COMMENT= Path searching library for TeX-related files 11COMMENT= Path searching library for TeX-related files
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14CONFLICTS+= teTeX-bin<=3.0nb46 14CONFLICTS+= teTeX-bin<=3.0nb46
15CONFLICTS+= teTeX-texmf<=3.0nb5 15CONFLICTS+= teTeX-texmf<=3.0nb5
16CONFLICTS+= texlive-tetex<2010 16CONFLICTS+= texlive-tetex<2010
17 17
18EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \ 18EXTRACT_ELEMENTS= ${DISTNAME}/build-aux \
19 ${DISTNAME}/texk/kpathsea 19 ${DISTNAME}/texk/kpathsea

cvs diff -r1.8 -r1.9 pkgsrc/print/kpathsea/PLIST (expand / switch to unified diff)

--- pkgsrc/print/kpathsea/PLIST 2013/11/17 16:45:32 1.8
+++ pkgsrc/print/kpathsea/PLIST 2015/01/09 22:13:13 1.9
@@ -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 $
2bin/kpseaccess 2bin/kpseaccess
3bin/kpsereadlink 3bin/kpsereadlink
4bin/kpsestat 4bin/kpsestat
5bin/kpsewhich 5bin/kpsewhich
6bin/mktexlsr 6bin/mktexlsr
7bin/mktexmf 7bin/mktexmf
8bin/mktexpk 8bin/mktexpk
9bin/mktextfm 9bin/mktextfm
10bin/texhash 10bin/texhash
11include/kpathsea/absolute.h 11include/kpathsea/absolute.h
12include/kpathsea/c-auto.h 12include/kpathsea/c-auto.h
13include/kpathsea/c-ctype.h 13include/kpathsea/c-ctype.h
14include/kpathsea/c-dir.h 14include/kpathsea/c-dir.h
@@ -32,26 +32,27 @@ include/kpathsea/expand.h @@ -32,26 +32,27 @@ include/kpathsea/expand.h
32include/kpathsea/getopt.h 32include/kpathsea/getopt.h
33include/kpathsea/hash.h 33include/kpathsea/hash.h
34include/kpathsea/knj.h 34include/kpathsea/knj.h
35include/kpathsea/kpathsea.h 35include/kpathsea/kpathsea.h
36include/kpathsea/lib.h 36include/kpathsea/lib.h
37include/kpathsea/line.h 37include/kpathsea/line.h
38include/kpathsea/magstep.h 38include/kpathsea/magstep.h
39include/kpathsea/mingw32.h 39include/kpathsea/mingw32.h
40include/kpathsea/paths.h 40include/kpathsea/paths.h
41include/kpathsea/pathsearch.h 41include/kpathsea/pathsearch.h
42include/kpathsea/proginit.h 42include/kpathsea/proginit.h
43include/kpathsea/progname.h 43include/kpathsea/progname.h
44include/kpathsea/readable.h 44include/kpathsea/readable.h
 45include/kpathsea/simpletypes.h
45include/kpathsea/str-list.h 46include/kpathsea/str-list.h
46include/kpathsea/str-llist.h 47include/kpathsea/str-llist.h
47include/kpathsea/systypes.h 48include/kpathsea/systypes.h
48include/kpathsea/tex-file.h 49include/kpathsea/tex-file.h
49include/kpathsea/tex-glyph.h 50include/kpathsea/tex-glyph.h
50include/kpathsea/tex-hush.h 51include/kpathsea/tex-hush.h
51include/kpathsea/tex-make.h 52include/kpathsea/tex-make.h
52include/kpathsea/types.h 53include/kpathsea/types.h
53include/kpathsea/variable.h 54include/kpathsea/variable.h
54include/kpathsea/version.h 55include/kpathsea/version.h
55include/kpathsea/win32lib.h 56include/kpathsea/win32lib.h
56info/kpathsea.info 57info/kpathsea.info
57lib/libkpathsea.la 58lib/libkpathsea.la

cvs diff -r1.14 -r1.15 pkgsrc/print/kpathsea/distinfo (expand / switch to unified diff)

--- pkgsrc/print/kpathsea/distinfo 2013/11/17 16:45:32 1.14
+++ pkgsrc/print/kpathsea/distinfo 2015/01/09 22:13:13 1.15
@@ -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
3SHA1 (texlive-20130530-source.tar.xz) = 42f0a6fa3f49435991182f14e01276b2ee3fce61 3SHA1 (texlive-20140525-source.tar.xz) = 8cb283ad26b1fe18e1089820cf64ecc63d8224e8
4RMD160 (texlive-20130530-source.tar.xz) = 2d779ae5de979be86a9258b224dfc15cbcd76b18 4RMD160 (texlive-20140525-source.tar.xz) = c9fb954e63e700d06aa0cf40c37cdb40eaac84a2
5Size (texlive-20130530-source.tar.xz) = 179963948 bytes 5Size (texlive-20140525-source.tar.xz) = 41657688 bytes
6SHA1 (patch-aa) = 3f26a00fd7057e42b7e0ef76095f3b30106f67a6 6SHA1 (patch-aa) = b585b9c0755bcac61465d0370540f98312ac06ea
7SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0 7SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0
8SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40 8SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40
9SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf 9SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf
10SHA1 (patch-af) = 390783ba6ad88208df1b7be0bf9e52e2ceb81c13 10SHA1 (patch-af) = 390783ba6ad88208df1b7be0bf9e52e2ceb81c13
11SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe 11SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe
12SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e 12SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e
13SHA1 (patch-ai) = ceef76e53a9146161be23bb22287b4f768d3cb3c 13SHA1 (patch-ai) = ceef76e53a9146161be23bb22287b4f768d3cb3c
14SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4 14SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4
15SHA1 (patch-ak) = 2cee0c54ee5d2f02c08a6d19d8bfb7aa6316b69c 15SHA1 (patch-ak) = 2cee0c54ee5d2f02c08a6d19d8bfb7aa6316b69c
16SHA1 (patch-xputenv.c) = 75edfd8abdf2f0373a084095cfdd37865e628590 16SHA1 (patch-xputenv.c) = 75edfd8abdf2f0373a084095cfdd37865e628590

cvs diff -r1.11 -r1.12 pkgsrc/print/kpathsea/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/kpathsea/patches/patch-aa 2013/11/17 16:45:32 1.11
+++ pkgsrc/print/kpathsea/patches/patch-aa 2015/01/09 22:13:13 1.12
@@ -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
3Set paths to texmf trees for pkgsrc. 3Set 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}