Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e7d4590924dbf3139aaa483d12e1bd36f236c068)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e7d4590924dbf3139aaa483d12e1bd36f236c068)
  • Date: Sun, 16 Sep 2012 05:34:57 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

latex/texlive-texmf/DETAILS | 6 -
latex/texlive-texmf/HISTORY | 4
latex/texlive-texmf/texmfcnf.lua_fix.patch | 10 -
latex/texlive/BUILD | 3
latex/texlive/DETAILS | 7 -
latex/texlive/HISTORY | 6 +
latex/texlive/INSTALL | 1
latex/texlive/PRE_BUILD | 15 +-
latex/texlive/fix_paths.patch | 155
++++++++++++++---------------
latex/texlive/texmf.cnf_fix.patch | 14 +-
10 files changed, 115 insertions(+), 106 deletions(-)

New commits:
commit bd65ba9151a171b14177cb9ac804bd8380bf9c95
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

latex/texlive-texmf: version 20120701

commit 4921f126f1bda95f7007e009a00193c937ad54e2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

latex/texlive: version 20120701

diff --git a/latex/texlive-texmf/DETAILS b/latex/texlive-texmf/DETAILS
index 05dc9ec..06705b1 100755
--- a/latex/texlive-texmf/DETAILS
+++ b/latex/texlive-texmf/DETAILS
@@ -1,8 +1,8 @@
SPELL=texlive-texmf
- VERSION=20110705
+ VERSION=20120701
SOURCE="texlive-${VERSION}-texmf.tar.xz"
- SOURCE_URL[0]=ftp://tug.org/texlive/historic/${VERSION:0:4}/${SOURCE}
-
SOURCE_HASH=sha512:80cd946980f93aaee698b2c1fe668934c9378dbc9383bcac209e443b49b631c206c8cf7c7f53db26db392626521bb21aa7ceae5bff0255ecf78a397bcdcbfe0a
+
SOURCE_URL[0]=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}/${SOURCE}
+
SOURCE_HASH=sha512:497524351b232952946384e301e0462b26e2ca36839ea702ca9358b7fea8c1c3f817f036f043337b4d0ae5325f3bfa1218c1bb0289eade2f9d35386c4ed90404
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
WEB_SITE="http://www.tug.org/texlive";
LICENSE[0]="LATER"
diff --git a/latex/texlive-texmf/HISTORY b/latex/texlive-texmf/HISTORY
index b671bf0..b0d1df4 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,3 +1,7 @@
+2012-09-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 20120701
+ * texmfcnf.lua_fix.patch: refreshed patch
+
2011-10-31 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: patch texmfcnf.lua for proper luatex dirs
rm texmf.cnf so the version in the texlive spell is used
diff --git a/latex/texlive-texmf/texmfcnf.lua_fix.patch
b/latex/texlive-texmf/texmfcnf.lua_fix.patch
index b373a59..3949dab 100644
--- a/latex/texlive-texmf/texmfcnf.lua_fix.patch
+++ b/latex/texlive-texmf/texmfcnf.lua_fix.patch
@@ -1,19 +1,19 @@
---- texmf/web2c/texmfcnf.lua
-+++ texmf/web2c/texmfcnf.lua
+--- texmf/web2c/texmfcnf.lua.orig 2012-09-15 20:31:18.102902927 +0200
++++ texmf/web2c/texmfcnf.lua 2012-09-15 20:36:10.995089077 +0200
@@ -50,7 +50,7 @@
-- We have only one cache path but there can be more. The first
writable one
-- will be chosen but there can be more readable paths.

- TEXMFCACHE = "$TEXMFSYSVAR;$TEXMFVAR",
+ TEXMFCACHE = "$TEXMFVAR;$TEXMFSYSVAR",
- TEXMFCONFIG = "home:.texlive2011/texmf-config",
+ TEXMFCONFIG = "home:.texlive2012/texmf-config",

-- I don't like this texmf under home and texmf-home would make
more
-@@ -77,7 +77,7 @@
+@@ -76,7 +76,7 @@
-- 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,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN}",
+- TEXMF =
"{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}",
+ TEXMF =
"{$TEXMFCONFIG,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFPROJECT,!!$TEXMFFONTS,!!$TEXMFLOCAL,!!$TEXMFCONTEXT,!!$TEXMFSYSTEM,!!$TEXMFMAIN,/usr/share/texmf-dist}",

