9 files changed, 168 insertions, 443 deletions

diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 96cd5941f80f..d972584258c9 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	dvipsk
-PORTVERSION=	5.94a
-PORTREVISION=	2
+PORTVERSION=	5.95a
+PORTREVISION=	0
 CATEGORIES=	japanese print
-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_SITES=	${MASTER_SITE_TEX_CTAN} \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/TeX/ptex-win32/utils,:S,$,:udvipspatch,}
-MASTER_SITE_SUBDIR=	systems/unix/teTeX/2.0/distrib/
+#		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/:jpatch \
+MASTER_SITE_SUBDIR=	systems/unix/teTeX/3.0/distrib/
 PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-tetex
 DISTFILES=	${TETEX_SRC}${EXTRACT_SUFX} \
-		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}:jpatch \
-		udvips-5.94a-p1.6a1.patch:udvipspatch
+		dvipsk-${PORTVERSION}-p1.6a.tar.gz:udvipspatch
 DIST_SUBDIR=	teTeX
 EXTRACT_ONLY=	${TETEX_SRC}${EXTRACT_SUFX} \
-		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}
+		dvipsk-${PORTVERSION}-p1.6a.tar.gz
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A DVI to PostScript translator + Japanese patch
@@ -39,16 +37,17 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		t1.5:${PORTSDIR}/devel/t1lib
 
 PATCH_WRKSRC=	${WRKDIR}/${TETEX_SRC}/texk
-EXTRA_PATCHES=	${WRKDIR}/dvipsk-5.92b-p${VER_JPATCH}.patch \
-		${DISTDIR}/${DIST_SUBDIR}/udvips-5.94a-p1.6a1.patch
+EXTRA_PATCHES=	${WRKDIR}/dvipsk-5.95a-p1.6a.diff
 CONFIGURE_WRKSRC=${WRKDIR}/${TETEX_SRC}
 BUILD_WRKSRC=	${WRKDIR}/${TETEX_SRC}/texk/dvipsk
 INSTALL_WRKSRC=	${WRKDIR}/${TETEX_SRC}/texk/dvipsk
 
 PLIST_SUB=	DVIPSDIR=${DVIPSDIR} \
+		DVIPSCONFIGDIR=${DVIPSCONFIGDIR} \
 		MKTEXLSR=${MKTEXLSR} \
-		TEXMFDIR=${TEXMFDIR} \
-		FONTSMAPDIR=${FONTSMAPDIR}
+		TEXMFCONFIGDIR=${TEXMFCONFIGDIR} \
+		FONTSMAPDIR=${FONTSMAPDIR} \
+		UPDMAP_SYS_PTEX=${UPDMAP_SYS_PTEX}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --disable-multiplatform \
@@ -69,34 +68,32 @@ CONFLICTS=	ja-ptex-base-[0-9]* \
 MAN1=		dvips.1 afm2tfm.1
 INFO=		dvips
 
-TETEX_SRC=	tetex-src-2.0.2
-VER_JPATCH=	1.6a1
+TETEX_SRC=	tetex-src-3.0
 
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 TEXMFDIR=	share/texmf
 TEXMFDISTDIR=	share/texmf-dist
 TEXMFLOCALDIR=	share/texmf-local
+TEXMFCONFIGDIR=	share/texmf-config
 TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCALDIR}/ls-R
-FONTSMAPDIR=	${TEXMFDIR}/fonts/map/dvips
+FONTSMAPDIR=	${TEXMFDIR}/fonts/map/ptex
 DVIPSDIR?=	${TEXMFDIR}/dvips/ptex
+DVIPSCONFIGDIR?=${TEXMFCONFIGDIR}/dvips/ptex
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
-UPDMAP_SUB=	PREFIX=${PREFIX} \
-		TEXMFDIR=${TEXMFDIR} \
-		DVIPSDIR=${DVIPSDIR}
+UPDMAP_SYS_PTEX=${LOCALBASE}/bin/updmap-sys-ptex
+TEXCONFIGBIN=	${LOCALBASE}/bin/texconfig-sys
 
 post-configure:
 	cd ${PATCH_WRKSRC} && \
 		${RM} -rf udvipsk && ${CP} -R dvipsk udvipsk
 
 do-build:
-.for D in dvipsk odvipsk
-	cd ${WRKDIR}/${TETEX_SRC}/texk/${D} &&\
+	cd ${WRKDIR}/${TETEX_SRC}/texk/dvipsk &&\
 		${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}
