- teTeX-3.0 support

- bump PORTREVISION

7 files changed, 471 insertions, 89 deletions

diff --git a/japanese/texfamily/files/language.dat b/japanese/texfamily/files/language.dat
new file mode 100644
index 000000000000..0ebb566e2edf
--- /dev/null
+++ b/japanese/texfamily/files/language.dat
@@ -0,0 +1,101 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% File    : language.dat
+% Purpose : specify which hypenation patterns to load 
+%           while running iniTeX 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% CAUTION: the first language will be the default if no style-file
+%          (e.g. german.sty) is used.
+% Since version 3.0 of TeX, hyphenation patterns for multiple languages are
+% possible. Unless you know what you are doing, please let the american
+% english patterns be the first ones. The babel system allows you to
+% easily change the active language for your texts. For more information,
+% have a look to the documentation in texmf/doc/generic/babel.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% The hyphenation pattern files are in the dirctory:
+%	texmf/tex/generic/hyphen
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% The US-english patterns should be loaded *always* and as *first* ones.
+% Define USenglish as an alias for american.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+american ushyph1.tex
+=USenglish
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% UK english, TWO LINES! To enable these lines, remove %! and the space.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%! british  ukhyphen.tex % unavailable in teTeX due to license problem!
+%! =UKenglish
+
+% english should always be defined. Either an alias for american or british.
+=english
+
+% French, TWO lines!
+%%french		frhyph.tex
+%%=patois
+
+%%german		dehypht.tex
+%%=austrian
+
+% For use with ngerman.sty (neue Rechtschreibung):
+%%ngerman		dehyphn.tex
+%%=naustrian
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% The following languages are disabled by default. Uncomment, what you need.
+% To enable, remove %! and the space.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%bahasa	inhyph.tex
+%basque	bahyph.tex
+%catalan	cahyph.tex
+%croatian	hrhyph.tex
+%czech	czhyph.tex  % depends on other files from tex/csplain
+%danish	dkhyphen.tex
+%dutch	nehyph.tex
+%esperanto	eohyph.tex
+%estonian	eehyph.tex
+%finnish	fi8hyph.tex
+%greek	grhyph.tex
+%icelandic	icehyph.tex
+%irish	gahyph.tex
+%italian	ithyph.tex
+%latin	lahyph.tex
+%magyar	huhyphn.tex
+%! norsk	nohyph.tex      % old file
+%norsk	nohyphb.tex     % see texmf/doc/generic/nohyph/README.nohyph
+%! norsk	nohyphbc.tex    % see texmf/doc/generic/nohyph/README.nohyph
+%polish	plhyph.tex
+%portuges	pt8hyph.tex
+%romanian	rohyphen.tex
+%russian	ruhyphen.tex	% note: edit ruhyphen.tex for your encoding!
+%serbian	srhyphc.tex     % Serbian Cyrillic Hyphenation Patterns
+%slovak	skhyph.tex      % depends on csplain being installed
+%slovene	sihyph23.tex
+%spanish	eshyph.tex
+%swedish	sehyph.tex
+%turkish	trhyph.tex
+
+% For Ukrainian, either use ukrhyph.tex (and edit that file for the encoding
+% that you need) or use one of the ukrhyph.ENC files.
+%ukrainian	ukrhyph.tex
+%! ukrainian	ukrhyph.t2a
+%! ukrainian	ukrhyph.lcy
+%! ukrainian	ukrhyph.ot2
+
+
+% A "language" without hyphenation:
+nohyphenation zerohyph.tex
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Please contact me, if for any of the following languages there are
+% freely available hyphenation tables:
+%	galician
+% I might want to include them in a future version of this file.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Email   : Thomas Esser, te@dbs.uni-hannover.de
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/japanese/texfamily/files/patch-texk::kpathsea::Makefile.in b/japanese/texfamily/files/patch-texk::kpathsea::Makefile.in
index 149e8c2a601c..bbd9bed87880 100644
--- a/japanese/texfamily/files/patch-texk::kpathsea::Makefile.in
+++ b/japanese/texfamily/files/patch-texk::kpathsea::Makefile.in
@@ -1,6 +1,23 @@
---- texk/kpathsea/Makefile.in.orig	Sat Jun 12 22:19:50 2004
-+++ texk/kpathsea/Makefile.in	Sat Jun 12 22:20:24 2004
-@@ -127,7 +127,7 @@
+--- texk/kpathsea/Makefile.in.orig	Tue Apr 18 02:35:59 2000
++++ texk/kpathsea/Makefile.in	Sun Feb  6 07:15:00 2005
+@@ -86,7 +86,16 @@
+ # likely to have been mangled as well.
+ 	echo '/^ *TEXMFMAIN[ =]/s%\$$TEXMF%$(texmf)%' >>$@
+ 	echo '/^[% ]*TEXMFLOCAL[ =]/s%\$$TEXMF%$(texmf)%' >>$@
++	echo '/^[% ]*TEXMFDIST[ =]/s%\$$TEXMF%$(texmf)%' >>$@
+ 	echo '/^[% ]*VARTEXMF[ =]/s%\$$TEXMF%$(texmf)%' >>$@
++	echo '/^[% ]*TEXMFSYSVAR[ =]/s%\$$TEXMF%$(texmf)%' >>$@
++	echo '/^[% ]*TEXMFSYSCONFIG[ =]/s%\$$TEXMF%$(texmf)%' >>$@
++	echo '/^[% ]*TEXMFSYSVAR[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
++	echo '/^[% ]*TEXMFSYSCONFIG[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
++	echo '/^[% ]*TEXMFVAR[ =]/s%\$$TEXMF%$(texmf)%' >>$@
++	echo '/^[% ]*TEXMFCONFIG[ =]/s%\$$TEXMF%$(texmf)%' >>$@
++	echo '/^[% ]*TEXMFVAR[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
++	echo '/^[% ]*TEXMFCONFIG[ =]/s%$(texmf)MAIN%\$$TEXMFMAIN%' >>$@
+ 	echo '/^[% ]*TEXMFCNF[ =]/s%\$$TEXMF%$(texmf)%' >>$@
+ # And fill in the last clause of TEXMFCNF with an absolute path.
+ 	echo '/^ *TEXMFCNF[ =]/s%@web2c@%$(web2cdir)%' >>$@
+@@ -127,7 +136,7 @@
  	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1@#define DEFAULT_\1 "\2"@#endif/' \
  	| tr '@' '\012' \
  	| sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