TEXFONTMAPS =
".;$TEXMF/fonts/data//;$TEXMF/fonts/map/{pdftex,dvips}//",
diff --git a/latex/texlive/BUILD b/latex/texlive/BUILD
index d1aa528..e1af486 100755
--- a/latex/texlive/BUILD
+++ b/latex/texlive/BUILD
@@ -1,8 +1,9 @@
# 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
export CFLAGS="-I/usr/include/freetype2 $CFLAGS" &&
export CXXFLAGS="-I/usr/include/freetype2 $CXXFLAGS" &&
+cd ${COMPILE_DIRECTORY} &&
LIBS="-lpng" $SOURCE_DIRECTORY/configure --prefix=${INSTALL_ROOT}/usr \
--sysconfdir=${INSTALL_ROOT}/etc \
--localstatedir=${INSTALL_ROOT}/var \
diff --git a/latex/texlive/DETAILS b/latex/texlive/DETAILS
index 297efad..ffafb3a 100755
--- a/latex/texlive/DETAILS
+++ b/latex/texlive/DETAILS
@@ -1,9 +1,10 @@
SPELL=texlive
- VERSION=20110705
+ VERSION=20120701
SOURCE="${SPELL}-${VERSION}-source.tar.xz"
- SOURCE_URL[0]=ftp://tug.org/${SPELL}/historic/${VERSION:0:4}/${SOURCE}
-
SOURCE_HASH=sha512:1efb5713bf80379f5104b41576911a4194d378ce35be5afb568c3b4aff6461b2b22e72fb34bc294021cf14a28d07bab083872f17752441f269f36c50f9363cc1
+
SOURCE_URL[0]=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}/${SOURCE}
+
SOURCE_HASH=sha512:0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
+COMPILE_DIRECTORY="${SOURCE_DIRECTORY}/build"
WEB_SITE="http://www.tug.org/texlive";
LICENSE[0]="LPPL GPL"
ENTERED=20090729
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index b3cc087..aacb4a7 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,9 @@
+2012-09-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 20120701
+ * BUILD, PRE_BUILD, INSTALL: build out of tree
+ * PRE_BUILD: use default_pre_build
+ * fix_paths.patch, texmf.cnf_fix.patch: refreshed patches
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51

diff --git a/latex/texlive/INSTALL b/latex/texlive/INSTALL
index 40cbb73..fdc819c 100755
--- a/latex/texlive/INSTALL
+++ b/latex/texlive/INSTALL
@@ -1,3 +1,4 @@
+cd ${COMPILE_DIRECTORY} &&
default_install &&

# move old local to new local, can eventually get rid of this
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 9bd0d53..9ada7b5 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -1,16 +1,13 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&

# 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:" {} \; &&
-# fix the remaining locations
-patch -p0 < ${SPELL_DIRECTORY}/fix_paths.patch &&
+
+patch -p1 < ${SPELL_DIRECTORY}/fix_paths.patch

# the sed on the patch is live so it will take into
# account INSTALL_ROOT
@@ -20,4 +17,6 @@ sed "s:/usr/bin:$INSTALL_ROOT/usr/bin:g"
$SPELL_DIRECTORY/mtxrun_fix.patch | pat

# 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}
+rm -rf
libs/{freetype2,lua51,libpng,jpeg,expat,gd,luafilesystem,luafontforge,luamd5,luapeg,luazip,luazlib,ncurses,t1lib,unzip}
&&
+
+mkdir ${COMPILE_DIRECTORY}
diff --git a/latex/texlive/fix_paths.patch b/latex/texlive/fix_paths.patch
index ae7b114..a25d2ee 100644
--- a/latex/texlive/fix_paths.patch
+++ b/latex/texlive/fix_paths.patch
@@ -1,112 +1,109 @@
---- texk/tetex/Makefile.in
-+++ texk/tetex/Makefile.in
-@@ -225,7 +225,7 @@
+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 = ${prefix}/$(scriptsdir)
-+texmfdir = ${datadir}/$(scriptsdir)
+-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)
-@@ -254,7 +254,7 @@
+@@ -292,10 +292,10 @@ dist_man5_MANS = \
fmtutil.cnf.5 \
updmap.cfg.5

