- teTeX-3.0 support

- fix predefined $TEXMF problem
- bump PORTREVISION

3 files changed, 305 insertions, 50 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 14ac09c0f73f..9423ba9951c9 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
@@ -23,12 +23,12 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X. + freetype support
 
 BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
-		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
 RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
-		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
+		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base \
-		${LOCALBASE}/${TEXMF}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex \
+		${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex \
 		${X11BASE}/${TTFMINCHO}:${PORTSDIR}/japanese/kochi-ttfonts \
 		${X11BASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/kochi-ttfonts
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
@@ -39,7 +39,7 @@ DIST_SUBDIR=	xdvik
 USE_XLIB=	YES
 USE_GMAKE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--datadir=${PREFIX}/${TEXMF:S,texmf$,,} \
+CONFIGURE_ARGS=	--datadir=${PREFIX}/${TEXMFDIR:S,texmf$,,} \
 		--enable-a4 --enable-shrink=${SHRINK} \
 		--with-dvifilter=${DVIPS} \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
@@ -65,7 +65,7 @@ PATCH_STRIP=	-p1
 MAN1=		xdvi.1 xdvizilla.1 t1mapper.1
 
 INSTALL_WRKSRC=	${WRKSRC}/texk/xdvik
-PLIST_SUB=	TEXMF=${TEXMF} MKTEXLSR=${MKTEXLSR} \
+PLIST_SUB=	TEXMFDIR=${TEXMFDIR} MKTEXLSR=${MKTEXLSR} \
 		XDVIETCDIR=${XDVIETCDIR}
 
 VERSION_XDVIK=	22.40y1
@@ -73,13 +73,14 @@ VERSION_JPATCH=	1.21
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
-TEXMF=		share/texmf
-TEXMFLOCAL=	share/texmf-local
-TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCAL}/ls-R
-XDVIETCDIR=	${TEXMF}/xdvi-ptex
+TEXMFDIR=	share/texmf
+TEXMFDISTDIR=	share/texmf-dist
+TEXMFLOCALDIR=	share/texmf-local
+TEXMFLOCAL_LSR=	${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
+XDVIETCDIR=	${TEXMFDIR}/xdvi/ptex
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 
-CIDFONTDIR=	${TEXMF}/dvipdfm/CIDFont
+CIDFONTDIR=	${TEXMFDIR}/dvipdfm/CIDFont
 TTFMINCHO=	lib/X11/fonts/TrueType/kochi-mincho-subst.ttf
 TTFGOTHIC=	lib/X11/fonts/TrueType/kochi-gothic-subst.ttf
 VFONTCAPFT_SRC=	${WRKSRC}/vfontmap.freetype
diff --git a/japanese/xdvik/files/patch-texk::kpathsea::texmf.in b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
index f79b202fd691..23eaf5e9470d 100644
--- a/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
+++ b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
@@ -1,25 +1,116 @@
---- xdvik-22.40w/texk/kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
-+++ xdvik-22.40w/texk/kpathsea/texmf.in	Sat Jun 12 12:34:24 2004
-@@ -62,7 +62,7 @@
+--- xdvik-22.40y1/texk/kpathsea/texmf.in.orig	Fri Jan 17 10:31:58 2003
++++ xdvik-22.40y1/texk/kpathsea/texmf.in	Sun Feb  6 06:49:44 2005
+@@ -54,30 +54,57 @@
+ % find where to look dynamically.  See the manual and the definition
+ % below of TEXMFCNF.
  
- % If defined, teTeX's texconfig stores modifications here (instead of the
- % TEXMFMAIN tree).
+-% 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:
++% The main distribution tree:
++TEXMFDIST = @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 = @texmf@-local
+ 
+-% If defined, teTeX's texconfig stores modifications here (instead of the
+-% TEXMFMAIN tree).
 -%   VARTEXMF = @texmf@-var
-+VARTEXMF = @texmf@-var
++% 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
-@@ -74,7 +74,7 @@
- %   - list $VARTEXMF in the TEXMF definition;
- %   - make sure that $VARTEXMF precedes $TEXMFMAIN in the TEXMF definition.
- % TEXMF = $TEXMFMAIN
+-HOMETEXMF = $HOME/texmf
++% 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 = {$HOMETEXMF,!!$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
-@@ -144,6 +144,13 @@
+-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).
+ 
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+@@ -140,58 +167,69 @@
+ % latex209, useful for macros that were written for 2.09 and do not
+ % mention 2e at all, but can be used with 2e.
+ TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}//
+-TEXINPUTS.platex  = .;$TEXMF/tex/{platex,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
@@ -30,9 +121,87 @@
 +TEXINPUTS.mullatex = .:$TEXMF/{multex,jtex,tex}/{latex,generic,}//
 +
  % Fontinst needs to read afm files.
- TEXINPUTS.fontinst = .;$TEXMF/tex//;$TEXMF/fonts/afm//
+-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.pdfamstex = .;$TEXMF/{pdftex,tex}/{amstex,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,}//
+-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,}//
  
-@@ -201,12 +208,12 @@
+ % Earlier entries override later ones, so put this last.
+-TEXINPUTS = .;$TEXMF/tex/{generic,}//
++TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}//
+ 
+ % Metafont, MetaPost inputs.
+ MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source//
+@@ -201,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 ...
@@ -42,60 +211,145 @@
 -TEXPOOL = .;$TEXMF/web2c
 -MFPOOL = .;$TEXMF/web2c
 -MPPOOL = .;$TEXMF/web2c
