Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 latex/texlive/BUILD               |   28 ++++-----
 latex/texlive/DEPENDS             |   47 ++++++++++++----
 latex/texlive/DETAILS             |    4 -
 latex/texlive/FINAL               |    2 
 latex/texlive/HISTORY             |    5 +
 latex/texlive/INSTALL             |   40 +++++++------
 latex/texlive/PRE_BUILD           |   71 +++++++++++++++++++-----
 latex/texlive/fix_paths.patch     |  109 
--------------------------------------
 latex/texlive/mtxrun_fix.patch    |   26 ---------
 latex/texlive/texmf.cnf_fix.patch |   24 --------
 10 files changed, 135 insertions(+), 221 deletions(-)

New commits:
commit e6cb3073ef0a27bb78bff2832d6eef06897868fb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    texlive 20150521

diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD
index 28d53c3..25612aa 100755
--- a/latex/texlive/BUILD
+++ b/latex/texlive/BUILD
@@ -1,21 +1,20 @@
+# Flags to allow building against lua 5.3
+#CFLAGS+=" -DLUA_COMPAT_APIINTCASTS"
+
 # hide warnings about unable to find it's own config files
-export KPATHSEA_WARNING=0    &&
+export KPATHSEA_WARNING=0 &&
 # X seems to be only there for xdvi which we use external
-cd ${COMPILE_DIRECTORY} &&
-LIBS="-lpng" $SOURCE_DIRECTORY/configure --prefix=${INSTALL_ROOT}/usr \
-                            --sysconfdir=${INSTALL_ROOT}/etc \
-                            --localstatedir=${INSTALL_ROOT}/var \
-                            --mandir=${INSTALL_ROOT}/usr/share/man \
-                            --infodir=${INSTALL_ROOT}/usr/share/info \
-                            --datadir=${INSTALL_ROOT}/usr/share \
-                            --with-pdftex \
-                            --with-tetex \
-                            --with-pdfetex \
+cd "$COMPILE_DIRECTORY" &&
+"$SOURCE_DIRECTORY"/configure --prefix="$INSTALL_ROOT"/usr \
+                            --sysconfdir="$INSTALL_ROOT"/etc \
+                            --localstatedir="$INSTALL_ROOT"/var \
+                            --mandir="$INSTALL_ROOT"/usr/share/man \
+                            --infodir="$INSTALL_ROOT"/usr/share/info \
+                            --datadir="$INSTALL_ROOT"/usr/share \
+                            --enable-pdftex \
                             --disable-xindy \
                             --disable-etex \
-                            --disable-omega \
                             --disable-aleph \
-                            --without-graphite \
                             --disable-multiplatform \
                             --without-x \
                             --disable-native-texlive-build \
@@ -23,5 +22,4 @@ LIBS="-lpng" $SOURCE_DIRECTORY/configure 
--prefix=${INSTALL_ROOT}/usr \
                             $OPTS &&
 make_single &&
 make &&
-make_normal 
-#make -C ${SOURCE_DIRECTORY}/texk/kpathsea
+make_normal
diff --git a/latex/texlive/DEPENDS b/latex/texlive/DEPENDS
index ed550ba..8967564 100755
--- a/latex/texlive/DEPENDS
+++ b/latex/texlive/DEPENDS
@@ -1,3 +1,23 @@
+with_system() {
+  depends "$1" --with-system-"$1" &&
+  if [ "$2" ]; then
+    sub_depends "$1" "$2"
+  fi
+}
+
+with_system gmp &&
+with_system cairo &&
+with_system mpfr &&
+with_system libpaper &&
+with_system poppler &&
+with_system xpdf &&
+with_system graphite2 &&
+with_system harfbuzz &&
+with_system icu &&
+with_system pixman &&
+with_system potrace LIBPOTRACE &&
+with_system zziplib &&
+
 depends texlive-texmf &&
 depends xz-utils &&
 depends bison &&
@@ -5,29 +25,34 @@ depends -sub CXX gcc &&
 depends flex &&
 depends expat &&
 depends ed &&
