Sync texmf.cnf with the version in TeX Live r12107.

The new texmf.cnf contains corrections regarding xetex and luatex.
These do not affect print/teTeX3, but are used by print/web2c.

Bump PKGREVISION.

3 files changed, 170 insertions, 7 deletions

diff --git a/print/kpathsea/Makefile b/print/kpathsea/Makefile
index 8cfdb87758c..25772a3c0ec 100644
--- a/print/kpathsea/Makefile
+++ b/print/kpathsea/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/01/29 19:40:09 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2009/02/08 20:00:03 minskim Exp $
 
 DISTNAME=	texlive-20080816-source
 PKGNAME=	kpathsea-3.5.7
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.lzma
diff --git a/print/kpathsea/distinfo b/print/kpathsea/distinfo
index eaa4acb693a..b97acd31dfe 100644
--- a/print/kpathsea/distinfo
+++ b/print/kpathsea/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2009/01/29 19:38:42 minskim Exp $
+$NetBSD: distinfo,v 1.3 2009/02/08 20:00:03 minskim Exp $
 
 SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
 RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
 Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
-SHA1 (patch-aa) = 8cd0d2c68b9e35b63319ff26f896bbab2e4fa31b
+SHA1 (patch-aa) = 5328fec41c939fdfe0f59d05531be6c2c163d786
diff --git a/print/kpathsea/patches/patch-aa b/print/kpathsea/patches/patch-aa
index 348cc8a195a..72754d41fec 100644
--- a/print/kpathsea/patches/patch-aa
+++ b/print/kpathsea/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2009/01/29 19:38:42 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2009/02/08 20:00:03 minskim Exp $
 
-Set paths to texmf trees for pkgsrc.
+- Set paths to texmf trees for pkgsrc.
+- Sync with TeX Live Revision 12107.
 
 --- texmf.cnf.orig	2008-07-26 14:39:36.000000000 -0700
 +++ texmf.cnf
@@ -54,7 +55,135 @@ Set paths to texmf trees for pkgsrc.
  
  % Where to look for ls-R files.  There need not be an ls-R in the
  % directories in this path, but if there is one, Kpathsea will use it.
