Sat Apr 11 19:16:34 2009 UTC ()
Simplify TEXMFDOCDIR and TEXMDOCS to make them friendly with texdoc.
Changes from TeX Live svn.

Bump PKGREVISION.


(minskim)
diff -r1.4 -r1.5 pkgsrc/print/kpathsea/Makefile
diff -r1.3 -r1.4 pkgsrc/print/kpathsea/distinfo
diff -r1.3 -r1.4 pkgsrc/print/kpathsea/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/print/kpathsea/Makefile (expand / switch to unified diff)

--- pkgsrc/print/kpathsea/Makefile 2009/02/08 20:00:03 1.4
+++ pkgsrc/print/kpathsea/Makefile 2009/04/11 19:16:33 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.4 2009/02/08 20:00:03 minskim Exp $ 1# $NetBSD: Makefile,v 1.5 2009/04/11 19:16:33 minskim Exp $
2 2
3DISTNAME= texlive-20080816-source 3DISTNAME= texlive-20080816-source
4PKGNAME= kpathsea-3.5.7 4PKGNAME= kpathsea-3.5.7
5PKGREVISION= 3 5PKGREVISION= 4
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/} 7MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
8EXTRACT_SUFX= .tar.lzma 8EXTRACT_SUFX= .tar.lzma
9 9
10MAINTAINER= minskim@NetBSD.org 10MAINTAINER= minskim@NetBSD.org
11HOMEPAGE= http://www.tug.org/kpathsea/ 11HOMEPAGE= http://www.tug.org/kpathsea/
12COMMENT= Path searching library for TeX-related files 12COMMENT= Path searching library for TeX-related files
13 13
14CONFLICTS+= teTeX-bin<=3.0nb21 14CONFLICTS+= teTeX-bin<=3.0nb21
15CONFLICTS+= teTeX-texmf<=3.0nb5 15CONFLICTS+= teTeX-texmf<=3.0nb5
16 16
17EXTRACT_ELEMENTS= ${DISTNAME}/texk/kpathsea \ 17EXTRACT_ELEMENTS= ${DISTNAME}/texk/kpathsea \
18 ${DISTNAME}/texk/make \ 18 ${DISTNAME}/texk/make \
cvs diff -r1.3 -r1.4 pkgsrc/print/kpathsea/distinfo (expand / switch to unified diff)

--- pkgsrc/print/kpathsea/distinfo 2009/02/08 20:00:03 1.3
+++ pkgsrc/print/kpathsea/distinfo 2009/04/11 19:16:33 1.4
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.3 2009/02/08 20:00:03 minskim Exp $ 1$NetBSD: distinfo,v 1.4 2009/04/11 19:16:33 minskim Exp $
2 2
3SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d 3SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
4RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38 4RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
5Size (texlive-20080816-source.tar.lzma) = 23175835 bytes 5Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
6SHA1 (patch-aa) = 5328fec41c939fdfe0f59d05531be6c2c163d786 6SHA1 (patch-aa) = 87f14f7f2fbdfeff1150290ba1faa971c9137caf
cvs diff -r1.3 -r1.4 pkgsrc/print/kpathsea/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/kpathsea/patches/patch-aa 2009/02/08 20:00:03 1.3
+++ pkgsrc/print/kpathsea/patches/patch-aa 2009/04/11 19:16:34 1.4
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.3 2009/02/08 20:00:03 minskim Exp $ 1$NetBSD: patch-aa,v 1.4 2009/04/11 19:16:34 minskim Exp $
2 2
3- Set paths to texmf trees for pkgsrc. 3- Set paths to texmf trees for pkgsrc.
4- Sync with TeX Live Revision 12107. 4- Sync with TeX Live Revision 12509.
5 5
6--- texmf.cnf.orig 2008-07-26 14:39:36.000000000 -0700 6--- texmf.cnf.orig 2008-07-26 14:39:36.000000000 -0700
7+++ texmf.cnf 7+++ texmf.cnf
8@@ -44,18 +44,18 @@ 8@@ -44,18 +44,18 @@
9  9
10 % The tree containing the runtime files closely related to the specific 10 % The tree containing the runtime files closely related to the specific
11 % program version used: 11 % program version used:
12-TEXMFMAIN = $SELFAUTOPARENT/texmf 12-TEXMFMAIN = $SELFAUTOPARENT/texmf
13+TEXMFMAIN = $SELFAUTODIR/share/texmf 13+TEXMFMAIN = $SELFAUTODIR/share/texmf
14  14
15 % The main distribution tree: 15 % The main distribution tree:
16-TEXMFDIST = $SELFAUTOPARENT/texmf-dist 16-TEXMFDIST = $SELFAUTOPARENT/texmf-dist
17+TEXMFDIST = $SELFAUTODIR/share/texmf-dist 17+TEXMFDIST = $SELFAUTODIR/share/texmf-dist
@@ -173,56 +173,74 @@ $NetBSD: patch-aa,v 1.3 2009/02/08 20:00 @@ -173,56 +173,74 @@ $NetBSD: patch-aa,v 1.3 2009/02/08 20:00
173-TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// 173-TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}//
174 TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}// 174 TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}//
175 TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}// 175 TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}//
176-TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// 176-TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
177-TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// 177-TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}//
178  178
179+% Earlier entries override later ones, so put this generic one last. 179+% Earlier entries override later ones, so put this generic one last.
180+TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// 180+TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
181+ 181+
182+% ttf2tfm. 182+% ttf2tfm.
183 TTF2TFMINPUTS = .;$TEXMF/ttf2pk// 183 TTF2TFMINPUTS = .;$TEXMF/ttf2pk//
184  184
185 % Metafont, MetaPost inputs. 185 % Metafont, MetaPost inputs.
186@@ -447,7 +450,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna 186@@ -384,14 +387,11 @@ FONTCONFIG_FILE=fonts.conf
 187 FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
 188 FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
 189
 190-% TeX documentation and source files, for use with kpsewhich.
 191+% TeX documentation and source files, for use with kpsewhich (and texdoc).
 192 % TeX Live has a separate hierarchy with just documentation, texmf-doc,
 193 % in addition to the doc files in the other hierarchies.
 194-% Also, find the English documentation first -- better than random, when
 195-% there are name collisions.
 196-% Also, find things from man pages first, same reason.
 197-TEXMFDOCDIR = $TEXMFDOC/doc{/english,}
 198-TEXDOCS = .;$TEXMF/doc{/man,}//;$TEXMFDOCDIR//
 199+TEXMFDOCDIR = $TEXMFDOC/doc
 200+TEXDOCS = .;$TEXMF/doc//;$TEXMFDOCDIR//
 201 TEXSOURCES = .;$TEXMF/source//
 202
 203 % Web and CWeb input paths.
 204@@ -447,7 +447,7 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
