Add the following configuration settings to texmf.cnf:

- LUAINPUTS.lualatex
- LUAINPUTS.dvilualatex
- RISINPUTS
- BLTXMLINPUTS

3 files changed, 59 insertions, 5 deletions

diff --git a/print/kpathsea/Makefile b/print/kpathsea/Makefile
index 6504ef95fba..80fc1594044 100644
--- a/print/kpathsea/Makefile
+++ b/print/kpathsea/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/07/28 04:25:05 minskim Exp $
+# $NetBSD: Makefile,v 1.15 2011/11/07 08:27:35 minskim Exp $
 
 DISTNAME=	texlive-20110705-source
 PKGNAME=	kpathsea-6.0.1
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/print/kpathsea/distinfo b/print/kpathsea/distinfo
index ec5a818557c..6a9f441589d 100644
--- a/print/kpathsea/distinfo
+++ b/print/kpathsea/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2011/07/28 04:25:05 minskim Exp $
+$NetBSD: distinfo,v 1.11 2011/11/07 08:27:35 minskim Exp $
 
 SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
 RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
 Size (texlive-20110705-source.tar.xz) = 131207904 bytes
-SHA1 (patch-aa) = 3addf4dd36c92722fb89e62ebda54c1d26933439
+SHA1 (patch-aa) = 304413906418d2c9e80dd41105fc59530ac82789
 SHA1 (patch-ab) = 241176f612485a800ec94974ab00419c92043243
 SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0
 SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40
diff --git a/print/kpathsea/patches/patch-aa b/print/kpathsea/patches/patch-aa
index 79bf9ca9e8e..ea4c63b4934 100644
--- a/print/kpathsea/patches/patch-aa
+++ b/print/kpathsea/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2011/07/28 04:25:06 minskim Exp $
+$NetBSD: patch-aa,v 1.9 2011/11/07 08:27:35 minskim Exp $
 
 Set paths to texmf trees for pkgsrc.
 
@@ -39,7 +39,60 @@ Set paths to texmf trees for pkgsrc.
  
  % On some systems, there will be a system tree which contains all the font
  % files that may be created as well as the formats.  For example
-@@ -442,7 +442,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
+@@ -303,6 +303,10 @@ BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
+ MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
+ MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//
+ 
++% .ris and .bltxml bibliography formats.
++RISINPUTS = .;$TEXMF/bibtex/ris//
++BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
++
+ % MFT style files.
+ MFTINPUTS = .;$TEXMF/mft//
+ 
+@@ -368,11 +372,13 @@ MPSUPPORT = .;$TEXMF/metapost/support
+ MIMELIBDIR = $TEXMFROOT/etc
+ MAILCAPLIBDIR = $TEXMFROOT/etc
+ 
+-% Default settings for fontconfig library, used by Windows versions of
+-% xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores this.
+-FONTCONFIG_FILE=fonts.conf
+-FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
+-FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache
++% Default settings for the fontconfig library as used by the Windows
++% versions of xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores
++% this.  ConTeXT MkIV (all platforms) also use these values.
++% 
++FONTCONFIG_FILE = fonts.conf
++FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
++FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
+ 
+ % TeX documentation and source files, for use with texdoc and kpsewhich.
+ TEXDOCS = $TEXMF/doc//
+@@ -407,10 +413,19 @@ TW_INIPATH = $TW_LIBPATH
+ % would allow command execution.
+ DVIPDFMXINPUTS = $TEXMF/dvipdfmx
+ 
+-% Find scripts that are distributed/installed in the texmf tree.
+-
+ % Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
+-LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS
++% 
++% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
++% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
++% default expansion of TEXINPUTS will not happen and .lua files under
++% the /tex/ will not be found.
++% 
++% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
++% The default LUAINPUTS sufficess for luatex and dviluatex.
++%
++LUAINPUTS.lualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
++LUAINPUTS.dvilualatex = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
++LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
+ 
+ % Lua needs to look for binary lua libraries distributed with packages.
+ CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
+@@ -442,7 +457,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
  % 
  % For security reasons, it is better not to include . in this path.
  %