-@@ -447,7 +447,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
+@@ -146,7 +146,7 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSY
+ 
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+-% Usually you will not need to edit any of the other variables in part 1. %
++% Usually you will not need to edit any of the following variables.
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
+ % WEB2C is for Web2C specific files.  The current directory may not be
+@@ -154,12 +154,16 @@ TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSY
+ WEB2C = $TEXMF/web2c
+ 
+ % TEXINPUTS is for TeX input files -- i.e., anything to be found by \input
+-% or \openin, including .sty, .eps, etc.
++% or \openin, including .sty, .eps, etc.  We specify paths for all known
++% formats, past or present.  Not all of them are built these days.
+ 
+ % Plain TeX.  Have the command tex check all directories as a last
+ % resort, we may have plain-compatible stuff anywhere.
+ TEXINPUTS.tex           = .;$TEXMF/tex/{plain,generic,}//
+ 
++% Fontinst needs to read afm files.
++TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
++
+ % Other plain-based formats.
+ TEXINPUTS.amstex        = .;$TEXMF/tex/{amstex,plain,generic,}//
+ TEXINPUTS.csplain       = .;$TEXMF/tex/{csplain,plain,generic,}//
+@@ -168,7 +172,6 @@ TEXINPUTS.ftex          = .;$TEXMF/tex/{
+ TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,plain,generic,}//
+ TEXINPUTS.mex           = .;$TEXMF/tex/{mex,plain,generic,}//
+ TEXINPUTS.texinfo       = .;$TEXMF/tex/{texinfo,plain,generic,}//
+-TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
+ 
+ % LaTeX 2e specific macros are stored in latex/, macros that can only be
+ % used with 2.09 in latex209/.  In addition, we look in the directory
+@@ -176,12 +179,8 @@ TEXINPUTS.xetex         = .;$TEXMF/tex/{
+ % mention 2e at all, but can be used with 2e.
+ TEXINPUTS.cslatex       = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
+ TEXINPUTS.latex         = .;$TEXMF/tex/{latex,generic,}//
+-TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
+ TEXINPUTS.latex209      = .;$TEXMF/tex/{latex209,generic,latex,}//
+-TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,generic,}//
+-
+-% Fontinst needs to read afm files.
+-TEXINPUTS.fontinst      = .;$TEXMF/{tex,fonts/afm}//
++TEXINPUTS.olatex        = .;$TEXMF/tex/{latex,generic,}//
+ 
+ % MLTeX.
+ TEXINPUTS.frlatex       = .;$TEXMF/tex/{french,latex,generic,}//
+@@ -189,13 +188,11 @@ TEXINPUTS.frtex         = .;$TEXMF/tex/{
+ TEXINPUTS.mllatex       = .;$TEXMF/tex/{latex,generic,}//
+ TEXINPUTS.mltex         = .;$TEXMF/tex/{plain,generic,}//
+ 
+-% e-TeX.  This form of the input paths is borrowed from teTeX.  A certain
+-% variant of TDS is assumed here, unaffected by the build variables.
++% e-TeX.
+ TEXINPUTS.elatex        = .;$TEXMF/tex/{latex,generic,}//
+ TEXINPUTS.etex          = .;$TEXMF/tex/{plain,generic,}//
+ 
+-% pdfTeX.  This form of the input paths is borrowed from teTeX.  A certain
+-% variant of TDS is assumed here, unaffected by the build variables.
++% pdfTeX.
+ TEXINPUTS.pdfcslatex    = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
+ TEXINPUTS.pdfcsplain    = .;$TEXMF/tex/{csplain,plain,generic,}//
+ TEXINPUTS.pdfjadetex    = .;$TEXMF/tex/{jadetex,plain,generic,}//
+@@ -212,39 +209,45 @@ TEXINPUTS.pdfetex       = .;$TEXMF/tex/{
+ 
+ % pdfxTeX.
+ TEXINPUTS.pdfxlatex     = .;$TEXMF/tex/{latex,generic,}//
++TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
+ TEXINPUTS.pdfxtex       = .;$TEXMF/tex/{plain,generic,}//
+ 
+-% XeTeX
++% LuaTeX.
++TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,generic,}//
++TEXINPUTS.luatex        = .;$TEXMF/tex/{luatex,plain,generic,}//
++TEXINPUTS.pdflualatex   = .;$TEXMF/tex/{lualatex,latex,generic,}//
++TEXINPUTS.pdfluatex     = .;$TEXMF/tex/{lualatex,latex,generic,}//
++
++% XeTeX.
+ TEXINPUTS.xelatex       = .;$TEXMF/tex/{xelatex,latex,generic,}//
+ TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,generic,}//
+ TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//
+ 
+-% Omega / Aleph
+-TEXINPUTS.lamed         = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
++% Omega / Aleph.
++TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
++TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
++TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
+ TEXINPUTS.lambda        = .;$TEXMF/tex/{lambda,latex,generic,}//
++TEXINPUTS.lamed         = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
+ TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
+-TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
+ 
+-% ConTeXt
++% ConTeXt.
+ TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//
+ 
+-% odd formats needing their own paths
++% XMLTeX.
++TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
++TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
++
++% Miscellany, no longer built.
+ TEXINPUTS.lamstex       = .;$TEXMF/tex/{lamstex,plain,generic,}//
+ TEXINPUTS.lollipop      = .;$TEXMF/tex/{lollipop,plain,generic,}//
+-
+-% Earlier entries override later ones, so put this last.
+-TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
+-
+-% extra format definitions for TeX Live
+-
+-TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
+-TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
+-TEXINPUTS.pdfxmex       = .;$TEXMF/tex/{mex,plain,generic,}//
+ TEXINPUTS.frpdflatex    = .;$TEXMF/tex/{french,latex,generic,}//
+ TEXINPUTS.frpdftex      = .;$TEXMF/tex/{french,plain,generic,}//
+-TEXINPUTS.xmltex        = .;$TEXMF/tex/{xmltex,latex,generic,}//
+-TEXINPUTS.pdfxmltex     = .;$TEXMF/tex/{xmltex,latex,generic,}//
+ 
++% Earlier entries override later ones, so put this generic one last.
++TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
++
++% ttf2tfm.
+ TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
+ 
+ % Metafont, MetaPost inputs.
+@@ -447,7 +450,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
  % 
  % For security reasons, it is better not to include . in this path.
  %
@@ -63,3 +192,37 @@ Set paths to texmf trees for pkgsrc.
  
  # kpathsea 3.5.3 and later sets these at runtime. To avoid empty
  # expansions from binaries linked against an earlier version of the
+@@ -458,11 +461,10 @@ engine = unsetengine
+ 
+ %  Part 2: Options.
+ 
+-% If this is true, `tex a.b' will look first for a.b.tex (within each
+-% path element), and then for a.b, i.e., we try standard extensions
+-% first.  If this is false, we first look for a.b and then a.b.tex,
+-% first.  If this is false, we first look for a.b and then a.b.tex,
+-% i.e., we try the name as-is first.
++% If this option is set to true, `tex a.b' will look first for a.b.tex
++% (within each path element), and then for a.b, i.e., we try standard
++% extensions first.  If this is false, we first look for a.b and then
++% a.b.tex, i.e., we try the name as-is first.
+ %
+ % Both names are always tried; the difference is the order in which they
+ % are tried.  The setting applies to all searches, not just .tex.
+@@ -472,7 +474,7 @@ engine = unsetengine
+ % always have an extension added first.
+ %
+ % The default is true, because we already avoid adding the standard
+-% extension(s) in most common cases.  E.g., babel.sty will only look for
++% extension(s) in the usual cases.  E.g., babel.sty will only look for
+ % babel.sty, not babel.sty.tex, regardless of this setting.
+ try_std_extension_first = t
+ 
+@@ -612,7 +614,7 @@ buf_size = 200000
+ % for all known free hyphenation patterns to be loaded simultaneously
+ % (as TeX Live does).
+ %
+-trie_size = 600000
++trie_size = 700000
+ 
+ hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
+                         % http://primes.utm.edu/curios/page.php/8191.html