10 files changed, 187 insertions, 217 deletions

diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 614f02a676cd..923ce0db34f7 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvipsk
 PORTVERSION=	5.94a
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://sunsite.informatik.rwth-aachen.de/pub/comp/tex/teTeX/2.0/distrib/ \
 		${MASTER_SITE_TEX_CTAN} \
@@ -18,7 +18,7 @@ PKGNAMEPREFIX=	ja-
 PKGNAMESUFFIX=	-tetex
 DISTFILES=	tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
 		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}:jpatch \
-		udvips-5.94a-p1.6.patch:udvipspatch
+		udvips-5.94a-p1.6a.patch:udvipspatch
 DIST_SUBDIR=	teTeX
 EXTRACT_ONLY=	tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
 		dvipsk-jpatch-p${VER_JPATCH}${EXTRACT_SUFX}
@@ -26,11 +26,11 @@ EXTRACT_ONLY=	tetex-src-${VER_TETEX}${EXTRACT_SUFX} \
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A DVI to PostScript translator + Japanese patch
 
-BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+BUILD_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/${TEXMF}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex
-RUN_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
+RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/${TEXMF}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex-tetex
@@ -40,12 +40,14 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 
 PATCH_WRKSRC=	${WRKDIR}/tetex-src-${VER_TETEX}/texk
 EXTRA_PATCHES=	${WRKDIR}/dvipsk-5.92b-p${VER_JPATCH}.patch \
-		${DISTDIR}/${DIST_SUBDIR}/udvips-5.94a-p1.6.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
 
-PLIST_SUB=	TEXMF=${TEXMF} MKTEXLSR=${MKTEXLSR}
+PLIST_SUB=	DVIPSDIR=${DVIPSDIR} \
+		MKTEXLSR=${MKTEXLSR} \
+		TEXMF=${TEXMF}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
@@ -58,30 +60,30 @@ CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-pnglib-include=${LIBPNG_PREFIX}/include \
 		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
 		--with-t1lib-include=${LIBT1_PREFIX}/include
-PKGINSTALL=	${WRKDIR}/pkg-install.sh
-PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
-CONFLICTS=	ja-ptex-base* dvips* ja-dvipsk-vflib-*
+CONFLICTS=	ja-ptex-base-[0-9]* dvips*
 
 MAN1=		dvips.1 afm2tfm.1
 INFO=		dvips
 
 VER_TETEX=	2.0.2
-VER_JPATCH=	1.6
+VER_JPATCH=	1.6a
+
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 TEXMF?=		share/texmf
+TEXMFLOCAL?=	share/texmf-local
+TEXMFLOCAL_LSR?=${LOCALBASE}/${TEXMFLOCAL}/ls-R
+DVIPSDIR?=	${TEXMF}/dvips-ptex
 LIBPNG_PREFIX?=	${LOCALBASE}
 LIBWWW_PREFIX?=	${LOCALBASE}
 LIBT1_PREFIX?=	${LOCALBASE}
 
-TETEX_MODESW=	${PREFIX}/bin/tetex-modesw
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		MKTEXLSR=${MKTEXLSR}
+UPDMAP_SUB=	PREFIX=${PREFIX} \
+		TEXMF=${TEXMF} \
+		DVIPSDIR=${DVIPSDIR}
 
 post-configure:
-	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-	${CHMOD} 0755 ${PKGINSTALL}
-	cd ${PATCH_WRKSRC} && ${RM} -rf udvipsk && ${CP} -R dvipsk udvipsk
+	cd ${PATCH_WRKSRC} && \
+		${RM} -rf udvipsk && ${CP} -R dvipsk udvipsk
 
 do-build:
 .for D in dvipsk odvipsk
@@ -96,6 +98,7 @@ do-build:
 		${ALL_TARGET}
 
 do-install:
+	${MKDIR} ${PREFIX}/${DVIPSDIR}/config
 .for D in dvipsk odvipsk
 	cd ${WRKDIR}/tetex-src-${VER_TETEX}/texk/${D} &&\
 		${SETENV} ${MAKE_ENV} ${GMAKE} \