-+TEXFORMATS = .;$TEXMF/web2c{-ptex,}
-+MFBASES = .;$TEXMF/web2c{-ptex,}
-+MPMEMS = .;$TEXMF/web2c{-ptex,}
-+TEXPOOL = .;$TEXMF/web2c{-ptex,}
-+MFPOOL = .;$TEXMF/web2c{-ptex,}
-+MPPOOL = .;$TEXMF/web2c{-ptex,}
++TEXFORMATS = .;$TEXMF/web2c{/ptex,}
++MFBASES = .;$TEXMF/web2c{/ptex,}
++MPMEMS = .;$TEXMF/web2c{/ptex,}
++TEXPOOL = .;$TEXMF/web2c{/ptex,}
++MFPOOL = .;$TEXMF/web2c{/ptex,}
++MPPOOL = .;$TEXMF/web2c{/ptex,}
  
  % Device-independent font metric files.
  VFFONTS = .;$TEXMF/fonts/vf//
-@@ -240,8 +247,8 @@
+@@ -228,20 +266,26 @@
+ % 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 
++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,}//
++BIBINPUTS = .;$TEXMF/bibtex/bib//
++BSTINPUTS = .;$TEXMF/bibtex/bst//
+ 
+ % MFT style files.
  MFTINPUTS = .;$TEXMF/mft//
  
- % PostScript headers, prologues (.pro), encodings (.enc) and fonts.
+-% PostScript headers, prologues (.pro), encodings (.enc) and fonts.
 -TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}//
 -TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,pdftex,tex,fonts/{type1,truetype}}//
-+TEXPSHEADERS = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/type1}//
-+TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/{type1,truetype}}//
++% PostScript headers and prologues (.pro); unfortunately, some programs
++% also use this for acessing font files (enc, type1, truetype)
++TEXPSHEADERS = .;$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3}}//
++TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{/ptex,},fonts/{enc,type1,type3,truetype}}//
  
  % PostScript Type 1 outline fonts.
  T1FONTS = .;$TEXMF/fonts/type1//
-@@ -256,10 +263,10 @@
+@@ -255,14 +299,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{-ptex,}//
++TEXCONFIG = $TEXMF/dvips{/ptex,}//
  
  % Makeindex style (.ist) files.
 -INDEXSTYLE = .;$TEXMF/makeindex//
-+INDEXSTYLE = .;$TEXMF/makeindex{-ptex,}//
++INDEXSTYLE = .;$TEXMF/makeindex{/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
-@@ -296,8 +303,8 @@
+-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
+@@ -295,9 +359,12 @@
+ % search formats, you'll want to add their variables here as well.
  T4HTINPUTS   = .;$TEXMF/tex4ht//
  
- % xdvik and dvipdfm can share some files with dvips
+-% xdvik and dvipdfm can share some files with dvips
 -XDVIINPUTS = .;$TEXMF/{xdvi,dvips}//
 -DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}//
-+XDVIINPUTS = .;$TEXMF/{xdvi,dvips}{-ptex,}//
-+DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}{-ptex,}//
++% xdvik and dvipdfm can share some files with dvips (for old ones)
++XDVIINPUTS = .;$TEXMF/{xdvi,dvips}{/ptex,}//
++DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}{/ptex,}//
++
++% Architecture independent executables
++TEXMFSCRIPTS = $TEXMF/scripts//
  
  %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
  % KPSE_DOT = .
-@@ -312,7 +319,7 @@
+@@ -312,12 +379,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-ptex,web2c}};$TETEXDIR;@web2c@;$TEXMF/web2c
++TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,,-dist}/web2c{/ptex,}};$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
+ 
  
+ %  Part 2: Non-path options.
+- 
++
+ % Write .log/.dvi/etc. files here, if the current directory is unwritable.
+ % TEXMFOUTPUT = /tmp
+ 
+@@ -348,6 +421,9 @@
+ % the %&format construct.
+ 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
+ % dvips's -M option.  Your first chance to specify whether the scripts
+@@ -406,7 +482,7 @@
+ font_mem_size = 500000
  
+ % Total number of fonts. Must be >= 50 and <= 2000 (without tex.ch changes).
+-font_max = 1000
++font_max = 2000
  
-@@ -477,3 +484,8 @@
+ % Extra space for the hash table of control sequences (which allows 10K
+ % names as distributed).
+@@ -477,3 +553,8 @@
  error_line = 79
  half_error_line = 50
  max_print_line = 79
diff --git a/japanese/xdvik/files/patch-texk::make::paths.mk b/japanese/xdvik/files/patch-texk::make::paths.mk
index 8b8ee5b43e40..e15a1de2fc3d 100644
--- a/japanese/xdvik/files/patch-texk::make::paths.mk
+++ b/japanese/xdvik/files/patch-texk::make::paths.mk
@@ -5,7 +5,7 @@
  
  # mktex.cnf, texmf.cnf, etc.
 -web2cdir = $(texmf)/web2c
-+web2cdir = $(texmf)/web2c-ptex
++web2cdir = $(texmf)/web2c/ptex
  
  # The top-level font directory.
  fontdir = $(texmf)/fonts
@@ -14,7 +14,7 @@
  
  # For dvips configuration files, psfonts.map, etc.
 -dvipsdir = $(texmf)/dvips
-+dvipsdir = $(texmf)/dvips-ptex
++dvipsdir = $(texmf)/dvips/ptex
  
  # For dvips .pro files, gsftopk's render.ps, etc.
  psheaderdir = $(dvipsdir)