diff --git a/japanese/texfamily/files/patch-texk::kpathsea::texmf.in b/japanese/texfamily/files/patch-texk::kpathsea::texmf.in
index ff786b919452..d381e4295835 100644
--- a/japanese/texfamily/files/patch-texk::kpathsea::texmf.in
+++ b/japanese/texfamily/files/patch-texk::kpathsea::texmf.in
@@ -1,44 +1,118 @@
 --- texk/kpathsea/texmf.in.orig	Tue May  2 17:32:40 2000
-+++ texk/kpathsea/texmf.in	Sat Jun 12 22:22:09 2004
-@@ -62,10 +62,10 @@
- 
- % If defined, teTeX's texconfig stores modifications here (instead of the
- % TEXMFMAIN tree).
++++ texk/kpathsea/texmf.in	Sun Feb  6 07:03:19 2005
+@@ -54,30 +54,57 @@
+ % find where to look dynamically.  See the manual and the definition
+ % below of TEXMFCNF.
+ 
+-% The main tree, which must be mentioned in $TEXMF, below:
++% The tree containing the runtime files closely related to the specific
++% program version used:
+ TEXMFMAIN = @texmf@
+ 
+-% A place for local additions to a "standard" texmf tree.  For example:
+-TEXMFLOCAL = @texmflocal@
++% The main distribution tree:
++TEXMFDIST = @texmf@-dist
+ 
+-% If defined, teTeX's texconfig stores modifications here (instead of the
+-% TEXMFMAIN tree).
 -%   VARTEXMF = @texmf@-var
-+VARTEXMF = @texmf@-var
++% 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 = @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 = @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 = @texmf@-config
  
  % User texmf trees can be catered for like this...
 -%   HOMETEXMF = $HOME/texmf
-+HOMETEXMF = $HOME/texmf
- 
- % Now, list all the texmf trees. If you have multiple trees you can
- % use shell brace notation, like this:
-@@ -74,7 +74,8 @@
- %   - list $VARTEXMF in the TEXMF definition;
- %   - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
- %TEXMF = !!$TEXMFMAIN
++% This used to be HOMETEXMF.
++TEXMFHOME = $HOME/texmf
+ 
+-% Now, list all the texmf trees. If you have multiple trees you can
+-% use shell brace notation, like this:
+-%   TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
+-% The braces are necessary.  If you set VARTEXMF, you also have to
+-%   - list $VARTEXMF in the TEXMF definition;
+-%   - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
+-%TEXMF = !!$TEXMFMAIN
 -TEXMF = {!!$TEXMFLOCAL,!!$TEXMFMAIN}