@@ -104,14 +107,22 @@ do-install:
 	${INSTALL_PROGRAM} \
 		${PATCH_WRKSRC}/udvipsk/udvips \
 		${PREFIX}/bin
-
-post-install:
+	${RM} -f ${PREFIX}/${DVIPSDIR}/base/config.ps
 	${INSTALL_DATA} \
 		${FILESDIR}/ptex-kanji.map \
-		${PREFIX}/${TEXMF}/dvips/ptex/ptex-kanji.map
+		${PREFIX}/${DVIPSDIR}/base/ptex-kanji.map
+	(${CAT} ${LOCALBASE}/${TEXMF}/web2c/updmap.cfg; \
+	 ${ECHO_CMD} "Map ptex-kanji.map" ) > ${WRKDIR}/updmap.cfg
 	${INSTALL_DATA} \
-		${FILESDIR}/config.ps.ptex-tetex \
-		${PREFIX}/${TEXMF}/dvips/config/config.ps.ptex-tetex
-	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
+		${WRKDIR}/updmap.cfg \
+		${PREFIX}/${TEXMF}/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
+	${MKTEXLSR}
+	${SH} ${PREFIX}/bin/updmap-ptex --nohash
+
+post-install:
+	${MKTEXLSR}
 
 .include <bsd.port.mk>
diff --git a/japanese/dvipsk/distinfo b/japanese/dvipsk/distinfo
index 00cb3ea24bf3..d19baa03446a 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.6.tar.gz) = a072a2196015caa15834522728a91a78
-SIZE (teTeX/dvipsk-jpatch-p1.6.tar.gz) = 28637
-MD5 (teTeX/udvips-5.94a-p1.6.patch) = a41fd7b5532d72a133d8da4ff39eb45b
-SIZE (teTeX/udvips-5.94a-p1.6.patch) = 15975
+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
diff --git a/japanese/dvipsk/files/config.ps.ptex-tetex b/japanese/dvipsk/files/config.ps.ptex-tetex
deleted file mode 100644
index e238c93fcacc..000000000000
--- a/japanese/dvipsk/files/config.ps.ptex-tetex
+++ /dev/null
@@ -1,130 +0,0 @@
-% $FreeBSD$
-% teTeX's config.ps. Thomas Esser, 1998, public domain.
-
-% Memory available. Download the three-line PostScript file:
-%   %! Hey, we're PostScript
-%   /Times-Roman findfont 30 scalefont setfont 144 432 moveto
-%   vmstatus exch sub 40 string cvs show pop showpage
-% to determine this number. (It will be the only thing printed.)
-m 3500000
-
-% Execution of external programs is disabled by default. Set
-% to z0 if you want backticks in \special commands enabled.
-z1
-
-% How to print, maybe with lp instead lpr, etc. If commented-out, output
-% will go into a file by default.
-%o |lpr
-
-% Default resolution of this device, in dots per inch.
-D 600
-X 600
-Y 600
-
-% Metafont mode.  (This is completely different from the -M
-% command-line option, which controls whether mktexpk is invoked.)
-% See ../../metafont/misc/modes.mf for a list of mode names.  This mode
-% and the D number above must agree, or mktexpk will get confused.
-M ljfour
-
-% Also look for this list of resolutions.
-R 300 600
-
-% Correct printer offset. You can use testpage.tex from the LaTeX
-% distribution to find these numbers.
-O 0pt,0pt
-
-% With a high resolution and a RISC cpu, better to compress the bitmaps.
-% PS files are much more compact, but can sometimes cause trouble.
-Z
-
-% Partially download Type 1 fonts by default.  Only reason not to do
-% this is if you encounter bugs.  (Please report them to
-% @email{tex-k@@mail.tug.org} if you do.)
-j
-
-% This shows how to add your own map file.
-% Remove the comment and adjust the name:
-% p +myfonts.map
-p +ptex-kanji.map
-
-@ A4size 210mm 297mm
-@+ %%PaperSize: A4
-
-@ letterSize 8.5in 11in
-
-@ letter 8.5in 11in
-@+ %%BeginPaperSize: Letter
-@+ letter
-@+ %%EndPaperSize
-
-@ legal 8.5in 14in
-@+ ! %%DocumentPaperSizes: Legal
-@+ %%BeginPaperSize: Legal
-@+ legal
-@+ %%EndPaperSize
-
-@ ledger 17in 11in
-@+ ! %%DocumentPaperSizes: Ledger
-@+ %%BeginPaperSize: Ledger
-@+ ledger
-@+ %%EndPaperSize
-
-@ tabloid 11in 17in
-@+ ! %%DocumentPaperSizes: Tabloid
-@+ %%BeginPaperSize: Tabloid
-@+ 11x17
-@+ %%EndPaperSize
-
-@ a6 105mm 148mm
-@+ ! %%DocumentPaperSizes: a6
-@+ %%BeginPaperSize: a6
-@+ a6
-@+ %%EndPaperSize
-
-@ a5 148mm 210mm
-@+ ! %%DocumentPaperSizes: a5
-@+ %%BeginPaperSize: a5
-@+ a5
-@+ %%EndPaperSize
-
-@ a4 210mm 297mm
-@+ ! %%DocumentPaperSizes: a4
-@+ %%BeginPaperSize: a4
-@+ a4
-@+ %%EndPaperSize
-
-@ a3 297mm 420mm
-@+ ! %%DocumentPaperSizes: a3
-@+ %%BeginPaperSize: a3
-@+ a3
-@+ %%EndPaperSize
-
-@ b6 128mm 182mm
-@+ ! %%DocumentPaperSizes: b6
-@+ %%BeginPaperSize: b6
-@+ b6
-@+ %%EndPaperSize
-
-@ b5 182mm 257mm
-@+ ! %%DocumentPaperSizes: b5
-@+ %%BeginPaperSize: b5
-@+ b5
-@+ %%EndPaperSize
-
-@ b4 257mm 364mm
-@+ ! %%DocumentPaperSizes: b4
-@+ %%BeginPaperSize: b4
-@+ b4
-@+ %%EndPaperSize
-
-@ b3 364mm 515mm
-@+ ! %%DocumentPaperSizes: b3
-@+ %%BeginPaperSize: b3
-@+ b3
-@+ %%EndPaperSize
-
-@ unknown 0in 0in
-@+ statusdict /setpageparams known { hsize vsize 0 1 statusdict begin {
-@+ setpageparams } stopped end } { true } ifelse { statusdict /setpage known
-@+ { hsize vsize 1 statusdict begin { setpage } stopped pop end } if } if
diff --git a/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
index edd8b20560c6..a9e0844c49bc 100644
--- a/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
+++ b/japanese/dvipsk/files/patch-texk::kpathsea::texmf.in
@@ -1,11 +1,5 @@
 --- kpathsea/texmf.in.orig	Sat Feb 22 05:55:05 2003
