--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- texk/kpathsea/texmf.in
+++ texk/kpathsea/texmf.in
@@ -61,6 +61,9 @@ 
 % The main distribution tree:
 TEXMFDIST = /usr/share/texmf-dist
 
+% Additional documents:
+TEXMFDOC = /usr/share/texmf-doc
+
 % The Gentoo site tree
 TEXMFSITE = /usr/share/texmf-site
 
@@ -69,6 +72,9 @@ 
 % texconfig, it uses TEXMFCONFIG below.
 TEXMFLOCAL = /usr/local/share/texmf
 
+% Additions to the locals:
+TEXMFADD = /usr/local/share/texmf-add
+
 % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
 % With teTeX-3.0 or later, this must be set.
 % For sharing this tree with $TEXMFMAIN:
@@ -95,7 +101,7 @@ 
 %   TEXMFVAR = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFVAR = $HOME/.texmf-var  # teTeX 3.0 default
-TEXMFVAR = $HOME/.texmf-var
+TEXMFVAR = /var/lib/texmf
 
 % TEXMFCONFIG, where texconfig stores configuration data.
 % With teTeX-3.0 or later, this must be set.
@@ -105,7 +111,7 @@ 
 %   TEXMFCONFIG = $HOME/.texmf-config  # teTeX 3.0 default
 % For using a separate tree:
 %   TEXMFCONFIG = @texmf@-config
-TEXMFCONFIG = $HOME/.texmf-config
+TEXMFCONFIG = /var/lib/texmf
 
 % Now, list all the texmf trees. If you have multiple trees you can
 % use shell brace notation, like this:
@@ -114,18 +120,18 @@ 
 %
 % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
 % explicitly and before all other trees.
-TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST}
+TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFADD,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST,!!$TEXMFDOC}
 
 % The system trees.  These are the trees that are shared by all the users.
 % If a tree appears in this list, the mktex* scripts will use
 % VARTEXFONTS for generated files, if the original tree isn't writable;
 % otherwise the current working directory is used.
-SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST;$TEXMFSITE
+SYSTEXMF = $TEXMFADD;$TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST;$TEXMFDOC;$TEXMFSITE
 
 % Where generated fonts may be written.  This tree is used when the sources
 % were found in a system tree and either that tree wasn't writable, or the
 % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = /var/tmp/texfonts
+VARTEXFONTS = /var/cache/fonts
 
 % Where to look for ls-R files.  There need not be an ls-R in the
 % directories in this path, but if there is one, Kpathsea will use it.
@@ -134,8 +140,8 @@ 
 % does not create ls-R files in the non-!! elements -- because if an
 % ls-R is present, it will be used, and the disk will not be searched.
 % This is arguably a bug in kpathsea, but we will not think about it now.
-% 
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
+%
+TEXMFDBS = {!!$TEXMFCONFIG,!!$TEXMFVAR,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFADD,!!$TEXMFLOCAL,!!$TEXMFSITE,!!$TEXMFDIST,!!$TEXMFDOC}
 
 % It may be convenient to define TEXMF like this:
 %   TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME}