fix luatex config paths to match pkgsrc texmf.cnf

3 files changed, 73 insertions, 3 deletions

diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index dde12656efe..6f2b9f91253 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2016/06/16 04:06:12 markd Exp $
+# $NetBSD: Makefile,v 1.18 2016/07/13 11:17:21 markd Exp $
 
 DISTNAME=	luatex
 PKGNAME=	tex-${DISTNAME}-0.95
+PKGREVISION=	1
 TEXLIVE_REV=	40963
 
 MAINTAINER=	minskim@NetBSD.org
@@ -16,10 +17,27 @@ DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
 DEPENDS+=	tex-plain>=3.14159265.12854:../../print/tex-plain
 DEPENDS+=	tex-unicode-data-[0-9]*:../../print/tex-unicode-data
 
+#
+# A double-slash (//) in the kpathsea paths has a special
+# interpretation, it will cause kpathsea to consider all
+# subdirectories recursively at that point in the path.  Normally
+# double-slashes and trailing slashes will not be present in these
+# variables, but if they are there the resulting behaviour is so
+# unexpected, expensive, and difficult to diagnose that it is worth
+# going to extra effort to clean them out here.
+#
+SUBST_CLASSES+=		texmfdir
+SUBST_MESSAGE.texmfdir=	Setting texmf directories.
+SUBST_STAGE.texmfdir=	pre-configure
+SUBST_FILES.texmfdir=	texmf-dist/web2c/texmfcnf.lua
+SUBST_SED.texmfdir+=	-e 's,@VARBASE@,${VARBASE:C;///*;/;g:C;/$;;},'
+SUBST_SED.texmfdir+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR:C;///*;/;g:C;/$;;},'
+
 PKG_SYSCONFSUBDIR=	texmf
 
+BUILD_DEFS+=	VARBASE
 CONF_FILES+=	${PREFIX}/share/texmf-dist/web2c/texmfcnf.lua \
-		${PKG_SYSCONFDIR}/web2c/texmfcnf.lua
+		${PKG_SYSCONFDIR}/texmfcnf.lua
 
 INSTALLATION_DIRS+=	bin
 
diff --git a/print/tex-luatex/distinfo b/print/tex-luatex/distinfo
index ebf51c9a350..20803a73c45 100644
--- a/print/tex-luatex/distinfo
+++ b/print/tex-luatex/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2016/06/16 04:06:12 markd Exp $
+$NetBSD: distinfo,v 1.15 2016/07/13 11:17:21 markd Exp $
 
 SHA1 (tex-luatex-40963/luatex.tar.xz) = 87fd4854e5fdc7633274045de464b2e927f1a0ac
 RMD160 (tex-luatex-40963/luatex.tar.xz) = eeffd6a3859c5e17335fa82b08253c12367da4f0
 SHA512 (tex-luatex-40963/luatex.tar.xz) = d9dd87af58c88283cb0fcb46e1fdb6e3496d31862b52417b065ae3873c3d42c9a69b10ab7b0e9170947e57750b30beb7825285dcdf10e25ea2e1bb0c4a70550f
 Size (tex-luatex-40963/luatex.tar.xz) = 12828 bytes
+SHA1 (patch-texmf-dist_web2c_texmfcnf.lua) = 175b357ba0ffe59a0544c5b80ba7330660f8cbe0
diff --git a/print/tex-luatex/patches/patch-texmf-dist_web2c_texmfcnf.lua b/print/tex-luatex/patches/patch-texmf-dist_web2c_texmfcnf.lua
new file mode 100644
index 00000000000..975a643bb41
--- /dev/null
+++ b/print/tex-luatex/patches/patch-texmf-dist_web2c_texmfcnf.lua
@@ -0,0 +1,51 @@
+$NetBSD: patch-texmf-dist_web2c_texmfcnf.lua,v 1.1 2016/07/13 11:17:21 markd Exp $
+
+Set paths to texmf trees for pkgsrc.
+
+--- texmf-dist/web2c/texmfcnf.lua.orig	2016-04-06 22:40:36.000000000 +0000
++++ texmf-dist/web2c/texmfcnf.lua
+@@ -42,9 +42,11 @@ return {
+             --     "selfautoparent:",
+             -- }
+ 
++            TEXMFCNF        = "@PKG_SYSCONFDIR@",
++
+             -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live
+ 
+-            TEXMFSYSVAR     = "selfautoparent:texmf-var",
++            TEXMFSYSVAR     = "@VARBASE@/lib/texmf",
+             TEXMFVAR        = "home:.texlive2016/texmf-var",
+ 
+             -- We have only one cache path but there can be more. The first writable one
+@@ -62,10 +64,10 @@ return {
+             -- entry. This makes the tex root relocatable.
+ 
+             TEXMFOS         = "selfautodir:",
+-            TEXMFDIST       = "selfautoparent:texmf-dist",
++            TEXMFDIST       = "selfautodir:share/texmf-dist",
+ 
+-            TEXMFLOCAL      = texmflocal,
+-            TEXMFSYSCONFIG  = "selfautoparent:texmf-config",
++            TEXMFLOCAL      = "selfautodir:share/texmf-local",
++            TEXMFSYSCONFIG  = "@PKG_SYSCONFDIR@",
+             TEXMFFONTS      = "selfautoparent:texmf-fonts",
+             TEXMFPROJECT    = "selfautoparent:texmf-project",
+ 
+@@ -75,7 +77,7 @@ return {
+             -- We need texmfos for a few rare files but as I have a few more bin trees
+             -- a hack is needed. Maybe other users also have texmf-platform-new trees.
+ 
+-            TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFDIST}",
++            TEXMF           = "{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}",
+ 
+             TEXFONTMAPS     = ".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
+             ENCFONTS        = ".;$TEXMF/fonts/data//;$TEXMF/fonts/enc/{dvips,pdftex}//",
+@@ -101,7 +103,7 @@ return {
+             PYTHONINPUTS    = ".;$TEXMF/scripts/context/python",
+             RUBYINPUTS      = ".;$TEXMF/scripts/context/ruby",
+             LUAINPUTS       = ".;$TEXINPUTS;$TEXMF/scripts/context/lua//",
+-            CLUAINPUTS      = ".;$SELFAUTOLOC/lib/{context,luatex,}/lua//",
++            CLUAINPUTS      = ".;selfautodir:lib/{context,luatex,}/lua//",
+ 
+             -- Not really used by MkIV so they might go away.
+