Add teTeX-3.0 support.

7 files changed, 357 insertions, 96 deletions

diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 923ce0db34f7..96cd5941f80f 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -7,78 +7,84 @@
 
 PORTNAME=	dvipsk
 PORTVERSION=	5.94a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
+MASTER_SITES=	ftp://ftp.dante.de/tex-archive/systems/unix/teTeX-beta/ \
 		${MASTER_SITE_TEX_CTAN} \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:jpatch \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/TeX/ptex-win32/utils,:S,$,:udvipspatch,}
 MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib/
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-tetex
-DISTFILES=	tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
+DISTFILES=	${TETEX_SRC}${EXTRACT_SUFX} \
 		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}:jpatch \
-		udvips-5.94a-p1.6a.patch:udvipspatch
+		udvips-5.94a-p1.6a1.patch:udvipspatch
 DIST_SUBDIR=	teTeX
-EXTRACT_ONLY=	tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
+EXTRACT_ONLY=	${TETEX_SRC}${EXTRACT_SUFX} \
 		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A DVI to PostScript translator + Japanese patch
 
 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 \
-		${LOCALBASE}/${TEXMF}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex
+		${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex
 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
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
 
-PATCH_WRKSRC=	${WRKDIR}/tetex-src-${VER_TETEX}/texk
+PATCH_WRKSRC=	${WRKDIR}/${TETEX_SRC}/texk
 EXTRA_PATCHES=	${WRKDIR}/dvipsk-5.92b-p${VER_JPATCH}.patch \
-		${DISTDIR}/${DIST_SUBDIR}/udvips-5.94a-p1.6a.patch
-CONFIGURE_WRKSRC=${WRKDIR}/tetex-src-${VER_TETEX}
-BUILD_WRKSRC=	${WRKDIR}/tetex-src-${VER_TETEX}/texk/dvipsk
-INSTALL_WRKSRC=	${WRKDIR}/tetex-src-${VER_TETEX}/texk/dvipsk
+		${DISTDIR}/${DIST_SUBDIR}/udvips-5.94a-p1.6a1.patch
+CONFIGURE_WRKSRC=${WRKDIR}/${TETEX_SRC}
+BUILD_WRKSRC=	${WRKDIR}/${TETEX_SRC}/texk/dvipsk
+INSTALL_WRKSRC=	${WRKDIR}/${TETEX_SRC}/texk/dvipsk
 
 PLIST_SUB=	DVIPSDIR=${DVIPSDIR} \
 		MKTEXLSR=${MKTEXLSR} \
-		TEXMF=${TEXMF}
+		TEXMFDIR=${TEXMFDIR} \
+		FONTSMAPDIR=${FONTSMAPDIR}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
-		--disable-multiplatform \
-		--without-texinfo --without-dialog \
+CONFIGURE_ARGS= --disable-multiplatform \
+		--without-texinfo \
+		--without-dialog \
 		--with-system-ncurses --with-system-zlib \
 		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
 		--with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \
 		--with-system-pnglib --with-pnglib-libdir=${LIBPNG_PREFIX}/lib \
 		--with-pnglib-include=${LIBPNG_PREFIX}/include \
 		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
-		--with-t1lib-include=${LIBT1_PREFIX}/include
-CONFLICTS=	ja-ptex-base-[0-9]* dvips*
+		--with-t1lib-include=${LIBT1_PREFIX}/include \
+		--without-xdvik --without-oxdvik
+CONFLICTS=	ja-ptex-base-[0-9]* \
+		dvipsk-tetex-[0-9]* \
+		dvips-[0-9]*
 
 MAN1=		dvips.1 afm2tfm.1
 INFO=		dvips
 
-VER_TETEX=	2.0.2
-VER_JPATCH=	1.6a
+TETEX_SRC=	tetex-src-2.0.2
+VER_JPATCH=	1.6a1
 
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
-TEXMF?=		share/texmf
-TEXMFLOCAL?=	share/texmf-local
-TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCAL}/ls-R
-DVIPSDIR?=	${TEXMF}/dvips-ptex
+TEXMFDIR=	share/texmf
+TEXMFDISTDIR=	share/texmf-dist
+TEXMFLOCALDIR=	share/texmf-local
+TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
+FONTSMAPDIR=	${TEXMFDIR}/fonts/map/dvips
+DVIPSDIR?=	${TEXMFDIR}/dvips/ptex
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
 UPDMAP_SUB=	PREFIX=${PREFIX} \
-		TEXMF=${TEXMF} \
+		TEXMFDIR=${TEXMFDIR} \
 		DVIPSDIR=${DVIPSDIR}
 
 post-configure:
@@ -87,11 +93,11 @@ post-configure:
 
 do-build:
 .for D in dvipsk odvipsk
-	cd ${WRKDIR}/tetex-src-${VER_TETEX}/texk/${D} &&\
+	cd ${WRKDIR}/${TETEX_SRC}/texk/${D} &&\
 		${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}
 .endfor