187 %  205 %
188 % For security reasons, it is better not to include . in this path. 206 % For security reasons, it is better not to include . in this path.
189 % 207 %
190-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} 208-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
191+TEXMFCNF = @PKG_SYSCONFDIR@ 209+TEXMFCNF = @PKG_SYSCONFDIR@
192  210
193 # kpathsea 3.5.3 and later sets these at runtime. To avoid empty 211 # kpathsea 3.5.3 and later sets these at runtime. To avoid empty
194 # expansions from binaries linked against an earlier version of the 212 # expansions from binaries linked against an earlier version of the
195@@ -458,11 +461,10 @@ engine = unsetengine 213@@ -458,11 +458,10 @@ engine = unsetengine
196  214
197 % Part 2: Options. 215 % Part 2: Options.
198  216
199-% If this is true, `tex a.b' will look first for a.b.tex (within each 217-% If this is true, `tex a.b' will look first for a.b.tex (within each
200-% path element), and then for a.b, i.e., we try standard extensions 218-% path element), and then for a.b, i.e., we try standard extensions
201-% first. If this is false, we first look for a.b and then a.b.tex, 219-% first. If this is false, we first look for a.b and then a.b.tex,
202-% first. If this is false, we first look for a.b and then a.b.tex, 220-% first. If this is false, we first look for a.b and then a.b.tex,
203-% i.e., we try the name as-is first. 221-% i.e., we try the name as-is first.
204+% If this option is set to true, `tex a.b' will look first for a.b.tex 222+% If this option is set to true, `tex a.b' will look first for a.b.tex
205+% (within each path element), and then for a.b, i.e., we try standard 223+% (within each path element), and then for a.b, i.e., we try standard
206+% extensions first. If this is false, we first look for a.b and then 224+% extensions first. If this is false, we first look for a.b and then
207+% a.b.tex, i.e., we try the name as-is first. 225+% a.b.tex, i.e., we try the name as-is first.
208 % 226 %
209 % Both names are always tried; the difference is the order in which they 227 % Both names are always tried; the difference is the order in which they
210 % are tried. The setting applies to all searches, not just .tex. 228 % are tried. The setting applies to all searches, not just .tex.
211@@ -472,7 +474,7 @@ engine = unsetengine 229@@ -472,7 +471,7 @@ engine = unsetengine
212 % always have an extension added first. 230 % always have an extension added first.
213 % 231 %
214 % The default is true, because we already avoid adding the standard 232 % The default is true, because we already avoid adding the standard
215-% extension(s) in most common cases. E.g., babel.sty will only look for 233-% extension(s) in most common cases. E.g., babel.sty will only look for
216+% extension(s) in the usual cases. E.g., babel.sty will only look for 234+% extension(s) in the usual cases. E.g., babel.sty will only look for
217 % babel.sty, not babel.sty.tex, regardless of this setting. 235 % babel.sty, not babel.sty.tex, regardless of this setting.
218 try_std_extension_first = t 236 try_std_extension_first = t
219  237
220@@ -612,7 +614,7 @@ buf_size = 200000 238@@ -612,7 +611,7 @@ buf_size = 200000
221 % for all known free hyphenation patterns to be loaded simultaneously 239 % for all known free hyphenation patterns to be loaded simultaneously
222 % (as TeX Live does). 240 % (as TeX Live does).
223 % 241 %
224-trie_size = 600000 242-trie_size = 600000
225+trie_size = 700000 243+trie_size = 700000
226  244
227 hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. 245 hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767.
228 % http://primes.utm.edu/curios/page.php/8191.html 246 % http://primes.utm.edu/curios/page.php/8191.html