2 files changed, 49 insertions, 74 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 25a14b8fda5..2f4210ee945 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-02  Karl Berry  <karl@tug.org>
+
+	* texmf.cnf (TEXMFROOT): new variable, $SELFAUTOPARENT by default,
+	to minimize redistributors' patches with a new Perl updmap.
+
 2011-01-06  Karl Berry  <karl@tug.org>
 
 	* tex-file.c (LUA_SUFFIXES): add .tlu,
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index d80fea7a37a..f462563dc94 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -35,90 +35,60 @@
 % A leading/trailing/doubled path separator in the paths will be
 %   expanded into the compile-time default. Probably not what you want.
 %
-
 % Brace notation is supported, for example: /usr/local/{mytex,othertex}
-% expands to /usr/local/mytex:/usr/local/othertex.  You can use the path
-% separator as well as the comma for this: /usr/local/{mytex:othertex}
-% also expands to /usr/local/mytex:/usr/local/othertex.  We make
-% extensive use of this.
+% expands to /usr/local/mytex:/usr/local/othertex.  We make extensive
+% use of this.
 
 
 %  Part 1: Search paths and directories.
 
-% You can set an environment variable to override TEXMF if you're testing
-% a new TeX tree, without changing anything else.
+% This is the parent directory of our several trees, i.e.,
+% /usr/local/texlive/YYYY in the original TeX Live distribution.
 %
-% You may wish to use one of the $SELFAUTO... variables here so TeX will
-% find where to look dynamically.  See the manual and the definition
-% below of TEXMFCNF.
-
-% The tree containing the runtime files closely related to the specific
-% program version used:
-TEXMFMAIN = $SELFAUTOPARENT/texmf
-
-% The main distribution tree:
-TEXMFDIST = $SELFAUTOPARENT/texmf-dist
-
-% A place for local additions to a "standard" texmf tree.
-% This tree is not used for local configuration maintained by
-% texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
-
-% TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
-% With teTeX-3.0 or later, this must be set.
-% For sharing this tree with $TEXMFMAIN:
-%   TEXMFSYSVAR = $TEXMFMAIN
-% For using a separate tree:
-%   TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
-TEXMFSYSVAR = $SELFAUTOPARENT/texmf-var
-
-% TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
-% With teTeX-3.0 or later, this must be set.
-% For sharing this tree with $TEXMFMAIN:
-%   TEXMFSYSCONFIG = $TEXMFMAIN
-% For using a separate tree:
-%   TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-TEXMFSYSCONFIG = $SELFAUTOPARENT/texmf-config
-
-% User texmf trees are allowed as follows.
-% This used to be HOMETEXMF.
+% Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+TEXMFROOT = $SELFAUTOPARENT
+
+% The tree containing runtime files related to the specific
+% distribution and version:
+TEXMFMAIN = $TEXMFROOT/texmf
+
+% The main tree of packages, distribution-agnostic:
+TEXMFDIST = $TEXMFROOT/texmf-dist
+
+% Local additions to the distribution trees.
+TEXMFLOCAL = $TEXMFROOT/../texmf-local
+
+% TEXMFSYSVAR, where *-sys store cached runtime data.
+TEXMFSYSVAR = $TEXMFROOT/texmf-var
+
+% TEXMFSYSCONFIG, where *-sys store configuration data.
+TEXMFSYSCONFIG = $TEXMFROOT/texmf-config
+
+% Per-user texmf trees.  To define more than one per-user tree, set this
+% to a list of directories in braces, as described above.
+% (This used to be HOMETEXMF.)
 % ~ expands to %USERPROFILE% on Window, $HOME otherwise.
 TEXMFHOME = ~/texmf
 
-% TEXMFVAR, where texconfig stores variable runtime data.
-% With teTeX-3.0 or later, this must be set.
-% For sharing this tree with $TEXMFMAIN:
-%   TEXMFVAR = $TEXMFMAIN
-% For using a separate tree:
-%   TEXMFVAR = ~/.texmf-var  % teTeX 3.0 default
+% TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
 TEXMFVAR = ~/.texlive2010/texmf-var
 
-% TEXMFCONFIG, where texconfig stores configuration data.
-% With teTeX-3.0 or later, this must be set.
-% For sharing this tree with $TEXMFMAIN:
-%   TEXMFCONFIG = $TEXMFMAIN
-% For using a separate tree:
-%   TEXMFCONFIG = ~/.texmf-config  % teTeX 3.0 default
-% For using a separate tree:
-%   TEXMFCONFIG = $SELFAUTOPARENT/texmf-config
+% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
 TEXMFCONFIG = ~/.texlive2010/texmf-config
 
-% Now, list all the texmf trees. If you have multiple trees you can
-% use shell brace notation, like this:
-%   TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN}
-% The braces are necessary.
+% List all the texmf trees.
 %
 % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
 % explicitly and before all other trees.
 % 
 % TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the
 % files in TEXMFMAIN are tightly coupled with the particular version of
-% the distribution, such as format files.  Overriding them would be more
-% likely to cause trouble than help.  On the other hand, all the
-% standard packages and fonts are in TEXMFDIST, and locally-installed
-% versions should take precedence over those (although it is generally a
-% source of confusion to have different versions of a package installed,
-% whatever the trees, so try to avoid it).
+% the distribution, such as configuration files.  Overriding them would
+% be more likely to cause trouble than help.  On the other hand, the
+% bulk of packages and fonts are in TEXMFDIST, and locally-installed
+% versions should take precedence over those -- although it is generally
+% a source of confusion to have different versions of a package
+% installed, whatever the trees, so try to avoid it.
 TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
 
 % Where to look for ls-R files.  There need not be an ls-R in the
@@ -129,7 +99,7 @@ TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T
 % This is arguably a bug in kpathsea.
 TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
 
-% The system trees.  These are the trees that are shared by all the users.
+% The system trees.  These are the trees that are shared by all 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.
@@ -392,8 +362,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
 % For xdvi to find mime.types and .mailcap, if they do not exist in
 % ~.  These are single directories, not paths.
 % (But the default mime.types, at least, may well suffice.)
-MIMELIBDIR = $SELFAUTOPARENT/etc
-MAILCAPLIBDIR = $SELFAUTOPARENT/etc
+MIMELIBDIR = $TEXMFROOT/etc
+MAILCAPLIBDIR = $TEXMFROOT/etc
 
 % Default settings for fontconfig library, used by Windows versions of
 % xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores this.
@@ -612,12 +582,12 @@ TEX = etex
 BIBTEX_CSFILE = 88591lat.csf
 
 % This variable is specific to Windows.  It must be set to 0 or 1.  It
-% tells script wrappers to use an already installed Perl interpreter (if
-% found on the search path) in preference to the Perl shipped with TeX
-% Live.  Thus, it may be useful if you installed a full Perl
-% distribution installed and need to run Perl programs from TL that use
-% additional modules we don't provide.  (The TL Perl does provide all
-% the standard modules.)
+% tells script wrappers to use an already installed Perl interpreter if
+% one is found on the search path, in preference to the Perl shipped
+% with TeX Live.  Thus, it may be useful if you (a) installed a full
+% Perl distribution for general use, and (b) need to run Perl programs
+% from TL that use additional modules we don't provide.  The TL Perl
+% does provide all the standard modules.
 %
 %TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0