-	cd ${WRKDIR}/tetex-src-${VER_TETEX}/texk/udvipsk &&\
+	cd ${WRKDIR}/${TETEX_SRC}/texk/udvipsk &&\
 		${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} \
 		program=udvips XDEFS=-DUDVIPS \
@@ -100,27 +106,27 @@ do-build:
 do-install:
 	${MKDIR} ${PREFIX}/${DVIPSDIR}/config
 .for D in dvipsk odvipsk
-	cd ${WRKDIR}/tetex-src-${VER_TETEX}/texk/${D} &&\
+	cd ${WRKDIR}/${TETEX_SRC}/texk/${D} &&\
 		${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}
 .endfor
 	${INSTALL_PROGRAM} \
 		${PATCH_WRKSRC}/udvipsk/udvips \
 		${PREFIX}/bin
-	${RM} -f ${PREFIX}/${DVIPSDIR}/base/config.ps
+	${MKDIR} ${PREFIX}/${FONTSMAPDIR}/ptex
 	${INSTALL_DATA} \
 		${FILESDIR}/ptex-kanji.map \
-		${PREFIX}/${DVIPSDIR}/base/ptex-kanji.map
-	(${CAT} ${LOCALBASE}/${TEXMF}/web2c/updmap.cfg; \
-	 ${ECHO_CMD} "Map ptex-kanji.map" ) > ${WRKDIR}/updmap.cfg
+		${PREFIX}/${FONTSMAPDIR}/ptex/kanji.map
+	(${CAT} ${LOCALBASE}/${TEXMFDISTDIR}/web2c/updmap.cfg; \
+	 ${ECHO_CMD} "Map kanji.map" ) > ${WRKDIR}/updmap.cfg
 	${INSTALL_DATA} \
 		${WRKDIR}/updmap.cfg \
-		${PREFIX}/${TEXMF}/web2c-ptex/updmap.cfg
+		${PREFIX}/${TEXMFDIR}/web2c/ptex/updmap.cfg
 	${SED} ${UPDMAP_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${FILESDIR}/updmap-ptex.in > ${WRKDIR}/updmap-ptex
-	${INSTALL_SCRIPT} ${WRKDIR}/updmap-ptex ${PREFIX}/bin/updmap-ptex
+	${INSTALL_SCRIPT} ${WRKDIR}/updmap-ptex ${PREFIX}/bin/updmap-sys-ptex
 	${MKTEXLSR}
-	${SH} ${PREFIX}/bin/updmap-ptex --nohash
+	${SH} ${PREFIX}/bin/updmap-sys-ptex --nohash
 
 post-install:
 	${MKTEXLSR}
diff --git a/japanese/dvipsk/distinfo b/japanese/dvipsk/distinfo
index d19baa03446a..9b2a6f0b265c 100644
--- a/japanese/dvipsk/distinfo
+++ b/japanese/dvipsk/distinfo
@@ -1,6 +1,6 @@
 MD5 (teTeX/tetex-src-2.0.2.tar.gz) = a16f6bba227d55e79aeee46fbbd82d28
 SIZE (teTeX/tetex-src-2.0.2.tar.gz) = 11745933
-MD5 (teTeX/dvipsk-jpatch-p1.6a.tar.gz) = cf7c5744c27d585384e414cf3e5ca4cd
-SIZE (teTeX/dvipsk-jpatch-p1.6a.tar.gz) = 29428
-MD5 (teTeX/udvips-5.94a-p1.6a.patch) = 539296b0b6735c7a18a382be0dd95af3
-SIZE (teTeX/udvips-5.94a-p1.6a.patch) = 16289
+MD5 (teTeX/dvipsk-jpatch-p1.6a1.tar.gz) = e6ab8c13ccb9ee405a39214875a990f7
+SIZE (teTeX/dvipsk-jpatch-p1.6a1.tar.gz) = 29397
+MD5 (teTeX/udvips-5.94a-p1.6a1.patch) = 92724cdea2b27dbbc33b96743065631a
+SIZE (teTeX/udvips-5.94a-p1.6a1.patch) = 16311
diff --git a/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
index a9e0844c49bc..99f56063dc63 100644
--- a/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
+++ b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
@@ -1,25 +1,116 @@
 --- kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
-+++ kpathsea/texmf.in	Fri Sep 17 14:23:28 2004
-@@ -62,7 +62,7 @@
++++ kpathsea/texmf.in	Sun Feb  6 06:33:06 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,146 @@
 -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//
-@@ -246,8 +253,8 @@
+@@ -228,26 +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
++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//
-@@ -262,10 +269,10 @@
+@@ -261,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
-@@ -302,8 +309,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
+@@ -301,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 = .
-@@ -318,7 +325,7 @@
+@@ -318,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
+ 
+@@ -354,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
+@@ -412,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
  
-@@ -483,3 +490,8 @@
+ % Extra space for the hash table of control sequences (which allows 10K
+ % names as distributed).
+@@ -483,3 +553,8 @@
  error_line = 79
  half_error_line = 50
  max_print_line = 79
diff --git a/japanese/dvipsk/files/patch-texk::make::paths.mk b/japanese/dvipsk/files/patch-texk::make::paths.mk
index 85197600d93c..5aef6be1ae7a 100644
--- a/japanese/dvipsk/files/patch-texk::make::paths.mk
+++ b/japanese/dvipsk/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)
diff --git a/japanese/dvipsk/files/updmap-ptex.in b/japanese/dvipsk/files/updmap-ptex.in
index e9ab3386f4a2..92c1b0e301e8 100644
--- a/japanese/dvipsk/files/updmap-ptex.in
+++ b/japanese/dvipsk/files/updmap-ptex.in
@@ -3,9 +3,8 @@
 SETENV=/usr/bin/env
 
 ${SETENV} \