-depends texinfo &&
 depends ghostscript '--with-gs=gs' &&
 depends fontconfig "--enable-xetex" &&
-depends freetype2 "--with-system-freetype2 
--with-freetype2-includes=/usr/include/freetype2" &&
-depends libpng "--with-system-libpng --with-libpng-include=/usr/includes 
--with-libpng-libdir=/usr/lib" &&
-depends zlib "--with-system-zlib --with-zlib-libdir=/usr/lib 
--with-zlib-include=/usr/includes" &&
-depends t1lib "--with-system-t1lib --with-t1lib-libdir=/usr/lib 
--with-t1lib-includes=/usr/include" &&
-depends gd "--with-system-gd --with-gd-libdir=/usr/lib 
--with-gd-include=/usr/includes" &&
+depends perl &&
+
+with_system freetype2 &&
+with_system libpng &&
+with_system zlib &&
+depends t1lib &&
+with_system gd &&
 depends psutils '--disable-psutils' &&
 depends t1utils '--disable-t1utils' &&
-depends dialog '--disable-dialog' &&
 runtime_depends detex '--disable-detex' &&
 runtime_depends dvi2tty '--disable-dvi2tty' &&
 runtime_depends ps2eps '--disable-ps2eps' &&
-runtime_depends dvipdfmx "--disable-dvipdfmx" &&
+runtime_depends dvipdfmx "--disable-dvipdfm-x" &&
 runtime_depends dvipng '--disable-dvipng' &&
 runtime_depends lacheck '--disable-lacheck' &&
 runtime_depends lcdf-typetools '--disable-lcdf-typetools' &&
+# FIXME LUA and luajit dependencies aren't actually used, see PRE_BUILD
 optional_depends LUA \
                  '--enable-luatex' \
                  '--without-luatex' \
-                 'Extended version of pdfTeX with Lua, required for XeTeX 
and ConTeXt MkII and MKIV' && 
+                 'Extended version of pdfTeX with Lua (LuaTeX), required for 
XeTeX and ConTeXt MkII and MKIV' &&
+optional_depends luajit \
+                 '--enable-luajittex' \
+                 '--disable-luajittex' \
+                 'Enable LuaJITTeX' &&
 suggest_depends XDVI '--disable-xdvik' '--disable-xdvik' \
                 "For an X DVI viewer" &&
-suggest_depends RUBY '' '' "required for epspdf, context, hyph-utf8 
(Hyphenation patterns expressed in UTF-8), & Huhyphn (hungarian hyphenation)" 
&&
-suggest_depends perl '' ''  "required for latexmk, epstopdf, psutils, 
ps2eps, TeXcount, latexdiff, context, pdfcrop, thumbpdf, perlTeX, texdef, 
mathsPIC, ptex, mathpazo, a2ping, vpe, sty2dtx, & various other scripts"
+suggest_depends RUBY '' '' \
+               "required for epspdf, context, hyph-utf8 (Hyphenation 
patterns expressed in UTF-8), & Huhyphn (hungarian hyphenation)"
diff --git a/latex/texlive/DETAILS b/latex/texlive/DETAILS
index ffafb3a..203ef24 100755
--- a/latex/texlive/DETAILS
+++ b/latex/texlive/DETAILS
@@ -1,8 +1,8 @@
            SPELL=texlive
-         VERSION=20120701
+         VERSION=20150521
           SOURCE="${SPELL}-${VERSION}-source.tar.xz"
    
SOURCE_URL[0]=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}/${SOURCE}
-     
SOURCE_HASH=sha512:0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f
+     
SOURCE_HASH=sha512:9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
 COMPILE_DIRECTORY="${SOURCE_DIRECTORY}/build"
         WEB_SITE="http://www.tug.org/texlive";
diff --git a/latex/texlive/FINAL b/latex/texlive/FINAL
index 5f204c4..bc24d02 100755
--- a/latex/texlive/FINAL
+++ b/latex/texlive/FINAL
@@ -1,7 +1,7 @@
 message "${MESSAGE_COLOR}Please note that the local additions to the texmf 