-+%TEXMF = {!!$TEXMFLOCAL,!!$TEXMFMAIN}
-+TEXMF = {$HOMETEXMF,!!$VARTEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
++% 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 = $HOME/.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 = $HOME/.texmf-config
++
++% Now, list all the texmf trees.
++% The braces are necessary. 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,!!$TEXMFDIST}
  
  % The system trees.  These are the trees that are shared by all the users.
- SYSTEXMF = $TEXMF
-@@ -132,6 +133,14 @@
- TEXINPUTS.eplain  = .;$TEXMF/tex/{eplain,plain,generic,}//
- TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}//
- TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
-+
-+% pTeX.
-+ptex_inputs = .;$TEXMF/{ptex,tex}/{plain,generic,}//
-+platex209_inputs = .;$TEXMF/{ptex,tex}/{platex209,plain,platex,}//
-+platex2e_inputs = .;$TEXMF/{ptex,tex}/{platex,latex,generic,}//
-+TEXINPUTS.platex209 = $platex209_inputs
-+TEXINPUTS.platex = $platex2e_inputs
-+TEXINPUTS.ptex = $ptex_inputs
- TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}//
- TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
- 
-@@ -150,9 +159,6 @@
+-SYSTEXMF = $TEXMF
++SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$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
+@@ -92,23 +119,23 @@
+ TEXMFDBS = $TEXMF;$VARTEXFONTS
+ 
+ % It may be convenient to define TEXMF like this:
+-%   TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME}
++%   TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN,$HOME}
+ % which allows users to set up entire texmf trees, and tells TeX to
+ % look in places like ~/tex and ~/bibtex.  If you do this, define TEXMFDBS
+ % like this:
+-%   TEXMFDBS = $HOMETEXMF;$TEXMFLOCAL;$TEXMFMAIN;$VARTEXFONTS
++%   TEXMFDBS = $TEXMFHOME;$TEXMFLOCAL;$TEXMFMAIN;$VARTEXFONTS
+ % or mktexlsr will generate an ls-R file for $HOME when called, which is
+ % rarely desirable.  If you do this you'll want to define SYSTEXMF like
+ % this:
+-%   SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN
++%   SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST
+ % so that fonts from a user's tree won't escape into the global trees.
+ %
+ % On some systems, there will be a system tree which contains all the font
+ % files that may be created as well as the formats.  For example
+-%   VARTEXMF = /var/lib/texmf
++%   TEXMFVAR = /var/lib/texmf
+ % is used on many Linux systems.  In this case, set VARTEXFONTS like this
+-%   VARTEXFONTS = $VARTEXMF/fonts
+-% and do not mention it in TEXMFDBS (but _do_ mention VARTEXMF).
++%   VARTEXFONTS = $TEXMFVAR/fonts
++% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR).
+ 
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+@@ -142,6 +169,7 @@
+ TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
+ %TEXINPUTS.platex  = .;$TEXMF/tex/{platex,latex,generic,}//
+ TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}//
++TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}//
+ TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}//
+ 
+ % TeXfamily
+@@ -150,51 +178,58 @@
  TEXINPUTS.jlatex209 = .:$TEXMF/{jtex,tex}/{latex209,generic,latex,}//
  TEXINPUTS.multex = .:$TEXMF/{multex,jtex,tex}/{plain,generic,}//
  TEXINPUTS.mullatex = .:$TEXMF/{multex,jtex,tex}/{latex,generic,}//
@@ -47,29 +121,81 @@
 -TEXINPUTS.platex209 = .:$TEXMF/{ptex,tex}/{latex209,generic,latex,}//
  
  % Fontinst needs to read afm files.
