Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=texlive2013.git;a=commitdiff;h=25ffd5fcb281f59b384e4848b4acb9af6dc50f62

commit 25ffd5fcb281f59b384e4848b4acb9af6dc50f62
Author: Elentir <[email protected]>
Date:   Tue Aug 27 11:12:14 2013 +0200

texlive-20130530-3-x86_64

* replace texmf.cnf with the proper one

diff --git a/source/xapps-extra/texlive/FrugalBuild 
b/source/xapps-extra/texlive/FrugalBuild
index 724455f..dd525c4 100644
--- a/source/xapps-extra/texlive/FrugalBuild
+++ b/source/xapps-extra/texlive/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=texlive
pkgver=20130530
-pkgrel=2
+pkgrel=3
pkgdesc="A complete TeX distribution"
archs=('i686' 'x86_64')
depends=('t1lib' 'gd' 'ncurses' 'poppler>=0.20.3' 'icu4c>=4.8' 'zlib=1.2.7')
diff --git a/source/xapps-extra/texlive/texmf.cnf 
b/source/xapps-extra/texlive/texmf.cnf
index 365264a..c51060d 100644
--- a/source/xapps-extra/texlive/texmf.cnf
+++ b/source/xapps-extra/texlive/texmf.cnf
@@ -1,12 +1,12 @@
-% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for 
kpathsea.
+% texmf.cnf for TeXLive/Frugalware -- runtime path configuration file for 
kpathsea.
% Public domain.
-%
+%
% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
% updated.  Instead, put your changes -- and only your changes, not an
-% entire copy! -- in ../../texmf.cnf.  That is, if this file is
-% installed in /some/path/to/texlive/2013/texmf-dist/web2c/texmf.cnf,
-% add your custom settings to /some/path/to/texlive/2013/texmf.cnf.
-%
+% entire copy of the full texmf.cnf! -- in ../../texmf.cnf.  That is, if
+% this file is installed in /some/path/to/texlive/2011/texmf/web2c/texmf.cnf,
+% add your custom settings to /some/path/to/texlive/2011/texmf.cnf.
+%
% What follows is a super-summary of what this .cnf file can
% contain. Please read the Kpathsea manual for more information.
%
@@ -49,16 +49,14 @@
% (http://tug.org/tds), or files may not be found.
%
% 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 = $SELFAUTODIR/share

-% The main tree of distributed packages and programs:
-TEXMFDIST = $TEXMFROOT/texmf-dist
+% The tree containing runtime files related to the specific
+% distribution and version.
+TEXMFMAIN = $TEXMFROOT/texmf

-% We used to have a separate /texmf tree with some core programs and files.
-% Keep the variable name.
-TEXMFMAIN = $TEXMFDIST
+% The main tree of packages, distribution-agnostic:
+TEXMFDIST = $TEXMFROOT/texmf-dist

% Local additions to the distribution trees.
TEXMFLOCAL = /usr/local/share/texmf;/usr/share/texmf
@@ -81,17 +79,20 @@ TEXMFVAR = ~/.texlive/texmf-var
% TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
TEXMFCONFIG = ~/.texlive/texmf-config

-% List all the texmf trees. For an explanation of what they are, see the
-% TeX Live manual.
+% List all the texmf trees.
%
% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
% explicitly and before all other trees.
-%
-% TEXMFLOCAL precedes TEXMFDIST because locally-installed versions
-% should take precedence over distribution files -- 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,!!$TEXMFLOCAL,!!$TEXMFDIST}
+%
+% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the
+% files in TEXMFMAIN are tightly coupled with the particular version of
+% 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
% directories in this path, but if there is one, Kpathsea will use it.
@@ -99,19 +100,13 @@ TEXMF = 
{$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$T
% 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.
-TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFDIST}
+TEXMFDBS = 
{!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}

% 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.
-SYSTEXMF = $TEXMFSYSVAR;$TEXMFLOCAL;$TEXMFDIST
-
-% First writable tree here is used by Lua(La)TeX for the font cache.
-% LuaLaTeX uses the value here, while ConTeXt uses the same variable but
-% from texmfcnf.lua; therefore the two values should be kept in sync.
-% (As should everything else in texmf.cnf <-> texmfcnf.lua.)
-TEXMFCACHE = $TEXMFSYSVAR;$TEXMFVAR
+SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST

% 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
@@ -205,33 +200,9 @@ TEXINPUTS.xelatex       = 
.;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
TEXINPUTS.xeplain       = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}//
TEXINPUTS.xetex         = .;$TEXMF/tex/{xetex,plain,generic,}//

-% Omega / Aleph.
-TEXINPUTS.aleph         = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.elambda       = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.eomega        = .;$TEXMF/tex/{plain,generic,}//
-TEXINPUTS.lambda        = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.lamed         = .;$TEXMF/tex/{lambda,latex,generic,}//
-TEXINPUTS.omega         = .;$TEXMF/tex/{plain,generic,}//
-
-% p(La)TeX.
-TEXINPUTS.ptex          = .;$TEXMF/tex/{ptex,plain,generic,}//
-TEXINPUTS.platex        = .;$TEXMF/tex/{platex,latex,generic,}//
-
-% epTeX, and for pmpost.
-TEXINPUTS.eptex         = .;$TEXMF/tex/{ptex,plain,generic,}//
-TEX.pmpost = eptex
-
-% (e)up(La)TeX.
-TEXINPUTS.uplatex = .;$TEXMF/tex/{uplatex,platex,latex,generic,}//
-TEXINPUTS.uptex   = .;$TEXMF/tex/{uptex,ptex,plain,generic,}//
-TEXINPUTS.euptex  = .;$TEXMF/tex/{uptex,ptex,plain,generic}//
-
-% pBibTeX bibliographies and style files.
-BIBINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bib//
-BSTINPUTS.pbibtex       = .;$TEXMF/{pbibtex,bibtex}/bst//

% ConTeXt.
-TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic}//
+TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic,}//

% jadetex.
TEXINPUTS.jadetex       = .;$TEXMF/tex/{jadetex,latex,generic,}//
@@ -314,10 +285,6 @@ BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}//
MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}//
MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}//

-% .ris and .bltxml bibliography formats.
-RISINPUTS = .;$TEXMF/bibtex/ris//
-BLTXMLINPUTS = .;$TEXMF/bibtex/bltxml//
-
% MFT style files.
MFTINPUTS = .;$TEXMF/mft//

@@ -340,7 +307,7 @@ AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
% TrueType outline fonts.
TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//

-% OpenType outline fonts.
+% Opentype outline fonts.
OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//

% Type 42 outline fonts.
@@ -364,6 +331,9 @@ CMAPFONTS = .;$TEXMF/fonts/cmap//
% Subfont definition files.
SFDFONTS = .;$TEXMF/fonts/sfd//

+% OpenType outline fonts.
+OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
+
% OpenType feature files (.fea).
FONTFEATURES=.;$TEXMF/fonts/fea//

@@ -383,13 +353,11 @@ MPSUPPORT = .;$TEXMF/metapost/support
MIMELIBDIR = /etc
MAILCAPLIBDIR = /etc

-% Default settings for the fontconfig library as used by the Windows
-% versions of xetex/xdvipdfmx.  Not used by xetex on Unixish systems.
-% ConTeXT MkIV (all platforms) also use these values.
-%
-FONTCONFIG_FILE = fonts.conf
-FONTCONFIG_PATH = $TEXMFSYSVAR/fonts/conf
-FC_CACHEDIR = $TEXMFSYSVAR/fonts/cache
+% Default settings for fontconfig library, used by Windows versions of
+% xetex/xdvipdfmx.  On Unixish systems, fontconfig ignores this.
+FONTCONFIG_FILE=fonts.conf
+FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf
+FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache

% TeX documentation and source files, for use with texdoc and kpsewhich.
TEXDOCS = $TEXMF/doc//
@@ -424,19 +392,10 @@ TW_INIPATH = $TW_LIBPATH
% would allow command execution.
DVIPDFMXINPUTS = $TEXMF/dvipdfmx

+% Find scripts that are distributed/installed in the texmf tree.
+
% Lua needs to look in TEXINPUTS for lua scripts distributed with packages.
-%
-% But we can't simply use $TEXINPUTS, since then if TEXINPUTS is set in
-% the environment with a colon, say, TEXINPUTS=/some/dir:, the intended
-% default expansion of TEXINPUTS will not happen and .lua files under
-% the /tex/ will not be found.
-%
-% So, duplicate the TEXINPUTS.*lualatex values as LUAINPUTS.*lualatex.
-% The default LUAINPUTS suffices for luatex and dviluatex.
-%
-LUAINPUTS.lualatex = 
.;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS.dvilualatex = 
.;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-LUAINPUTS = 
.;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXMF/tex/{luatex,plain,generic,}//
+LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS

% Lua needs to look for binary lua libraries distributed with packages.
CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua//
@@ -458,63 +417,17 @@ RUBYINPUTS   = 
.;$TEXMF/scripts/{$progname,$engine,}/ruby//
% paradoxical), but the compile-time default in paths.h is built from it.
% The SELFAUTO* variables are set automatically from the location of
% argv[0], in kpse_set_program_name.
-%
+%
% This main texmf.cnf file is installed, for a release YYYY, in a
-% directory such as /usr/local/texlive/YYYY/texmf-dist/web2c/texmf.cnf.
+% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf.
% Since this file is subject to future updates, the TeX Live installer
% or human administrator may also create a file
% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file
-% will take precedence over the distributed one.
-%
-% For security reasons, it is best not to include . in this path.
-%
-% The idea behind this lengthy definition: for each of
-% SELFAUTO{LOC,DIR,PARENT}, look in the directory,
-% then the subdirectories share/texmf-local, share/texmf-dist, share/texmf,
-% then the subdirectories ./texmf-local, texmf-dist, ./texmf.
-% At any given installation, most of these directories will not exist,
-% but they all turn out to be useful somewhere.
-%
-% Special addition -- we want to include one more directory: the
-% great-grandparent's texmf-local, because that is how TL is installed
-% by default.  That is, given a binary
-% /usr/local/texlive/YYYY/bin/PLATFORM/kpsewhich, it should find
-% /usr/local/texlive/texmf-local/web2c/texmf.cnf.  I.e., not under YYYY.
-%
-% As a result, we cannot use actual brace expansion in the definition,
-% since we don't want to scatter ../'s throughout the value.  Hence we
-% explicitly list every directory.  Arguably more understandable anyway.
-%
-TEXMFCNF = {\
-$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,\
-$SELFAUTOLOC/share/texmf-dist/web2c,\
-$SELFAUTOLOC/share/texmf/web2c,\
-$SELFAUTOLOC/texmf-local/web2c,\
-$SELFAUTOLOC/texmf-dist/web2c,\
-$SELFAUTOLOC/texmf/web2c,\
-\
-$SELFAUTODIR,\
-$SELFAUTODIR/share/texmf-local/web2c,\
-$SELFAUTODIR/share/texmf-dist/web2c,\
-$SELFAUTODIR/share/texmf/web2c,\
-$SELFAUTODIR/texmf-local/web2c,\
-$SELFAUTODIR/texmf-dist/web2c,\
-$SELFAUTODIR/texmf/web2c,\
-\
-$SELFAUTOPARENT/../texmf-local/web2c,\
-$SELFAUTOPARENT,\
-\
-$SELFAUTOPARENT/share/texmf-local/web2c,\
-$SELFAUTOPARENT/share/texmf-dist/web2c,\
-$SELFAUTOPARENT/share/texmf/web2c,\
-$SELFAUTOPARENT/texmf-local/web2c,\
-$SELFAUTOPARENT/texmf-dist/web2c,\
-$SELFAUTOPARENT/texmf/web2c\
-}
-%
-% For reference, here is the old brace-using definition:
-%TEXMFCNF = 
{$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
+% will take precedence over the distributed one under texmf/web2c.
+%
+% For security reasons, it is better not to include . in this path.
+%
+TEXMFCNF = 
{$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}

% kpathsea 3.5.3 and later sets these at runtime. To avoid empty
% expansions from binaries linked against an earlier version of the
@@ -550,19 +463,18 @@ try_std_extension_first = t
shell_escape = p

% No spaces in this command list.
-%
+%
% The programs listed here are as safe as any we know: they either do
% not write any output files, respect openout_any, or have hard-coded
% restrictions similar or higher to openout_any=p.  They also have no
% features to invoke arbitrary other programs, and no known exploitable
% bugs.  All to the best of our knowledge.  They also have practical use
% for being called from TeX.
-%
+%
shell_escape_commands = \
bibtex,bibtex8,\
kpsewhich,\
makeindex,\
-mpost,\
repstopdf,\

% we'd like to allow:
@@ -587,7 +499,7 @@ shell_escape.initex = f
% for the purportedly safe shell_escape_commands above to system
% directories.
TEXMF_RESTRICTED_SCRIPTS = \
-  {!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//
+  {!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}/scripts/{$progname,$engine,}//

% Allow TeX \openin, \openout, or \input on filenames starting with `.'
% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)?
@@ -651,8 +563,7 @@ TEX = etex
% interactive `e' option.  %d is replaced by the line number and %s by
% the current filename.  The default is specified at compile-time, and
% we let that stay in place since different platforms like different values.
-%TEXEDIT = vi +%d '%s'                    % default for Unix
-%TEXEDIT = texworks --position=+%d "%s"   % default for Windows
+%TEXEDIT = vi +%d "%s"
%MFEDIT = ${TEXEDIT}
%MPEDIT = ${TEXEDIT}

@@ -660,18 +571,6 @@ TEX = etex
% given as command line option or environment variable.
BIBTEX_CSFILE = 88591lat.csf

-% This variable is specific to Windows.  It must be set to 0 or 1.  The
-% default is 0.  Setting it to 1 tells the Windows 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 both (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 Perl modules.
-%
-%TEXLIVE_WINDOWS_TRY_EXTERNAL_PERL = 0
-
-
%  Part 3: Array and other sizes for TeX (and Metafont).
%
% If you want to change some of these sizes only for a certain TeX
@@ -694,7 +593,7 @@ BIBTEX_CSFILE = 88591lat.csf
% For some xy-pic samples, you may need as much as 700000 words of memory.
% For the vast majority of documents, 60000 or less will do.
%
-main_memory = 5000000 % words of inimemory available; also applies to inimf&mp
+main_memory = 3000000 % words of inimemory available; also applies to inimf&mp
extra_mem_top = 0     % extra high memory for chars, tokens, etc.
extra_mem_bot = 0     % extra low memory for boxes, glue, breakpoints, etc.

@@ -704,17 +603,17 @@ extra_mem_bot.context = 4000000

% Words of font info for TeX (total size of all TFM files, approximately).
% Must be >= 20000 and <= 147483647 (without tex.ch changes).
-font_mem_size = 8000000
+font_mem_size = 3000000

% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes).
font_max = 9000

% Extra space for the hash table of control sequences.
-hash_extra = 600000
+hash_extra = 200000

% Max number of characters in all strings, including all error messages,
% help texts, font names, control sequences.  These values apply to TeX.
-pool_size = 6250000
+pool_size = 3250000
% Minimum pool space after TeX's own strings; must be at least
% 25000 less than pool_size, but doesn't need to be nearly that large.
string_vacancies = 90000
@@ -739,17 +638,12 @@ trie_size = 1000000
hyph_size = 8191        % prime number of hyphenation exceptions, >610, <32767.
% http://primes.utm.edu/curios/page.php/8191.html
nest_size = 500         % simultaneous semantic levels (e.g., groups)
-max_in_open = 15        % simultaneous input files and error insertions,
+max_in_open = 15        % simultaneous input files and error insertions,
% also applies to MetaPost
param_size = 10000      % simultaneous macro parameters, also applies to MP
-save_size  = 100000     % for saving values outside current group
+save_size = 50000       % for saving values outside current group
stack_size = 5000       % simultaneous input sources

-% These are Omega-specific.
-ocp_buf_size = 500000   % character buffers for ocp filters.
-ocp_stack_size = 10000  % stacks for ocp computations.
-ocp_list_size = 1000    % control for multiple ocps.
-
% These work best if they are the same as the I/O buffer size, but it
% doesn't matter much.  Must be a multiple of 8.
dvi_buf_size = 16384 % TeX
@@ -770,7 +664,7 @@ screen_depth.mf = 1200

% BibTeX only (max_strings also determines hash_size and hash_prime).
ent_str_size =  250
-glob_str_size = 20000
+glob_str_size = 5000
max_strings.bibtex = 35307
max_strings.bibtex8 = 35307
max_strings.bibtexu = 35307
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to