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.

diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index b483fd3334e14dabce859b6f9ef659936fcc1ae8..d835c9d9669380a028b4bed7d768e9c0c6491801 100644 (file)
--- 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
        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
        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 bb7f14dbad819b07e95b33933cbae2477f59b940..6a1b30ede8e736eace7ef15d08d3ebcca1a8b027 100644 (file)
--- 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
  
  % 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
  
  % TEXMFSYSVAR, where *-sys store cached runtime data.
  TEXMFSYSVAR = $TEXMFROOT/texmf-var

diff --git a/packages/texlive/build.sh b/packages/texlive/build.sh
index c7eb476921248740eab1e9644b1aeb92c60c64bc..765e2180dcd8ba71174a7f82d25ad8073d4034a3 100644 (file)
--- 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/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"