tree"
 message "have been moved to /usr/local/share/texmf from"
 message "/usr/share/texmf-local${DEFAULT_COLOR}"
-if is_depends_enabled $SPELL lua ; then
+if is_depends_enabled $SPELL LUA; then
   message ""
   message "${MESSAGE_COLOR}You may be required to run 'context --make' to 
create context formats."
   message "However, in most cases, context will generate whatever it 
requires"
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index dbb5501..43b881e 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,8 @@
+2016-02-28 Ismael Luceno <ismael AT sourcemage.org>
+       * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: updated spell to 
20150521
+       * fix_paths.patch, mtxrun_fix.patch: Removed, no longer needed
+       * texmf.cnf_fix.patch: Removed, replaced by sed script in PRE_BUILD
+
 2013-12-15 Javier Vasquez <j.e.vasquez.v AT gmail.com>
        * Fixes Bug #630
        * DEPENDS, BUILD: Fixing finding the path for freetype2 headers
diff --git a/latex/texlive/INSTALL b/latex/texlive/INSTALL
index 21866c0..62d2841 100755
--- a/latex/texlive/INSTALL
+++ b/latex/texlive/INSTALL
@@ -8,39 +8,41 @@ fi &&
 
 ln -svf mf ${INSTALL_ROOT}/usr/bin/mf-nowin &&
 
+fmtutilcnf="$INSTALL_ROOT"/usr/share/texmf-dist/web2c/fmtutil.cnf
 # don't create aleph files
-sed -i -e '/aleph/d' ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf &&
+sed -i -e '/aleph/d' "$fmtutilcnf" &&
 
 # remove luatex stuff from config file if not enabled
-if ! depends_is_enabled $SPELL lua51; then
-  sed -i -e '/luatex/d' ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf
+if ! is_depends_enabled $SPELL LUA; then
+  sed -i -e '/luatex/d' "$fmtutilcnf"
 fi &&
 
 # create symlinks to latex, pdflatex, etc
