Index: texmf-dist/web2c/texmfcnf.lua --- texmf-dist/web2c/texmfcnf.lua.orig +++ texmf-dist/web2c/texmfcnf.lua @@ -3,9 +3,6 @@ -- ConTeXt needs a properly expanded TEXMFLOCAL, so here is a -- bit of lua code to make that happen -local texmflocal = resolvers.prefixes.selfautoparent(); -texmflocal = string.gsub(texmflocal, "20%d%d$", "texmf-local"); - return { type = "configuration", @@ -25,6 +22,9 @@ return { -- I don't care too much about it as extending is easy. variables = { + -- Note that in OpenBSD, where we use the old teTeX path convention + -- selfauto does not work. + TEXMFROOT = "${TRUEPREFIX}/share", -- The following variable is predefined (but can be overloaded) and in -- most cases you can leve this one untouched. The built-in definition @@ -44,7 +44,7 @@ return { -- only used for FONTCONFIG_PATH & TEXMFCACHE in TeX Live - TEXMFSYSVAR = "selfautoparent:texmf-var", + TEXMFSYSVAR = "${TEXMFROOT}/texmf-var", TEXMFVAR = "home:.texlive2022/texmf-var", -- We have only one cache path but there can be more. The first writable one @@ -61,13 +61,13 @@ return { -- By using prefixes we don't get expanded paths in the cache __path__ -- entry. This makes the tex root relocatable. - TEXMFOS = "selfautodir:", - TEXMFDIST = "selfautoparent:texmf-dist", + TEXMFOS = "${TRUEPREFIX}", + TEXMFDIST = "$TEXMFROOT/texmf-dist", - TEXMFLOCAL = texmflocal, - TEXMFSYSCONFIG = "selfautoparent:texmf-config", - TEXMFFONTS = "selfautoparent:texmf-fonts", - TEXMFPROJECT = "selfautoparent:texmf-project", + TEXMFLOCAL = "$TEXMFROOT/texmf-local", + TEXMFSYSCONFIG = "$TEXMFROOT/texmf-config", + TEXMFFONTS = "$TEXMFROOT/texmf-fonts", + TEXMFPROJECT = "$TEXMFROOT/texmf-project", TEXMFHOME = "home:texmf", -- TEXMFHOME = os.name == "macosx" and "home:Library/texmf" or "home:texmf",