Update kpathsea to 6.0.1. Changes: * Trailing comments and whitespace omitted from config values. * Add .tlu to type lua suffixes, and .dfont to truetype suffixes. * Prefix program_invocation{,_short}_name with kpse_. * Finally remove kpse_set_progname (deprecated since 1998).diff -r1.13 -r1.14 pkgsrc/print/kpathsea/Makefile
(minskim)
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.13 2011/03/14 21:29:20 minskim Exp $ | 1 | # $NetBSD: Makefile,v 1.14 2011/07/28 04:25:05 minskim Exp $ | |
2 | 2 | |||
3 | DISTNAME= texlive-20100720-source | 3 | DISTNAME= texlive-20110705-source | |
4 | PKGNAME= kpathsea-6.0.0 | 4 | PKGNAME= kpathsea-6.0.1 | |
5 | PKGREVISION= 2 | |||
6 | CATEGORIES= print | 5 | CATEGORIES= print | |
7 | MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/} | 6 | MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/} | |
8 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
9 | 8 | |||
10 | MAINTAINER= minskim@NetBSD.org | 9 | MAINTAINER= minskim@NetBSD.org | |
11 | HOMEPAGE= http://www.tug.org/kpathsea/ | 10 | HOMEPAGE= http://www.tug.org/kpathsea/ | |
12 | COMMENT= Path searching library for TeX-related files | 11 | COMMENT= Path searching library for TeX-related files | |
13 | LICENSE= gnu-lgpl-v2.1 | 12 | LICENSE= gnu-lgpl-v2.1 | |
14 | 13 | |||
15 | CONFLICTS+= teTeX-bin<=3.0nb46 | 14 | CONFLICTS+= teTeX-bin<=3.0nb46 | |
16 | CONFLICTS+= teTeX-texmf<=3.0nb5 | 15 | CONFLICTS+= teTeX-texmf<=3.0nb5 | |
17 | CONFLICTS+= texlive-tetex<2010 | 16 | CONFLICTS+= texlive-tetex<2010 | |
18 | 17 |
@@ -1,16 +1,17 @@ | @@ -1,16 +1,17 @@ | |||
1 | $NetBSD: distinfo,v 1.9 2010/11/17 19:27:05 minskim Exp $ | 1 | $NetBSD: distinfo,v 1.10 2011/07/28 04:25:05 minskim Exp $ | |
2 | 2 | |||
3 | SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34 | 3 | SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4 | |
4 | RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5 | 4 | RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b | |
5 | Size (texlive-20100720-source.tar.xz) = 33484212 bytes | 5 | Size (texlive-20110705-source.tar.xz) = 131207904 bytes | |
6 | SHA1 (patch-aa) = 80bf6767822ef0f5cc11d5fc028303351ce6d056 | 6 | SHA1 (patch-aa) = 3addf4dd36c92722fb89e62ebda54c1d26933439 | |
7 | SHA1 (patch-ab) = 241176f612485a800ec94974ab00419c92043243 | 7 | SHA1 (patch-ab) = 241176f612485a800ec94974ab00419c92043243 | |
8 | SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0 | 8 | SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0 | |
9 | SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40 | 9 | SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40 | |
10 | SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf | 10 | SHA1 (patch-ae) = b85fd269d86bbc878bc4622f1cdbbdebb5c320bf | |
11 | SHA1 (patch-af) = 390783ba6ad88208df1b7be0bf9e52e2ceb81c13 | 11 | SHA1 (patch-af) = 390783ba6ad88208df1b7be0bf9e52e2ceb81c13 | |
12 | SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe | 12 | SHA1 (patch-ag) = 0590a33b0f557d9f6fbf13fdf59469c9345445fe | |
13 | SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e | 13 | SHA1 (patch-ah) = 15a0026ed21d732504d50af9597e53197aca038e | |
14 | SHA1 (patch-ai) = 28042f47978fe7df907a5e0d3600ac2e1bd17022 | 14 | SHA1 (patch-ai) = 28042f47978fe7df907a5e0d3600ac2e1bd17022 | |
15 | SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4 | 15 | SHA1 (patch-aj) = 97235f77188a1923d87d6992defb4c0cc2e050f4 | |
16 | SHA1 (patch-ak) = 32f05795006fccba782ec02313159966daa0577a | 16 | SHA1 (patch-ak) = 2cee0c54ee5d2f02c08a6d19d8bfb7aa6316b69c | |
17 | SHA1 (patch-cnf-to-paths.awk) = 8bd54171d039750c9c1f9293019db8dc1cf90d6d |
@@ -1,75 +1,50 @@ | @@ -1,75 +1,50 @@ | |||
1 | $NetBSD: patch-aa,v 1.7 2010/11/17 19:27:05 minskim Exp $ | 1 | $NetBSD: patch-aa,v 1.8 2011/07/28 04:25:06 minskim Exp $ | |
2 | 2 | |||
3 | - Set paths to texmf trees for pkgsrc. | 3 | Set paths to texmf trees for pkgsrc. | |
4 | - Sync with kpathsea r19875. | |||
5 | 4 | |||
6 | --- texmf.cnf.orig 2010-05-30 21:52:39.000000000 +0000 | 5 | --- texmf.cnf.orig 2011-06-18 22:10:46.000000000 +0000 | |
7 | +++ texmf.cnf | 6 | +++ texmf.cnf | |
8 | @@ -53,15 +53,15 @@ | 7 | @@ -49,7 +49,7 @@ | |
8 | % (http://tug.org/tds), or files may not be found. | |||
9 | % | |||
10 | % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share. | |||
11 | -TEXMFROOT = $SELFAUTOPARENT | |||
12 | +TEXMFROOT = $SELFAUTODIR/share | |||
13 | ||||
14 | % The tree containing runtime files related to the specific | |||
15 | % distribution and version. | |||
16 | @@ -59,13 +59,13 @@ TEXMFMAIN = $TEXMFROOT/texmf | |||
17 | TEXMFDIST = $TEXMFROOT/texmf-dist | |||
9 | 18 | |||
10 | % The tree containing the runtime files closely related to the specific | 19 | % Local additions to the distribution trees. | |
11 | % program version used: | 20 | -TEXMFLOCAL = $TEXMFROOT/../texmf-local | |
12 | -TEXMFMAIN = $SELFAUTOPARENT/texmf | |||
13 | +TEXMFMAIN = @PREFIX@/share/texmf | |||
14 | ||||
15 | % The main distribution tree: | |||
16 | -TEXMFDIST = $SELFAUTOPARENT/texmf-dist | |||
17 | +TEXMFDIST = @PREFIX@/share/texmf-dist | |||
18 | ||||
19 | % A place for local additions to a "standard" texmf tree. | |||
20 | % This tree is not used for local configuration maintained by | |||
21 | % texconfig, it uses TEXMFCONFIG below. | |||
22 | -TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local | |||
23 | +TEXMFLOCAL = @TEXMFLOCAL@ | 21 | +TEXMFLOCAL = @TEXMFLOCAL@ | |
24 | 22 | |||
25 | % TEXMFSYSVAR, where texconfig-sys stores variable runtime data. | 23 | % TEXMFSYSVAR, where *-sys store cached runtime data. | |
26 | % With teTeX-3.0 or later, this must be set. | 24 | -TEXMFSYSVAR = $TEXMFROOT/texmf-var | |
27 | @@ -69,7 +69,7 @@ TEXMFLOCAL = $SELFAUTOPARENT/../texmf-lo | |||
28 | % TEXMFSYSVAR = $TEXMFMAIN | |||
29 | % For using a separate tree: | |||
30 | % TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var | |||
31 | -TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var | |||
32 | +TEXMFSYSVAR = @VARBASE@/lib/texmf | 25 | +TEXMFSYSVAR = @VARBASE@/lib/texmf | |
33 | 26 | |||
34 | % TEXMFSYSCONFIG, where texconfig-sys stores configuration data. | 27 | % TEXMFSYSCONFIG, where *-sys store configuration data. | |
35 | % With teTeX-3.0 or later, this must be set. | 28 | -TEXMFSYSCONFIG = $TEXMFROOT/texmf-config | |
36 | @@ -77,7 +77,7 @@ TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var | |||
37 | % TEXMFSYSCONFIG = $TEXMFMAIN | |||
38 | % For using a separate tree: | |||
39 | % TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config | |||
40 | -TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config | |||
41 | +TEXMFSYSCONFIG = @PKG_SYSCONFDIR@ | 29 | +TEXMFSYSCONFIG = @PKG_SYSCONFDIR@ | |
42 | 30 | |||
43 | % User texmf trees are allowed as follows. | 31 | % Per-user texmf tree(s) -- organized per the TDS, as usual. To define | |
44 | % This used to be HOMETEXMF. | 32 | % more than one per-user tree, set this to a list of directories in | |
45 | @@ -136,7 +136,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM | 33 | @@ -111,7 +111,7 @@ SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXM | |
46 | % 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 | |
47 | % 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 | |
48 | % varfonts feature was enabled in MT_FEATURES in mktex.cnf. | 36 | % varfonts feature was enabled in MT_FEATURES in mktex.cnf. | |
49 | -VARTEXFONTS = $TEXMFVAR/fonts | 37 | -VARTEXFONTS = $TEXMFVAR/fonts | |
50 | +VARTEXFONTS = $TEXMFSYSVAR/fonts | 38 | +VARTEXFONTS = $TEXMFSYSVAR/fonts | |
51 | 39 | |||
52 | % 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 | |
53 | % 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 | |
54 | @@ -345,10 +345,10 @@ T1FONTS = .;$TEXMF/fonts/type1//;$OSFONT | 42 | @@ -442,7 +442,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna | |
55 | AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR// | |||
56 | ||||
57 | % TrueType outline fonts. | |||
58 | -TTFONTS = .;$TEXMF/fonts/truetype//;$OSFONTDIR// | |||
59 | +TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR// | |||
60 | ||||
61 | % Opentype outline fonts. | |||
62 | -OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR// | |||
63 | +OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR// | |||
64 | ||||
65 | % Type 42 outline fonts. | |||
66 | T42FONTS = .;$TEXMF/fonts/type42// | |||
67 | @@ -463,7 +463,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna | |||
68 | % | 43 | % | |
69 | % For security reasons, it is better not to include . in this path. | 44 | % For security reasons, it is better not to include . in this path. | |
70 | % | 45 | % | |
71 | -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} | 46 | -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} | |
72 | +TEXMFCNF = @PKG_SYSCONFDIR@ | 47 | +TEXMFCNF = @PKG_SYSCONFDIR@ | |
73 | 48 | |||
74 | % kpathsea 3.5.3 and later sets these at runtime. To avoid empty | 49 | % kpathsea 3.5.3 and later sets these at runtime. To avoid empty | |
75 | % expansions from binaries linked against an earlier version of the | 50 | % expansions from binaries linked against an earlier version of the |
@@ -1,22 +1,22 @@ | @@ -1,22 +1,22 @@ | |||
1 | $NetBSD: patch-ak,v 1.1 2009/09/20 18:50:03 minskim Exp $ | 1 | $NetBSD: patch-ak,v 1.2 2011/07/28 04:25:06 minskim Exp $ | |
2 | 2 | |||
3 | --- mktexlsr.orig 2009-06-03 06:07:21.000000000 -0700 | 3 | --- mktexlsr.orig 2011-06-27 22:27:02.000000000 +0000 | |
4 | +++ mktexlsr | 4 | +++ mktexlsr | |
5 | @@ -70,7 +70,7 @@ while test $# -gt 0; do | 5 | @@ -78,7 +78,7 @@ while test $# -gt 0; do | |
6 | exit 0 | 6 | exit 0 | |
7 | elif test "x$1" = x--version || test "x$1" = x-version; then | 7 | elif test "x$1" = x--version || test "x$1" = x-version; then | |
8 | echo "`basename $0` $version" | 8 | echo "`basename $0` $version" | |
9 | - kpsewhich --version | 9 | - kpsewhich --version | |
10 | + @KPSEWHICH@ --version | 10 | + @KPSEWHICH@ --version | |
11 | exit 0 | 11 | exit 0 | |
12 | elif test "x$1" = x--verbose || test "x$1" = x-verbose; then | 12 | elif test "x$1" = x--verbose || test "x$1" = x-verbose; then | |
13 | verbose=true | 13 | verbose=true | |
14 | @@ -107,7 +107,7 @@ trap 'cd /; test -z "$db_dir_tmp" || rm | 14 | @@ -127,7 +127,7 @@ old_ls_R_magic='% ls-R -- maintained by | |
15 | OIFS=$IFS # want just a newline | 15 | if test -s "$treefile"; then | |
16 | IFS=' | 16 | set x `sort "$treefile" | uniq` | |
17 | ' | 17 | else | |
18 | - set x `kpsewhich --show-path=ls-R | tr : ' | 18 | - set x `kpsewhich --show-path=ls-R | tr : ' | |
19 | + set x `@KPSEWHICH@ --show-path=ls-R | tr : ' | 19 | + set x `@KPSEWHICH@ --show-path=ls-R | tr : ' | |
20 | ' | sort | uniq` | 20 | ' | sort | uniq` | |
21 | IFS=$OIFS | |||
22 | fi | 21 | fi | |
22 | IFS=$saveIFS |
$NetBSD: patch-cnf-to-paths.awk,v 1.1 2011/07/28 04:25:06 minskim Exp $
--- cnf-to-paths.awk.orig 2011-05-23 17:48:36.000000000 +0000
+++ cnf-to-paths.awk
@@ -10,19 +10,6 @@
# (whitespace around the = is optional)
#
/^[ \t]*[A-Z0-9_]+[ \t]*=/ {
- # On these lines, there are two cases:
- #
- # 1) definitions referring to SELFAUTO*, which we want to keep. In
- # particular, this is how the compile-time TEXMFCNF gets defined and
- # thus how texmf.cnf gets found.
- #
- # 2) all the others, which we want to convert to a constant
- # /nonesuch. That way, the binaries don't get change just because we
- # change definitions in texmf.cnf.
- #
- # The definition of DEFAULT_TEXMF (and other variables)
- # that winds up in the final paths.h will not be used.
-
# Let's extract the identifier and the value from the line. Since
# gawk's subexpression matching is an extension, do it with copies.
ident = $0;
@@ -34,13 +21,7 @@
sub(/[ \t]*$/, "", val);
#print "got ident", ident, "and val", val >"/dev/stderr";
- if (val ~ /\$SELFAUTO/) {
- # Replace all semicolons with colons in the SELFAUTO paths we're keeping.
- # (The path-splitting code should be changed to understand both.)
- gsub(/;/, ":", val);
- } else {
- val = "/nonesuch";
- }
+ gsub(/;/, ":", val);
print "#ifndef DEFAULT_" ident;
print "#define DEFAULT_" ident " \"" val "\"";