-.endfor
 	cd ${WRKDIR}/${TETEX_SRC}/texk/udvipsk &&\
 		${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} \
@@ -104,31 +101,21 @@ do-build:
 		${ALL_TARGET}
 
 do-install:
-	${MKDIR} ${PREFIX}/${DVIPSDIR}/config
-.for D in dvipsk odvipsk
-	cd ${WRKDIR}/${TETEX_SRC}/texk/${D} &&\
+	${MKDIR} ${PREFIX}/${DVIPSCONFIGDIR}/config
+	cd ${WRKDIR}/${TETEX_SRC}/texk/dvipsk &&\
 		${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}
-.endfor
 	${INSTALL_PROGRAM} \
 		${PATCH_WRKSRC}/udvipsk/udvips \
 		${PREFIX}/bin
-	${MKDIR} ${PREFIX}/${FONTSMAPDIR}/ptex
 	${INSTALL_DATA} \
 		${FILESDIR}/ptex-kanji.map \
-		${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}/${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-sys-ptex
+		${PREFIX}/${FONTSMAPDIR}/dvips/kanji.map
 	${MKTEXLSR}
-	${SH} ${PREFIX}/bin/updmap-sys-ptex --nohash
+	${SH} ${UPDMAP_SYS_PTEX} --enable Map=kanji.map
 
 post-install:
+	${TEXCONFIGBIN} dvips printcmd -
 	${MKTEXLSR}
 
 .include <bsd.port.mk>
diff --git a/japanese/dvipsk/distinfo b/japanese/dvipsk/distinfo
index 9b2a6f0b265c..3a82c4d91c0e 100644
--- a/japanese/dvipsk/distinfo
+++ b/japanese/dvipsk/distinfo
@@ -1,6 +1,4 @@
-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.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
+MD5 (teTeX/tetex-src-3.0.tar.gz) = 944a4641e79e61043fdaf8f38ecbb4b3
+SIZE (teTeX/tetex-src-3.0.tar.gz) = 12749314
+MD5 (teTeX/dvipsk-5.95a-p1.6a.tar.gz) = a623fda9d41e08979976b0cb995afdac
+SIZE (teTeX/dvipsk-5.95a-p1.6a.tar.gz) = 34398
diff --git a/japanese/dvipsk/files/patch-texk::dvipsk::Makefile.in b/japanese/dvipsk/files/patch-texk::dvipsk::Makefile.in
new file mode 100644
index 000000000000..a3ed7f08f371
--- /dev/null
+++ b/japanese/dvipsk/files/patch-texk::dvipsk::Makefile.in
@@ -0,0 +1,28 @@
+--- dvipsk/Makefile.in.orig	Sat Feb 12 23:09:22 2005
++++ dvipsk/Makefile.in	Sat Feb 12 23:11:12 2005
+@@ -37,10 +37,11 @@
+ pprescan.o papersiz.o color.o bbox.o hps.o t1part.o
+ 
+ program = dvips
+-programs = afm2tfm odvips $(program)
++programs = afm2tfm $(program)
++scripts = odvips
+ 
+ 
+-default all: $(programs) $(prologues) dvips.info
++default all: $(programs) $(scripts) $(prologues) dvips.info
+ 
+ $(program): $(kpathsea) $(objects)
+ 	$(kpathsea_link) $(objects) $(LOADLIBES) 
+@@ -93,9 +94,10 @@
+ 	rm -f $(bindir)/odvips
+ 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
+ 	for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done
++	for p in $(scripts); do $(INSTALL_SCRIPT) $$p $(bindir); done
+ 	chmod 0755 $(bindir)/odvips
+ uninstall-exec:
+-	for p in $(programs); do rm -f $(bindir)/$$p; done
++	for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done
+ 	rm -f $(bindir)/o$(program)
+ 
+ install-data: $(program).info
diff --git a/japanese/dvipsk/files/patch-texk::kpathsea::Makefile.in b/japanese/dvipsk/files/patch-texk::kpathsea::Makefile.in
deleted file mode 100644
index 8af3cee1caab..000000000000
--- a/japanese/dvipsk/files/patch-texk::kpathsea::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- kpathsea/Makefile.in.orig	Sun Feb 16 02:21:42 2003
-+++ kpathsea/Makefile.in	Fri Jun 11 20:45:58 2004
-@@ -126,7 +126,7 @@
- 	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
- 	| tr '%' '\012' \
- 	| sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
--	      -e 's%\$$TEXMF%$(texmf)%g' \
-+	      -e 's%\$$TEXMF\([,}/]\)%$(texmf)\1%g' \
- 	      -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \
- 	      -e 's%\$$web2cdir%$(web2cdir)%g' \
- 	      -e 's%\$$prefix%$(prefix)%g' \
diff --git a/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
deleted file mode 100644
index 99f56063dc63..000000000000
--- a/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
+++ /dev/null
@@ -1,361 +0,0 @@
---- kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
-+++ 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.
- 
--% 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
-+% 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
-+% 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}
-+% 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
-+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
-+TEXINPUTS.jtex = .:$TEXMF/{jtex,tex}/{plain,generic,}//
-+TEXINPUTS.jlatex = .:$TEXMF/{jtex,tex}/{latex,generic,}//
-+TEXINPUTS.jlatex209 = .:$TEXMF/{jtex,tex}/{latex209,generic,latex,}//
-+TEXINPUTS.multex = .:$TEXMF/{multex,jtex,tex}/{plain,generic,}//
-+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,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,}//
- 
- % 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 ...
--TEXFORMATS = .;$TEXMF/web2c
--MFBASES = .;$TEXMF/web2c
--MPMEMS = .;$TEXMF/web2c
--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,}
- 
- % Device-independent font metric files.
- VFFONTS = .;$TEXMF/fonts/vf//
-@@ -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.
--TEXPSHEADERS = .;$TEXMF/{dvips,pdftex,tex,fonts/type1}//
--TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,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//
-@@ -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,}//
- 
- % Makeindex style (.ist) files.
--INDEXSTYLE = .;$TEXMF/makeindex//
-+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
-+% 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
--XDVIINPUTS = .;$TEXMF/{xdvi,dvips}//
--DVIPDFMINPUTS = .;$TEXMF/{dvipdfm,dvips}//
-+% 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,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,,-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
- 
- % 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
-+
-+% default file code of JTeX and MuLTeX
-+% These override the code specified by TeX command in dumping (making format).
-+jtex_filetype = euc
-+%ml_input_code = junet
diff --git a/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in-teTeX b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in-teTeX
new file mode 100644
index 000000000000..3d39087ec161
--- /dev/null
+++ b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in-teTeX
@@ -0,0 +1,103 @@
+--- kpathsea/texmf.in-teTeX.orig	Sun Feb  6 09:04:35 2005
++++ kpathsea/texmf.in-teTeX	Sat Feb 12 20:27:12 2005
+@@ -177,11 +177,18 @@
+ % 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
++TEXINPUTS.jtex = .:$TEXMF/{jtex,tex}/{plain,generic,}//
++TEXINPUTS.jlatex = .:$TEXMF/{jtex,tex}/{latex,generic,}//
++TEXINPUTS.jlatex209 = .:$TEXMF/{jtex,tex}/{latex209,generic,latex,}//
++TEXINPUTS.multex = .:$TEXMF/{multex,jtex,tex}/{plain,generic,}//
++TEXINPUTS.mullatex = .:$TEXMF/{multex,jtex,tex}/{latex,generic,}//
++
+ % Fontinst needs to read afm files.
+ TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}//
+ 
+@@ -246,12 +253,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 ...
+-TEXFORMATS = .;$TEXMF/web2c
+-MFBASES = .;$TEXMF/web2c
+-MPMEMS = .;$TEXMF/web2c
+-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,}
+ 
+ % Device-independent font metric files.
+ VFFONTS = .;$TEXMF/fonts/vf//
+@@ -274,7 +281,7 @@
+ MISCFONTS = .;$TEXMF/fonts/misc//
+ 
+ % font name map files.
+-TEXFONTMAPS = .;$TEXMF/fonts/map//
++TEXFONTMAPS = .;$TEXMF/fonts/map{/ptex,}//
+ 
+ % support non"k"-xdvi:
+ PKFONTS.XDvi    = .:$TEXMF/%s:$VARTEXFONTS/pk/{%m,modeless}//
+@@ -291,8 +298,8 @@
+ 
+ % PostScript headers and prologues (.pro); unfortunately, some programs
+ % also use this for acessing font files (enc, type1, truetype)
+-TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type3}}//
+-TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type3,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//
+@@ -310,10 +317,10 @@
+ LIGFONTS =  .;$TEXMF/fonts/lig//
+ 
+ % Dvips' config.* files (this name should not start with `TEX'!).
+-TEXCONFIG = $TEXMF/dvips//
++TEXCONFIG = $TEXMF/dvips{/ptex,}//
+ 
+ % Makeindex style (.ist) files.
+-INDEXSTYLE = .;$TEXMF/makeindex//
++INDEXSTYLE = .;$TEXMF/makeindex{/ptex,}//
+ 
+ % Font encoding files (.enc).
+ ENCFONTS = .;$TEXMF/fonts/enc//
+@@ -366,6 +373,10 @@
+ % search formats, you'll want to add their variables here as well.
+ T4HTINPUTS   = .;$TEXMF/tex4ht//
+ 
++% 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//
+ 
+@@ -382,7 +393,7 @@
+ %
+ % 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,,-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
+@@ -556,3 +567,8 @@
+ error_line = 79
+ half_error_line = 50
+ max_print_line = 79
++
++% default file code of JTeX and MuLTeX
++% These override the code specified by TeX command in dumping (making format).
++jtex_filetype = euc
++%ml_input_code = junet
diff --git a/japanese/dvipsk/files/ptex-kanji.map b/japanese/dvipsk/files/ptex-kanji.map
index bb58a852915f..40aa3a730da3 100644
--- a/japanese/dvipsk/files/ptex-kanji.map
+++ b/japanese/dvipsk/files/ptex-kanji.map
@@ -45,3 +45,7 @@ cidmin-h    Ryumin-Light-Identity-H
 cidmin-v    Ryumin-Light-Identity-V
 cidgoth-h   GothicBBB-Medium-Identity-H
 cidgoth-v   GothicBBB-Medium-Identity-V
+%
+% Local variables:
+% page-delimiter: "^% \f"
+% End:
diff --git a/japanese/dvipsk/files/updmap-ptex.in b/japanese/dvipsk/files/updmap-ptex.in
deleted file mode 100644
index 92c1b0e301e8..000000000000
--- a/japanese/dvipsk/files/updmap-ptex.in
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-SETENV=/usr/bin/env
-
-${SETENV} \
-	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-plist b/japanese/dvipsk/pkg-plist
index 7bf38a49589c..f7cab2cbad35 100644
--- a/japanese/dvipsk/pkg-plist
+++ b/japanese/dvipsk/pkg-plist
@@ -3,8 +3,6 @@ bin/afm2tfm
 bin/dvips
 bin/odvips
 bin/udvips
-bin/updmap-sys-ptex
-%%TEXMFDIR%%/web2c/ptex/updmap.cfg
 %%DVIPSDIR%%/base/tex.pro
 %%DVIPSDIR%%/base/texps.pro
 %%DVIPSDIR%%/base/texc.pro
@@ -13,22 +11,11 @@ bin/updmap-sys-ptex
 %%DVIPSDIR%%/base/color.pro
 %%DVIPSDIR%%/base/crop.pro
 %%DVIPSDIR%%/base/hps.pro
-%%DVIPSDIR%%/base/builtin35.map
-%%DVIPSDIR%%/base/download35.map
-%%DVIPSDIR%%/base/dvipdfm.map
-%%DVIPSDIR%%/base/dvipdfm_dl14.map
-%%DVIPSDIR%%/base/dvipdfm_ndl14.map
-%%DVIPSDIR%%/base/pdftex.map
-%%DVIPSDIR%%/base/pdftex_dl14.map
-%%DVIPSDIR%%/base/pdftex_ndl14.map
-%%DVIPSDIR%%/base/ps2pk.map
-%%DVIPSDIR%%/base/psfonts.map
-%%DVIPSDIR%%/base/psfonts_pk.map
-%%DVIPSDIR%%/base/psfonts_t1.map
-%%DVIPSDIR%%/config/config.ps
+%%DVIPSCONFIGDIR%%/config/config.ps
 @dirrm %%DVIPSDIR%%/base
-@dirrm %%DVIPSDIR%%/config
-%%FONTSMAPDIR%%/ptex/kanji.map
-@dirrm %%FONTSMAPDIR%%/ptex
+@dirrm %%DVIPSCONFIGDIR%%/config
+%%FONTSMAPDIR%%/dvips/kanji.map
 @exec %%MKTEXLSR%%
+@exec %%UPDMAP_SYS_PTEX%% --enable Map=kanji.map
+@unexec %%UPDMAP_SYS_PTEX%% --disable kanji.map
 @unexec %%MKTEXLSR%%