-${INSTALL_ROOT}/usr/bin/texlinks -f 
${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf ${INSTALL_ROOT}/usr/bin &&
+${INSTALL_ROOT}/usr/bin/texlinks -f "$fmtutilcnf" ${INSTALL_ROOT}/usr/bin &&
+
+# updmap and fmtutil-sys are broken without an install of TexLive::TLUtils
+# This comes with the installer, which we don't use, one source:
+# ftp://tug.org/texlive/historic/2012/tlnet-final/tlpkg/
+# Now, there happens to be a copy here, too ... just using it.
+# Rationale for the hack here: This spell installs updmap, so it should
+# damn well also ensure that this tool can run.
+# Proper use would install tlpkg, which we don't use, just for that lib.
+mkdir -p "$INSTALL_ROOT/usr/share/tlpkg" &&
+cp -vdR "$SOURCE_DIRECTORY/texk/tests/TeXLive" \
+       "$INSTALL_ROOT/usr/share/tlpkg" &&
 
 # update filename db & create all formats
 mktexlsr &&
-fmtutil-sys --cnffile ${INSTALL_ROOT}/usr/share/texmf/web2c/fmtutil.cnf 
--fmtdir ${INSTALL_ROOT}/usr/share/texmf/web2c --all &&
+fmtutil-sys --cnffile "$fmtutilcnf" --fmtdir 
${INSTALL_ROOT}/usr/share/texmf/web2c --all &&
 
-# allow fontconfig to see latex fonts 
+# allow fontconfig to see latex fonts
 install -Cv ${SPELL_DIRECTORY}/09-texlive-fonts.conf 
${INSTALL_ROOT}/etc/fonts/conf.avail &&
 ln -fs ${INSTALL_ROOT}/etc/fonts/conf.avail/09-texlive-fonts.conf 
${INSTALL_ROOT}/etc/fonts/conf.d &&
-fc-cache -fsv && 
+fc-cache -fsv &&
 
-if is_depends_enabled $SPELL lua ; then 
+if is_depends_enabled $SPELL LUA; then
   # update filename db & create formats for context
   mtxrun --generate &&
   # generate fonts for luatex & context
   
OSFONTDIR="${INSTALL_ROOT}/usr/share/texmf-dist/fonts/;${INSTALL_ROOT}/usr/share/texmf/fonts/;${INSTALL_ROOT}/usr/local/share/texmf/fonts"
 mtxrun --script fonts --reload 
-fi &&
-
-# updmap is broken without an install of TexLive::TLUtils
-# This comes with the installer, which we don't use, one source:
-# ftp://tug.org/texlive/historic/2012/tlnet-final/tlpkg/
-# Now, there happens to be a copy here, too ... just using it.
-# Rationale for the hack here: This spell installs updmap, so it should
-# damn well also ensure that this tool can run.
-# Proper use would install tlpkg, which we don't use, just for that lib.
-mkdir -p "$INSTALL_ROOT/usr/share/tlpkg" &&
-cp -vr "$SOURCE_DIRECTORY/texk/tests/TeXLive"  
"$INSTALL_ROOT/usr/share/tlpkg"
+fi
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 9ada7b5..05cfc69 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -1,22 +1,65 @@
 default_pre_build      &&
-cd ${SOURCE_DIRECTORY} &&
+cd "$SOURCE_DIRECTORY" &&
 
-# Use /usr/share/texmf and /usr/share/texmf-dist, adapted from lunarlinux 
+# removing as much internal things as possible
+      #asymptote \
+      #devnag \
+      #lacheck \
+      #m-tx \
+      #pmx \
+      #texdoctk \
+      #tpic2pdftex \
+      #vlna \
+      #xindy \
+for i in \
+      ps2eps \
+      t1utils \
+      xpdfopen
+do
+  rm -rf utils/"$i"
+done &&
+
+# Override bundled libraries' buildsystems to force system versions
+# XXX lua52 and luajit can't be so easily removed due to internal API
+# dependencies.
+for i in \
+      cairo \
+      freetype2 \
+      gd \
+      gmp \
+      graphite2 \
+      harfbuzz \
+      icu \
+      libpaper \
+      libpng \
+      mpfr \
+      pixman \
+      poppler \
+      potrace \
+      xpdf \
+      zlib \
+      zziplib
+do
+  rm -rf libs/"$i" &&
+  mkdir  libs/"$i" &&
+  cat <<"!" > libs/"$i"/configure &&
+#!/bin/sh
+echo '%:;echo $@ target suppressed' > Makefile
+!
+  chmod 755 libs/"$i"/configure
+done &&
+
+# Use /usr/share/texmf and /usr/share/texmf-dist, adapted from lunarlinux
 find -name Makefile\* -exec sed -i -e 
"s:\(\$.\)prefix\(./tex\):\1datadir\2:" {} \; &&
 find -name configure -exec sed -i -e "s:\(\$.\)prefix\(./tex\):\1datadir\2:" 
{} \; &&
 find -name \*.info -exec sed -i -e "s:/usr/local:/usr:" {} \; &&
 find -name \*.texi -exec sed -i -e "s:/usr/local:/usr:" {} \; &&
 
-patch -p1 < ${SPELL_DIRECTORY}/fix_paths.patch
-
-# the sed on the patch is live so it will take into
-# account INSTALL_ROOT
-sed "s:/usr/share:$INSTALL_ROOT/usr/share:g" 
$SPELL_DIRECTORY/texmf.cnf_fix.patch | patch -p0 &&
-# patch mtxrun for context taking into account $INSTALL_ROOT, see HISTORY
-sed "s:/usr/bin:$INSTALL_ROOT/usr/bin:g" $SPELL_DIRECTORY/mtxrun_fix.patch | 
patch -p0 &&
-
-# removing as much internal things as possible
-rm -rf utils/{dialog,gzip,lzma,ps2eps,psutils,t1utils,texinfo,pdfopen} &&
-rm -rf 
libs/{freetype2,lua51,libpng,jpeg,expat,gd,luafilesystem,luafontforge,luamd5,luapeg,luazip,luazlib,ncurses,t1lib,unzip}
 &&
+# Patch paths in texmf.cnf
+sedit '
+       s@^TEXMFROOT =.*@&/usr/share@
+       /^TEXMFLOCAL =/  s@=.*@= $SELFAUTODIR/local/share/texmf@
+       /^TEXMFSYSVAR =/ s@=.*@= /var/tmp/texmf-var@
+' texk/kpathsea/texmf.cnf &&
 
-mkdir ${COMPILE_DIRECTORY}
+mkdir "$COMPILE_DIRECTORY"
diff --git a/latex/texlive/fix_paths.patch b/latex/texlive/fix_paths.patch
deleted file mode 100644
index a25d2ee..0000000
--- a/latex/texlive/fix_paths.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 2be92487773a715b002c670dac3002e69d81e18e Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sat, 15 Sep 2012 22:41:11 +0200
-Subject: [PATCH] fix paths
-
----
- texk/tetex/Makefile.in                  | 6 +++---
- texk/tex4htk/Makefile.in                | 2 +-
- texk/texlive/linked_scripts/Makefile.in | 4 +---
- utils/chktex/Makefile.in                | 2 +-
- utils/mtx/Makefile.in                   | 2 +-
- utils/pmx/Makefile.in                   | 2 +-
- utils/xindy/Makefile.in                 | 2 +-
- 7 files changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/texk/tetex/Makefile.in b/texk/tetex/Makefile.in
-index da8a799..9ff0797 100644
---- a/texk/tetex/Makefile.in
-+++ b/texk/tetex/Makefile.in
-@@ -263,7 +263,7 @@ nodist_bin_SCRIPTS = $(am__append_1)
- all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = 
$(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = $(datarootdir)/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
- @WIN32_FALSE@dist_bin_SCRIPTS = $(sh_scripts)
- CLEANFILES = $(nodist_bin_SCRIPTS)
-@@ -292,10 +292,10 @@ dist_man5_MANS = \
-       fmtutil.cnf.5 \
-       updmap.cfg.5
- 
--texconfigdir = $(datarootdir)/texmf/texconfig
-+texconfigdir = $(datadir)/texmf/texconfig
- dist_texconfig_SCRIPTS = tcfmgr
- dist_texconfig_DATA = tcfmgr.map
--web2cdir = $(datarootdir)/texmf/web2c
-+web2cdir = $(datadir)/texmf/web2c
- dist_web2c_DATA = fmtutil.cnf
- bin_links = \
-       allcm:allec \
-diff --git a/texk/tex4htk/Makefile.in b/texk/tex4htk/Makefile.in
-index 5d836e9..136a523 100644
---- a/texk/tex4htk/Makefile.in
-+++ b/texk/tex4htk/Makefile.in
-@@ -321,7 +321,7 @@ nodist_bin_SCRIPTS = $(am__append_1)
- all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = 
$(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = $(datarootdir)/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
- @WIN32_TRUE@dist_bin_SCRIPTS = $(shell_scripts:=.bat)
- CLEANFILES = $(nodist_bin_SCRIPTS)
-diff --git a/utils/chktex/Makefile.in b/utils/chktex/Makefile.in
-index d2ed8ae..d3fb84c 100644
---- a/utils/chktex/Makefile.in
-+++ b/utils/chktex/Makefile.in
-@@ -292,7 +292,7 @@ nodist_bin_SCRIPTS = $(am__append_1)
- all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = 
$(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = $(datarootdir)/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
- @WIN32_FALSE@bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
- 
-diff --git a/utils/mtx/Makefile.in b/utils/mtx/Makefile.in
-index 4ab0b15..c5228ef 100644
---- a/utils/mtx/Makefile.in
-+++ b/utils/mtx/Makefile.in
-@@ -307,7 +307,7 @@ nodist_bin_SCRIPTS = $(am__append_1)
- all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = 
$(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = $(datarootdir)/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- dist_texmf_SCRIPTS = $(lua_scripts:=.lua)
- dist_man1_MANS = m-tx.1 prepmx.1
- TESTS = mtx.test
-diff --git a/utils/pmx/Makefile.in b/utils/pmx/Makefile.in
-index 283b5ad..e6a0052 100644
---- a/utils/pmx/Makefile.in
-+++ b/utils/pmx/Makefile.in
-@@ -491,7 +491,7 @@ nodist_bin_SCRIPTS = $(am__append_2)
- all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = 
$(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = $(datarootdir)/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- dist_texmf_SCRIPTS = $(lua_scripts:=.lua)
- dist_man1_MANS = pmx2pdf.1 pmxab.1 scor2prt.1
- TESTS = pmx.test
-diff --git a/utils/xindy/Makefile.in b/utils/xindy/Makefile.in
-index 198fc59..4e1bc9e 100644
---- a/utils/xindy/Makefile.in
-+++ b/utils/xindy/Makefile.in
-@@ -294,7 +294,7 @@ nodist_bin_SCRIPTS = $(am__append_1)
- all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
- @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = 
$(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
--texmfdir = $(datarootdir)/$(scriptsdir)
-+texmfdir = $(datadir)/$(scriptsdir)
- nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
- CLEANFILES = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
- all: all-recursive
--- 
-1.7.12
-
diff --git a/latex/texlive/mtxrun_fix.patch b/latex/texlive/mtxrun_fix.patch
deleted file mode 100644
index a5d1edb..0000000
--- a/latex/texlive/mtxrun_fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- texk/texlive/context/mtxrun
-+++ texk/texlive/context/mtxrun
-@@ -9801,7 +9801,7 @@
-     local args = environment.originalarguments or arg -- this needs a 
cleanup
- 
-     local ownbin  = environment.ownbin  or args[-2] or arg[-2] or args[-1] 
or arg[-1] or arg[0] or "luatex"
--    local ownpath = environment.ownpath or os.selfdir
-+    local ownpath = '/usr/bin' 
- 
-     ownbin  = file.collapsepath(ownbin)
-     ownpath = file.collapsepath(ownpath)
-@@ -9873,12 +9873,12 @@
- 
- do
- 
--    local ownpath = environment.ownpath or dir.current()
-+    local ownpath = '/usr/bin' 
- 
-     if ownpath then
-         ossetenv('SELFAUTOLOC',    file.collapsepath(ownpath))
-         ossetenv('SELFAUTODIR',    file.collapsepath(ownpath .. "/.."))
--        ossetenv('SELFAUTOPARENT', file.collapsepath(ownpath .. "/../.."))
-+        ossetenv('SELFAUTOPARENT', file.collapsepath(ownpath .. 
"/../share"))
-     else
-         report_initialization("error: unable to locate ownpath")
-         os.exit()
diff --git a/latex/texlive/texmf.cnf_fix.patch 
b/latex/texlive/texmf.cnf_fix.patch
deleted file mode 100644
index 49fb141..0000000
--- a/latex/texlive/texmf.cnf_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- texk/kpathsea/texmf.cnf.orig       2012-09-15 21:49:14.428717795 +0200
-+++ texk/kpathsea/texmf.cnf    2012-09-15 21:49:21.528620273 +0200
-@@ -51,7 +51,7 @@
- % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
- % Kpathsea sets SELFAUTOLOC (the directory with the binary),
- % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
--TEXMFROOT = $SELFAUTOPARENT
-+TEXMFROOT = $SELFAUTOPARENT/usr/share
- 
- % The tree containing runtime files related to the specific
- % distribution and version.
-@@ -61,10 +61,10 @@
- TEXMFDIST = $TEXMFROOT/texmf-dist
- 
- % Local additions to the distribution trees.
--TEXMFLOCAL = $TEXMFROOT/../texmf-local
-+TEXMFLOCAL = $SELFAUTODIR/local/share/texmf
- 
- % TEXMFSYSVAR, where *-sys store cached runtime data.
--TEXMFSYSVAR = $TEXMFROOT/texmf-var
-+TEXMFSYSVAR = /var/tmp/texmf-var
- 
- % TEXMFSYSCONFIG, where *-sys store configuration data.
- TEXMFSYSCONFIG = $TEXMFROOT/texmf-config