-+++ kpathsea/texmf.in	Sat Jun 12 12:34:24 2004
-@@ -1,4 +1,4 @@
--% original texmf.cnf -- runtime path configuration file for kpathsea.
-+% ptex-tetex texmf.cnf -- runtime path configuration file for kpathsea.
- % (If you change or delete `original' on the previous line, the
- % distribution won't install its version over yours.)
- % Public domain.
++++ kpathsea/texmf.in	Fri Sep 17 14:23:28 2004
 @@ -62,7 +62,7 @@
  
  % If defined, teTeX's texconfig stores modifications here (instead of the
@@ -48,15 +42,50 @@
 -TEXPOOL = .;$TEXMF/web2c
 -MFPOOL = .;$TEXMF/web2c
 -MPPOOL = .;$TEXMF/web2c
-+TEXFORMATS = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MFBASES = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MPMEMS = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+TEXPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MFPOOL = .;$TEXMF/web2c-ptex;$TEXMF/web2c
-+MPPOOL = .;$TEXMF/web2c-ptex;$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//
+@@ -246,8 +253,8 @@
+ 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}}//
++TEXPSHEADERS = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/type1}//
++TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips{-ptex,},pdftex,tex,fonts/{type1,truetype}}//
+ 
+ % PostScript Type 1 outline fonts.
+ T1FONTS = .;$TEXMF/fonts/type1//
+@@ -262,10 +269,10 @@
+ T42FONTS = .;$TEXMF/fonts/type42//
+ 
+ % 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,}//
+ 
+ % Used by DMP (ditroff-to-mpx), called by makempx -troff.
+ TRFONTS = /usr/lib/font/devpost
+@@ -302,8 +309,8 @@
+ T4HTINPUTS   = .;$TEXMF/tex4ht//
+ 
+ % 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,}//
+ 
+ %% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment.
+ % KPSE_DOT = .
 @@ -318,7 +325,7 @@
  %
  % For security reasons, it is better not to have . part of the path.
diff --git a/japanese/dvipsk/files/patch-texk::make::paths.mk b/japanese/dvipsk/files/patch-texk::make::paths.mk
index f41143d54b4d..85197600d93c 100644
--- a/japanese/dvipsk/files/patch-texk::make::paths.mk
+++ b/japanese/dvipsk/files/patch-texk::make::paths.mk
@@ -1,5 +1,5 @@
---- make/paths.mk.orig	Sat Jun 12 12:13:14 2004
-+++ make/paths.mk	Sat Jun 12 12:13:04 2004
+--- make/paths.mk.orig	Wed Nov 13 05:54:37 2002
++++ make/paths.mk	Fri Sep 17 13:22:23 2004
 @@ -61,7 +61,7 @@
  dvilj_latex2e_macrodir = $(texinputdir)/latex/dvilj
  
@@ -9,3 +9,12 @@
  
  # The top-level font directory.
  fontdir = $(texmf)/fonts
+@@ -80,7 +80,7 @@
+ fontnamedir = $(texmf)/fontname
+ 
+ # For dvips configuration files, psfonts.map, etc.
+-dvipsdir = $(texmf)/dvips
++dvipsdir = $(texmf)/dvips-ptex
+ 
+ # For dvips .pro files, gsftopk's render.ps, etc.
+ psheaderdir = $(dvipsdir)
diff --git a/japanese/dvipsk/files/pkg-install.in b/japanese/dvipsk/files/pkg-install.in
deleted file mode 100644
index 3f237b917e13..000000000000
--- a/japanese/dvipsk/files/pkg-install.in
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-GREP=/usr/bin/grep
-SED=/usr/bin/sed
-MODE=ptex-tetex
-
-MKTEXLSR=%%MKTEXLSR%%
-TETEX_MODESW=%%TETEX_MODESW%%
-
-case $2 in
-POST-INSTALL)
-	%%TETEX_MODESW%% ${MODE} dvips forceinstall
-	%%MKTEXLSR%%
-	;;
-DEINSTALL)
-	%%TETEX_MODESW%% default dvips forceinstall
-	%%MKTEXLSR%%
-	;;
-esac
diff --git a/japanese/dvipsk/files/ptex-kanji.map b/japanese/dvipsk/files/ptex-kanji.map
index 899c1c0f4d33..bb58a852915f 100644
--- a/japanese/dvipsk/files/ptex-kanji.map
+++ b/japanese/dvipsk/files/ptex-kanji.map
@@ -1,18 +1,47 @@
 %% $FreeBSD$
 %%
-rml		Ryumin-Light-H
-rmlv		Ryumin-Light-V
-gbm		GothicBBB-Medium-H
-gbmv		GothicBBB-Medium-V
-ryumin-l	Ryumin-Light-H
-ryumin-l-v	Ryumin-Light-V
-gtbbb-m		GothicBBB-Medium-H
-gtbbb-m-v	GothicBBB-Medium-V
-futomin-b	FutoMinA101-Bold-H
-futomin-b-v	FutoMinA101-Bold-V
-futogo-b	FutoGoB101-Bold-H
-futogo-b-v	FutoGoB101-Bold-V
-jun101-l	Jun101-Light-H
-jun101-l-v	Jun101-Light-V
-unimin		Ryumin-Light-UniJIS-UCS2-H
-unigoth		GothicBBB-Medium-UniJIS-UCS2-H
+%
+% Japanese (JIS encoding)
+%
+rmlsl       ".167 SlantFont"  Ryumin-Light-H 
+gbmsl       ".167 SlantFont"  GothicBBB-Medium-H
+%%
+rml         Ryumin-Light-H
+rmlv        Ryumin-Light-V
+gbm         GothicBBB-Medium-H
+gbmv        GothicBBB-Medium-V
+%%
+%rml         Ryumin-Light-Ext-H
+%rmlv        Ryumin-Light-Ext-V
+%gbm         GothicBBB-Medium-Ext-H
+%gbmv        GothicBBB-Medium-Ext-V
+%
+% Morisawa
+%
+ryumin-l    Ryumin-Light-H
+ryumin-l-v  Ryumin-Light-V
+gtbbb-m     GothicBBB-Medium-H
+gtbbb-m-v   GothicBBB-Medium-V
+futomin-b   FutoMinA101-Bold-H
+futomin-b-v FutoMinA101-Bold-V
+futogo-b    FutoGoB101-Bold-H
+futogo-b-v  FutoGoB101-Bold-V
+jun101-l    Jun101-Light-H
+jun101-l-v  Jun101-Light-V
+%
+% ums package + virtual fonts
+%
+unimin      Ryumin-Light-UniJIS-UCS2-H
+unigoth     GothicBBB-Medium-UniJIS-UCS2-H
+%
+% utf package (S. Saito)
+%
+unijmin-h   Ryumin-Light-UniJIS-UTF16-H
+unijmin-v   Ryumin-Light-UniJIS-UTF16-V
+unijgoth-h  GothicBBB-Medium-UniJIS-UTF16-H
+unijgoth-v  GothicBBB-Medium-UniJIS-UTF16-V
+%%
+cidmin-h    Ryumin-Light-Identity-H
+cidmin-v    Ryumin-Light-Identity-V
+cidgoth-h   GothicBBB-Medium-Identity-H
+cidgoth-v   GothicBBB-Medium-Identity-V
diff --git a/japanese/dvipsk/files/updmap-ptex.in b/japanese/dvipsk/files/updmap-ptex.in
new file mode 100644
index 000000000000..e9ab3386f4a2
--- /dev/null
+++ b/japanese/dvipsk/files/updmap-ptex.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+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 \
+		--outputdir %%PREFIX%%/%%DVIPSDIR%%/base \
+		$*
diff --git a/japanese/dvipsk/pkg-message b/japanese/dvipsk/pkg-message
new file mode 100644
index 000000000000..edfca03d7f3a
--- /dev/null
+++ b/japanese/dvipsk/pkg-message
@@ -0,0 +1,12 @@
+=== IMPORTANT NOTICE ===
+
+- 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.
diff --git a/japanese/dvipsk/pkg-plist b/japanese/dvipsk/pkg-plist
index 3a1c6d7d8f08..d86fd269750f 100644
--- a/japanese/dvipsk/pkg-plist
+++ b/japanese/dvipsk/pkg-plist
@@ -3,13 +3,31 @@ bin/afm2tfm
 bin/dvips
 bin/odvips
 bin/udvips
-%%TEXMF%%/dvips/base/tex.pro
-%%TEXMF%%/dvips/base/texps.pro
-%%TEXMF%%/dvips/base/texc.pro
-%%TEXMF%%/dvips/base/special.pro
-%%TEXMF%%/dvips/base/finclude.pro
-%%TEXMF%%/dvips/base/color.pro
-%%TEXMF%%/dvips/base/crop.pro
-%%TEXMF%%/dvips/base/hps.pro
-%%TEXMF%%/dvips/ptex/ptex-kanji.map
-%%TEXMF%%/dvips/config/config.ps.ptex-tetex
+bin/updmap-ptex
+%%TEXMF%%/web2c-ptex/updmap.cfg
+%%DVIPSDIR%%/base/tex.pro
+%%DVIPSDIR%%/base/texps.pro
+%%DVIPSDIR%%/base/texc.pro
+%%DVIPSDIR%%/base/special.pro
+%%DVIPSDIR%%/base/finclude.pro
+%%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%%/base/ptex-kanji.map
+%%DVIPSDIR%%/config/config.ps
+@exec %%MKTEXLSR%%
+@dirrm %%DVIPSDIR%%/base
+@dirrm %%DVIPSDIR%%/config
+@unexec %%MKTEXLSR%%