From 3aa89f668cc2a08d828caf8b9939de9ba2b2e879 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <Henrik@Grimler.se>
Date: Wed, 24 Jan 2018 19:46:27 +0100
Subject: [PATCH] texlive: patch texmf.cnf to point towards correct path

Necessary after files have been moved to standard path.
Also add remove file from texlive to avoid file clash with texlive-bin.
---
 packages/texlive-bin/build.sh                      | 3 ++-
 packages/texlive-bin/texk-kpathsea-texmf.cnf.patch | 2 +-
 packages/texlive/build.sh                          | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index b483fd333..d835c9d96 100644
--- a/packages/texlive-bin/build.sh
+++ b/packages/texlive-bin/build.sh
@@ -130,7 +130,8 @@ termux_step_post_make_install () {
 	mv $TL_BINDIR/tlmgr $TL_BINDIR/tlmgr.ln
 	echo "#!$TERMUX_PREFIX/bin/sh" > $TL_BINDIR/tlmgr
 	echo "termux-fix-shebang $TL_ROOT/texmf-dist/scripts/texlive/tlmgr.pl" >> $TL_BINDIR/tlmgr
-	echo "sed -i 's%`kpsewhich -var-value=SELFAUTOPARENT`);%`kpsewhich -var-value=TEXMFROOT`);%g' $TL_ROOT/texmf-dist/scripts/texlive/tlmgr.pl" >> $TL_BINDIR/tlmgr
+	echo "sed -i 's%\`kpsewhich -var-value=SELFAUTOPARENT\`);%\`kpsewhich -var-value=TEXMFROOT\`);%g' $TL_ROOT/texmf-dist/scripts/texlive/tlmgr.pl" >> $TL_BINDIR/tlmgr
+
 	echo "sed -E -i '"'s@`/bin/sh@`'$TERMUX_PREFIX"/bin/sh@g' ${TL_ROOT}/tlpkg/TeXLive/TLUtils.pm" >> $TL_BINDIR/tlmgr
 	echo 'tlmgr.ln "$@"' >> $TL_BINDIR/tlmgr
 	chmod 0744 $TL_BINDIR/tlmgr
diff --git a/packages/texlive-bin/texk-kpathsea-texmf.cnf.patch b/packages/texlive-bin/texk-kpathsea-texmf.cnf.patch
index bb7f14dba..6a1b30ede 100644
--- a/packages/texlive-bin/texk-kpathsea-texmf.cnf.patch
+++ b/packages/texlive-bin/texk-kpathsea-texmf.cnf.patch
@@ -14,7 +14,7 @@
  
  % Local additions to the distribution trees.
 -TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
-+TEXMFLOCAL = TEXMFROOT/texmf-local
++TEXMFLOCAL = $TEXMFROOT/texmf-local
  
  % TEXMFSYSVAR, where *-sys store cached runtime data.
  TEXMFSYSVAR = $TEXMFROOT/texmf-var
diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index c7eb47692..765e2180d 100644
--- a/packages/texlive/build.sh
+++ b/packages/texlive/build.sh
@@ -142,4 +142,5 @@ share/texlive/tlpkg/tlpostcode/xetex/conf/fonts.conf
 share/texlive/tlpkg/tlpostcode/xetex/conf/fonts.dtd
 share/texlive/tlpkg/tlpostcode/xetex/conf/conf.d/51-local.conf
 share/texlive/tlpkg/tlpostcode/xetex/cache/readme.txt
-share/texlive/tlpkg/tlpostcode/ptex2pdf-tlpost.pl"
+share/texlive/tlpkg/tlpostcode/ptex2pdf-tlpost.pl
+share/texlive/texmf-dist/web2c/texmf.cnf"