- TEXINPUTS.fontinst = .;$TEXMF/tex//;$TEXMF/fonts/afm//
-@@ -177,6 +183,7 @@
- TEXINPUTS.pdfmex   = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//
- TEXINPUTS.pdftex   = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
- TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,plain,generic,}//
-+TEXINPUTS.pdfamstex = .;$TEXMF/{pdftex,tex}/{amstex,plain,generic,}//
+-TEXINPUTS.fontinst = .;$TEXMF/tex//;$TEXMF/fonts/afm//
++TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
+ 
+ % MLTeX.
+-TEXINPUTS.frlatex = .;$TEXMF/{mltex,tex}/{french,latex,generic,}//
+-TEXINPUTS.frtex   = .;$TEXMF/{mltex,tex}/{french,plain,generic,}//
+-TEXINPUTS.mllatex = .;$TEXMF/{mltex,tex}/{latex,generic,}//
+-TEXINPUTS.mltex = .;$TEXMF/{mltex,tex}/{plain,generic,}//
++TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}//
++TEXINPUTS.frtex   = .;$TEXMF/tex/{french,plain,generic,}//
++TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}//
++TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}//
+ 
+ % e-TeX.  This form of the input paths is borrowed from teTeX.  A certain
+ % variant of TDS is assumed here, unaffected by the build variables.
+-TEXINPUTS.elatex   = .;$TEXMF/{etex,tex}/{latex,generic,}//
+-TEXINPUTS.etex     = .;$TEXMF/{etex,tex}/{plain,generic,}//
++TEXINPUTS.elatex   = .;$TEXMF/tex/{latex,generic,}//
++TEXINPUTS.etex     = .;$TEXMF/tex/{plain,generic,}//
+ 
+ % pdfTeX.  This form of the input paths is borrowed from teTeX.  A certain
+ % variant of TDS is assumed here, unaffected by the build variables.
+-TEXINPUTS.pdfcslatex = .;$TEXMF/{pdftex,tex}/{cslatex,csplain,latex,generic,}//
+-TEXINPUTS.pdfcsplain = .;$TEXMF/{pdftex,tex}/{csplain,plain,generic,}//
+-TEXINPUTS.pdfjadetex = .;$TEXMF/{pdftex,tex}/{jadetex,plain,generic,}//
+-TEXINPUTS.pdflatex = .;$TEXMF/{pdftex,tex}/{latex,generic,}//
+-TEXINPUTS.pdfmex   = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//
+-TEXINPUTS.pdftex   = .;$TEXMF/{pdftex,tex}/{plain,generic,}//
+-TEXINPUTS.pdftexinfo = .;$TEXMF/{pdftex,tex}/{texinfo,plain,generic,}//
++TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
++TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}//
++TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,plain,generic,}//
++TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}//
++TEXINPUTS.pdfmex   = .;$TEXMF/tex/{mex,plain,generic,}//
++TEXINPUTS.utf8mex   = .;$TEXMF/tex/{mex,plain,generic,}//
++TEXINPUTS.pdftex   = .;$TEXMF/tex/{plain,generic,}//
++TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}//
++TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}//
  
  % pdfeTeX.
- TEXINPUTS.pdfelatex = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{latex,generic,}//
-@@ -192,6 +199,12 @@
+-TEXINPUTS.pdfelatex = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{latex,generic,}//
+-TEXINPUTS.pdfetex   = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{plain,generic,}//
++TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}//
++TEXINPUTS.pdfetex   = .;$TEXMF/tex/{plain,generic,}//
+ 
+-% Omega.
+-TEXINPUTS.lambda = .;$TEXMF/{omega,tex}/{lambda,latex,generic,}//
+-TEXINPUTS.omega = .;$TEXMF/{omega,tex}/{plain,generic,}//
++% Omega / Aleph
++TEXINPUTS.lamed = .;$TEXMF/tex/{lamed,lambda,latex,generic,}//
++TEXINPUTS.lambda = .;$TEXMF/tex/{lambda,latex,generic,}//
++TEXINPUTS.omega = .;$TEXMF/tex/{plain,generic,}//
++TEXINPUTS.aleph = .;$TEXMF/tex/{plain,generic,}//
+ 
+ % Context macros by Hans Hagen:
+-TEXINPUTS.context = .;$TEXMF/{pdftex,etex,tex}/{context,plain,generic,}//
++TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}//
+ 
  % odd formats  needing their own paths
  TEXINPUTS.lamstex  = .;$TEXMF/tex/{lamstex,plain,generic,}//
  TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}//
-+TEXINPUTS.mex-pl = .;$TEXMF/tex/{mex,plain,generic,}//
 +TEXINPUTS.platex-pl  = .;$TEXMF/tex/{platex,latex,generic,}//
-+TEXINPUTS.pdfplatex = .;$TEXMF/{pdftex,tex}/{platex,latex,generic,}//
-+TEXINPUTS.pdfmex-pl = .;$TEXMF/{pdftex,tex}/{mex,plain,generic,}//
-+TEXINPUTS.pdfemex   = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{mex,plain,generic,}//
-+TEXINPUTS.pdfemex-pl = .;$TEXMF/{pdfetex,pdftex,etex,tex}/{mex,plain,generic,}//
++TEXINPUTS.pdfplatex = .;$TEXMF/tex/{platex,latex,generic,}//
++
++% XeTeX
++TEXINPUTS.xelatex = .;$TEXMF/tex/{latex,generic,}//
++TEXINPUTS.xetex   = .;$TEXMF/tex/{plain,generic,}//
  
  % Earlier entries override later ones, so put this last.
- TEXINPUTS = .;$TEXMF/tex/{generic,}//
-@@ -204,12 +217,12 @@
+-TEXINPUTS = .;$TEXMF/tex/{generic,}//
++TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
+ 
+ % Metafont, MetaPost inputs.
+ MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+@@ -204,12 +239,12 @@
  % and string pools (.pool) for ini{tex,mf,mp}.  It is silly that we have six
  % paths and directories here (they all resolve to a single place by default),
  % but historically ...
@@ -79,46 +205,90 @@
 -TEXPOOL = .;$TEXMF/web2c
 -MFPOOL = .;$TEXMF/web2c
 -MPPOOL = .;$TEXMF/web2c
-+TEXFORMATS = .;$TEXMF/web2c-jtex;$TEXMF/web2c
-+MFBASES = .;$TEXMF/web2c-jtex;$TEXMF/web2c
-+MPMEMS = .;$TEXMF/web2c-jtex;$TEXMF/web2c
-+TEXPOOL = .;$TEXMF/web2c-jtex;$TEXMF/web2c
-+MFPOOL = .;$TEXMF/web2c-jtex;$TEXMF/web2c
-+MPPOOL = .;$TEXMF/web2c-jtex;$TEXMF/web2c
++TEXFORMATS = .;$TEXMF/web2c{/jtex,}
++MFBASES = .;$TEXMF/web2c{/jtex,}
++MPMEMS = .;$TEXMF/web2c{/jtex,}
++TEXPOOL = .;$TEXMF/web2c{/jtex,}
++MFPOOL = .;$TEXMF/web2c{/jtex,}
++MPPOOL = .;$TEXMF/web2c{/jtex,}
  
  % Device-independent font metric files.
  VFFONTS = .;$TEXMF/fonts/vf//
-@@ -235,6 +248,12 @@
- % See ftp://ftp.tug.org/tex/fontname.tar.gz.
- TEXFONTMAPS = .;$TEXMF/fontname
- 
+@@ -231,21 +266,28 @@
+ % A place to puth everything that doesn't fit the other font categories.
+ MISCFONTS = .;$TEXMF/fonts/misc//
+ 
+-% For texfonts.map and included map files used by mktexpk.
+-% See ftp://ftp.tug.org/tex/fontname.tar.gz.
+-TEXFONTMAPS = .;$TEXMF/fontname
++% font name map files.
++TEXFONTMAPS = .;$TEXMF/fonts/map//
++
 +% support non"k"-xdvi:
 +PKFONTS.XDvi    = .:$TEXMF/%s:$VARTEXFONTS/pk/{%m,modeless}//
-+VFFONTS.XDvi    = .:$TEXMF/%s
++VFFONTS.XDvi    = .:$TEXMF/%s 
 +PSHEADERS.XDvi  = .:$TEXMF/%q{dvips,fonts/type1}//
 +TEXPICTS.XDvi   = .:$TEXMF/%q{dvips,tex}//
-+
- % BibTeX bibliographies and style files.
- BIBINPUTS = .;$TEXMF/bibtex/{bib,}//
- BSTINPUTS = .;$TEXMF/bibtex/{bst,}//
-@@ -246,6 +265,7 @@
  
- % PostScript headers, prologues (.pro), encodings (.enc) and fonts.
- TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}//
-+TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,pdftex,tex,fonts/{type1,truetype}}//
+ % BibTeX bibliographies and style files.
+-BIBINPUTS = .;$TEXMF/bibtex/{bib,}//
+-BSTINPUTS = .;$TEXMF/bibtex/{bst,}//
++BIBINPUTS = .;$TEXMF/bibtex/bib//
++BSTINPUTS = .;$TEXMF/bibtex/bst//
+ BIBINPUTS.jbibtex = .:$TEXMF/{jbibtex,bibtex}/{bib,}//
+ BSTINPUTS.jbibtex = .:$TEXMF/{jbibtex,bibtex}/{bst,}//
+ 
+ % MFT style files.
+ MFTINPUTS = .;$TEXMF/mft//
+ 
+-% PostScript headers, prologues (.pro), encodings (.enc) and fonts.
+-TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}//
++% PostScript headers and prologues (.pro); unfortunately, some programs
++% also use this for acessing font files (enc, type1, truetype)
++TEXPSHEADERS = .;$TEXMF/{dvips{/jtex,/ptex,},fonts/{enc,type1,type3}}//
++TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{/jtex,/ptex,},fonts/{enc,type1,type3,truetype}}//
  
  % PostScript Type 1 outline fonts.
  T1FONTS = .;$TEXMF/fonts/type1//
-@@ -260,7 +280,7 @@
+@@ -259,14 +301,34 @@
+ % Type 42 outline fonts.
  T42FONTS = .;$TEXMF/fonts/type42//
  
++% Ligature definition files.
++LIGFONTS =  .;$TEXMF/fonts/lig//
++
  % Dvips' config.* files (this name should not start with `TEX'!).
 -TEXCONFIG = .;$TEXMF/dvips//
-+TEXCONFIG = $TEXMF/dvips//
++TEXCONFIG = $TEXMF/dvips{/jtex,/ptex,}//
  
  % Makeindex style (.ist) files.
- INDEXSTYLE = .;$TEXMF/makeindex//
-@@ -279,6 +299,10 @@
+-INDEXSTYLE = .;$TEXMF/makeindex//
++INDEXSTYLE = .;$TEXMF/makeindex{/jtex,/ptex,}//
++
++% Font encoding files (.enc).
++ENCFONTS = .;$TEXMF/fonts/enc//
++
++% CMap files.
++CMAPFONTS = .;$TEXMF/fonts/cmap//
++
++% Subfont definition files.
++SFDFONTS = .;$TEXMF/fonts/sfd//
++
++% Opentype outline fonts.
++OPENTYPEFONTS = .;$TEXMF/fonts/opentype//
++
++% pdftex config files:
++PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}//
+ 
+ % Used by DMP (ditroff-to-mpx), called by makempx -troff.
+-TRFONTS = /usr/lib/font/devpost
++% The path given is correct for GROFF on Linux installed under /usr.
++% Originally: TRFONTS = /usr/lib/font/devpost
++TRFONTS = /usr/share/groff/current/font/devps
+ MPSUPPORT = .;$TEXMF/metapost/support
+ 
+ % For xdvi to find mime.types and .mailcap, if they do not exist in
+@@ -279,6 +341,10 @@
  TEXDOCS = .;$TEXMF/doc//
  TEXSOURCES = .;$TEXMF/source//
  
@@ -129,13 +299,16 @@
  % Omega-related fonts and other files.  The odd construction for OFMFONTS
  % makes it behave in the face of a definition of TFMFONTS.  Unfortunately
  % no default substitution would take place for TFMFONTS, so an explicit
-@@ -295,8 +319,12 @@
+@@ -295,8 +361,15 @@
  % search formats, you'll want to add their variables here as well.
  T4HTINPUTS   = .;$TEXMF/tex4ht//
  
-+% xdvik and dvipdfm can share some files with dvips
-+XDVIINPUTS = .;$TEXMF/{xdvi,dvips}//
-+DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}//
++% xdvik and dvipdfm can share some files with dvips (for old ones)
++XDVIINPUTS = .;$TEXMF/{xdvi,dvips}{/jtex,/ptex,}//
++DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}{/jtex,/ptex,}//
++
++% Architecture independent executables
++TEXMFSCRIPTS = $TEXMF/scripts//
 +
  %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
 -KPSE_DOT = .
@@ -143,16 +316,28 @@
  
  % This definition isn't used from this .cnf file itself (that would be
  % paradoxical), but the compile-time default in paths.h is built from it.
-@@ -308,7 +336,7 @@
+@@ -308,12 +381,18 @@
  %
  % For security reasons, it is better not to have . part of the path.
  % 
 -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{.local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@
-+TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/{web2c-jtex,web2c}};$TETEXDIR;$TEXMF/web2c;@web2c@
++TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,,-dist}/web2c{/jtex,}};$TETEXDIR;$TEXMF/web2c;@web2c@
  
++# $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To
++# avoid empty expansions from binaries linked against an earlier
++# version of the library, we set $progname and $engine to something
++# non-empty:
++progname = unset
++engine = unset
  
  
-@@ -323,8 +351,9 @@
+ %  Part 2: Non-path options.
+- 
++
+ % Write .log/.dvi/etc. files here, if the current directory is unwritable.
+ % TEXMFOUTPUT = /tmp
+ 
+@@ -323,8 +402,9 @@
  MISSFONT_LOG = missfont.log
  
  % Set to a colon-separated list of words specifying warnings to suppress.
@@ -163,16 +348,19 @@
  TEX_HUSH = none
  
  % Enable system commands via \write18{...}?
-@@ -341,7 +370,7 @@
+@@ -341,7 +421,10 @@
  
  % Allow TeX, MF, and MP to parse the first line of an input file for
  % the %&format construct.
 -parse_first_line = t
 +parse_first_line = f
++
++% Enable file:line:error style messages.
++file_line_error_style = f
  
  % Enable the mktex... scripts by default?  These must be set to 0 or 1.
  % Particular programs can and do override these settings, for example
-@@ -356,6 +385,7 @@
+@@ -356,6 +439,7 @@
  % MKTEXPK = 0
  % MKTEXMF = 0
  % MKTEXTFM = 0
@@ -180,7 +368,7 @@
  % MKOCP = 0
  % MKOFM = 0
  
-@@ -386,36 +416,36 @@
+@@ -386,36 +470,36 @@
  % 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.
  % 
@@ -203,7 +391,8 @@
 +font_mem_size = 500000
  
  % Total number of fonts. Must be >= 50 and <= 2000 (without tex.ch changes).
- font_max = 1000
+-font_max = 1000
++font_max = 2000
  
  % Extra space for the hash table of control sequences (which allows 10K
  % names as distributed).
@@ -232,7 +421,7 @@
  
  % Hyphenation trie. As distributed, the maximum is 65535; this should
  % work unless `unsigned short' is not supported or is smaller than 16
-@@ -428,31 +458,36 @@
+@@ -428,31 +512,36 @@
  % German: 14000.
  % US English: 10000.
  % 
@@ -279,7 +468,7 @@
  % 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
-@@ -469,5 +504,5 @@
+@@ -469,5 +558,5 @@
  
  % default file code of JTeX and MuLTeX
  % These override the code specified by TeX command in dumping (making format).
diff --git a/japanese/texfamily/files/patch-texk::make::paths.mk b/japanese/texfamily/files/patch-texk::make::paths.mk
index 2a7302f99b9a..97aeafd2d33f 100644
--- a/japanese/texfamily/files/patch-texk::make::paths.mk
+++ b/japanese/texfamily/files/patch-texk::make::paths.mk
@@ -5,7 +5,7 @@
  
  # mktex.cnf, texmf.cnf, etc.
 -web2cdir = $(texmf)/web2c
-+web2cdir = $(texmf)/web2c-jtex
++web2cdir = $(texmf)/web2c/jtex
  
  # The top-level font directory.
  fontdir = $(texmf)/fonts
diff --git a/japanese/texfamily/files/patch-texk::web2c-j::Makefile.in b/japanese/texfamily/files/patch-texk::web2c-j::Makefile.in
index 3214722ad20e..0e6955b2afdf 100644
--- a/japanese/texfamily/files/patch-texk::web2c-j::Makefile.in
+++ b/japanese/texfamily/files/patch-texk::web2c-j::Makefile.in
@@ -1,5 +1,5 @@
 --- texk/web2c-j/Makefile.in.orig	Sun Mar  5 03:01:21 2000
-+++ texk/web2c-j/Makefile.in	Sat Jun 12 22:46:47 2004
++++ texk/web2c-j/Makefile.in	Tue Jan 11 11:57:29 2005
 @@ -23,7 +23,8 @@
  ac_include ../make/paths.mk
  # 
@@ -19,3 +19,12 @@
  
  mpware = mpware/dmp mpware/makempx mpware/mpto mpware/newer
  mpware_sources = mpware/dmp.c mpware/makempx.in mpware/mpto.c mpware/newer.c
+@@ -446,7 +447,7 @@
+ texin = $(newtexmf)/tex//
+ jtexin = $(newtexmflcl)/{jtex,tex}//
+ texfonts = $(newtexmf)/fonts/tfm//:$(newtexmflcl)/fonts/tfm//
+-dumpenv = TEXMFCNF=../kpathsea TEXINPUTS=$(jtexin):$(texin): TEXFONTS=$(texfonts):
++dumpenv = TEXMFCNF=../kpathsea TEXMF=\{${TEXMFDUMP},${TEXMFDISTDIR},$(texmf),${TEXMFLOCALDIR}\} TEXINPUTS=$(jtexin):$(texin): TEXFONTS=$(texfonts):
+ 
+ dumps: fmts efmts cfmts ofmts pdffmts pdfefmts bases mems
+ fmts: $(all_fmts)
diff --git a/japanese/texfamily/files/patch-texk::web2c::Makefile.in b/japanese/texfamily/files/patch-texk::web2c::Makefile.in
new file mode 100644
index 000000000000..d72975c664ae
--- /dev/null
+++ b/japanese/texfamily/files/patch-texk::web2c::Makefile.in
@@ -0,0 +1,20 @@
+--- texk/web2c/Makefile.in.orig	Tue Apr 18 16:28:32 2000
++++ texk/web2c/Makefile.in	Tue Jan 11 12:16:09 2005
+@@ -425,7 +425,7 @@
+ newtexmflcl = $(srcdir)/../../texmf.local
+ texin = {$(newtexmf),$(newtexmflcl)}/tex//
+ texfonts = {$(newtexmf),$(newtexmflcl)}/fonts/tfm//
+-dumpenv = TEXMFCNF=../kpathsea TEXINPUTS=$(texin): TEXFONTS=$(texfonts):
++dumpenv = TEXMFCNF=../kpathsea TEXMF=\{${TEXMFDUMP},${TEXMFDISTDIR},$(texmf),${TEXMFLOCALDIR}\} TEXINPUTS=$(texin): TEXFONTS=$(texfonts):
+ 
+ dumps: fmts efmts cfmts ofmts pdffmts pdfefmts bases mems
+ fmts: $(all_fmts)
+@@ -511,7 +511,7 @@
+ 
+ # This is meant to be called recursively, with $(files) set.
+ prereq-check: $(kpathsea_dir)/kpsewhich
+-	$(kpathsea_dir)/kpsewhich $(files) >/dev/null || $(MAKE) prereq-lose >/dev/null
++	$(dumpenv) $(kpathsea_dir)/kpsewhich $(files) >/dev/null || $(MAKE) prereq-lose >/dev/null
+ 
+ prereq-lose:
+ 	@echo "You seem to be missing input files necessary to make the" >&2
diff --git a/japanese/texfamily/files/patch-texk::web2c::tex.ch b/japanese/texfamily/files/patch-texk::web2c::tex.ch
new file mode 100644
index 000000000000..cbaa29b143a0
--- /dev/null
+++ b/japanese/texfamily/files/patch-texk::web2c::tex.ch
@@ -0,0 +1,46 @@
+--- texk/web2c/tex.ch.orig	Sat May  1 07:34:40 1999
++++ texk/web2c/tex.ch	Tue Jan 11 11:43:50 2005
+@@ -190,10 +190,10 @@
+ @y
+ @d file_name_size == maxint
+ @d ssup_error_line = 255
+-@d ssup_max_strings ==65535
++@d ssup_max_strings == 262143
+ {Larger values may be used, but then the arrays consume much more memory.}
+ @d ssup_trie_opcode == 65535
+-@d ssup_trie_size == 65535
++@d ssup_trie_size == 262143
+ 
+ @d ssup_hyph_size == 65535 {Changing this requires changing (un)dumping!}
+ @d iinf_hyphen_size == 610 {Must be not less than |hyph_prime|!}
+@@ -212,17 +212,17 @@
+   {Use |mem_bot=0| for compilers which cannot decrement pointers.}
+ @!hash_offset=514; {smallest index in hash array, i.e., |hash_base| }
+   {Use |hash_offset=0| for compilers which cannot decrement pointers.}
+-@!trie_op_size=1501; {space for ``opcodes'' in the hyphenation patterns;
++@!trie_op_size=35111; {space for ``opcodes'' in the hyphenation patterns;
+   best if relatively prime to 313, 361, and 1009.}
+-@!neg_trie_op_size=-1501; {for lower |trie_op_hash| array bound;
++@!neg_trie_op_size=-35111; {for lower |trie_op_hash| array bound;
+   must be equal to |-trie_op_size|.}
+ @!min_trie_op=0; {first possible trie op code for any language}
+ @!max_trie_op=ssup_trie_opcode; {largest possible trie opcode for any language}
+ @!pool_name=TEX_POOL_NAME; {this is configurable, for the sake of ML-\TeX}
+   {string of length |file_name_size|; tells where the string pool appears}
+ @#
+-@!inf_main_memory = 2999;
+-@!sup_main_memory = 8000000;
++@!inf_main_memory = 3000;
++@!sup_main_memory = 32000000;
+ 
+ @!inf_trie_size = 8000;
+ @!sup_trie_size = ssup_trie_size;
+@@ -260,7 +260,7 @@
+ @!inf_font_max = 50; {could be smaller, but why?}
+ 
+ @!inf_pool_size = 32000;
+-@!sup_pool_size = 10000000;
++@!sup_pool_size = 40000000;
+ @!inf_pool_free = 1000;
+ @!sup_pool_free = sup_pool_size;
+ @!inf_string_vacancies = 8000;