--texconfdir = ${prefix}
-+texconfdir = ${datadir}
- nobase_dist_texconf_DATA = \
- texmf/texconfig/README \
- texmf/texconfig/g/generic \
---- texk/tex4htk/Makefile.in
-+++ texk/tex4htk/Makefile.in
-@@ -269,7 +269,7 @@
+-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 = ${prefix}/$(scriptsdir)
-+texmfdir = ${datadir}/$(scriptsdir)
+-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)
-@@ -992,8 +992,8 @@
- # We support both multiplatform and non-multiplatform builds.
- install-links:
- case "$(bindir)" in \
-- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT)
make-links;; \
-- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT)
make-links;; \
-+ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share TYPE=$(TYPE) EXT=$(EXT)
make-links;; \
-+ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share TYPE=$(TYPE)
EXT=$(EXT) make-links;; \
- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts"
>&2; \
- exit 1;; \
- esac
---- texk/texlive/linked_scripts/Makefile.in
-+++ texk/texlive/linked_scripts/Makefile.in
-@@ -620,8 +620,8 @@
- @WIN32_TRUE@ $(INSTALL_SCRIPT) $(runscript)
$(DESTDIR)$(bindir)/$$link.exe || exit 1; \
- @WIN32_TRUE@ done
- @WIN32_FALSE@ case "$(bindir)" in \
--@WIN32_FALSE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
--@WIN32_FALSE@ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
-+@WIN32_FALSE@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=../share install-links;;
\
-+@WIN32_FALSE@ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../../share
install-links;; \
- @WIN32_FALSE@ *) echo "strange directory '$(bindir)' for linked scripts"
>&2; \
- @WIN32_FALSE@ exit 1;; \
- @WIN32_FALSE@ esac
-@@ -650,11 +650,7 @@
- echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link || exit 1; \
- done && \
-- rm -f man && \
-- if test -d $(REL)/texmf/doc/man; then \
-- echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
-- (ln -s $(REL)/texmf/doc/man man || :); \
-- else :; fi
-+ true
-
- uninstall-hook:
- @for s in $(nobase_dist_texmf_scripts_SCRIPTS)
$(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
---- utils/chktex/Makefile.in
-+++ utils/chktex/Makefile.in
-@@ -254,7 +254,7 @@
+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 = ${prefix}/$(scriptsdir)
-+texmfdir = ${datadir}/$(scriptsdir)
+-texmfdir = $(datarootdir)/$(scriptsdir)
++texmfdir = $(datadir)/$(scriptsdir)
nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
@WIN32_FALSE@bin_SCRIPTS = $(CHKTEX_TREE)/chkweb

---- utils/ps2eps/Makefile.in
-+++ utils/ps2eps/Makefile.in
-@@ -213,7 +213,7 @@
+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 = ${prefix}/$(scriptsdir)
-+texmfdir = ${datadir}/$(scriptsdir)
- nodist_texmf_SCRIPTS = $(PS2EPS_TREE)/bin/ps2eps.pl
- CLEANFILES = $(nodist_bin_SCRIPTS)
- all: all-am
---- utils/psutils/Makefile.in
-+++ utils/psutils/Makefile.in
-@@ -302,7 +302,7 @@
+-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 = ${prefix}/$(scriptsdir)
-+texmfdir = ${datadir}/$(scriptsdir)
- nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
- @WIN32_FALSE@bin_SCRIPTS = $(sh_scripts)
- nodist_man1_MANS = \
---- utils/xindy/Makefile.in
-+++ utils/xindy/Makefile.in
-@@ -257,7 +257,7 @@
+-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 = ${prefix}/$(scriptsdir)
-+texmfdir = ${datadir}/$(scriptsdir)
+-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/texmf.cnf_fix.patch
b/latex/texlive/texmf.cnf_fix.patch
index deb0fa0..49fb141 100644
--- a/latex/texlive/texmf.cnf_fix.patch
+++ b/latex/texlive/texmf.cnf_fix.patch
@@ -1,15 +1,15 @@
---- texk/kpathsea/texmf.cnf
-+++ texk/kpathsea/texmf.cnf
-@@ -49,7 +49,7 @@
- % (http://tug.org/tds), or files may not be found.
- %
+--- 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 = $SELFAUTODIR/share
++TEXMFROOT = $SELFAUTOPARENT/usr/share

% The tree containing runtime files related to the specific
% distribution and version.
-@@ -59,10 +59,10 @@ TEXMFMAIN = $TEXMFROOT/texmf
+@@ -61,10 +61,10 @@
TEXMFDIST = $TEXMFROOT/texmf-dist

% Local additions to the distribution trees.



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (e7d4590924dbf3139aaa483d12e1bd36f236c068), Florian Franzmann, 09/16/2012

Archive powered by MHonArc 2.6.24.

Top of Page