-	TEXPSHEADERS='.;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/type1}//' \
-	TEXCONFIG='$TEXMF/dvips{-ptex,}//' \
-	%%PREFIX%%/bin/updmap \
-		--cnffile %%PREFIX%%/%%TEXMF%%/web2c-ptex/updmap.cfg \
+	TEXPSHEADERS='.;$TEXMF/{dvips{/ptex,},pdftex,tex,fonts/type1}//' \
+	TEXCONFIG='$TEXMF/dvips{/ptex,}//' \
+	%%PREFIX%%/bin/updmap-sys \
+		--cnffile %%PREFIX%%/%%TEXMFDIR%%/web2c/ptex/updmap.cfg \
 		--outputdir %%PREFIX%%/%%DVIPSDIR%%/base \
-		$*
diff --git a/japanese/dvipsk/pkg-message b/japanese/dvipsk/pkg-message
index edfca03d7f3a..de7d326b4572 100644
--- a/japanese/dvipsk/pkg-message
+++ b/japanese/dvipsk/pkg-message
@@ -1,12 +1,12 @@
 === IMPORTANT NOTICE ===
 
-- dvips(1) searches the necessary files from the share/texmf/dvips-ptex
+- dvips(1) searches the necessary files from the share/texmf/dvips/ptex
   directory first, and then the share/texmf/dvips directory.
 
-- share/texmf/dvips-ptex/base/psfonts.map should not be edited
-  manually.  Instead, edit share/texmf/web2c-ptex/updmap.cfg (and
-  share/texmf/dvips-ptex/ptex-kanji.map, which is for Japanese font
-  map), and invoke the updmap-ptex(1) command, which generates
-  share/texmf/dvips-ptex/base/*.map.  Note that the original
-  updmap(1) in the teTeX distribution uses share/texmf/web2c/updmap.cfg,
-  not share/texmf/web2c-ptex/updmap.cfg.
+- share/texmf/dvips/ptex/base/psfonts.map should not be edited
+  manually.  Instead, edit share/texmf/web2c/ptex/updmap.cfg (and
+  share/texmf/fonts/map/dvips/ptex/kanji.map, which is for Japanese font
+  map), and invoke the updmap-sys-ptex(1) command, which generates
+  share/texmf/dvips/ptex/base/*.map.  Note that the original
+  updmap-sys(1) in the teTeX distribution uses share/texmf/web2c/updmap.cfg,
+  not share/texmf/web2c/ptex/updmap.cfg.
diff --git a/japanese/dvipsk/pkg-plist b/japanese/dvipsk/pkg-plist
index d86fd269750f..7bf38a49589c 100644
--- a/japanese/dvipsk/pkg-plist
+++ b/japanese/dvipsk/pkg-plist
@@ -3,8 +3,8 @@ bin/afm2tfm
 bin/dvips
 bin/odvips
 bin/udvips
-bin/updmap-ptex
-%%TEXMF%%/web2c-ptex/updmap.cfg
+bin/updmap-sys-ptex
+%%TEXMFDIR%%/web2c/ptex/updmap.cfg
 %%DVIPSDIR%%/base/tex.pro
 %%DVIPSDIR%%/base/texps.pro
 %%DVIPSDIR%%/base/texc.pro
@@ -25,9 +25,10 @@ bin/updmap-ptex
 %%DVIPSDIR%%/base/psfonts.map
 %%DVIPSDIR%%/base/psfonts_pk.map
 %%DVIPSDIR%%/base/psfonts_t1.map
-%%DVIPSDIR%%/base/ptex-kanji.map
 %%DVIPSDIR%%/config/config.ps
-@exec %%MKTEXLSR%%
 @dirrm %%DVIPSDIR%%/base
 @dirrm %%DVIPSDIR%%/config
+%%FONTSMAPDIR%%/ptex/kanji.map
+@dirrm %%FONTSMAPDIR%%/ptex
+@exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%