diff --git a/japanese/xdvik-vflib/Makefile b/japanese/xdvik-vflib/Makefile
deleted file mode 100644
index f9dced046da1..000000000000
--- a/japanese/xdvik-vflib/Makefile
+++ /dev/null
@@ -1,156 +0,0 @@
-# New ports collection makefile for:   xdvik + jp-patch
-# Date created:        15 Jun 1998
-# Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xdvik
-PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	2
-CATEGORIES=	japanese print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xdvi
-PKGNAMEPREFIX=	ja-
-PKGNAMESUFFIX=	-tetex
-DISTNAME=	xdvik-${VERSION_XDVIK}
-
-PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/tex/
-PATCHFILES=	${PORTNAME}-${VERSION_XDVIK}-j${VERSION_JPATCH}.patch.gz
-PATCH_DIST_STRIP=	-p1
-
-MAINTAINER=	hrs@FreeBSD.org
-COMMENT=	DVI Previewer(kpathsearch) for X. + freetype support
-
-.include <bsd.port.pre.mk>
-
-BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
-		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
-		mktexlsr:${PORTSDIR}/print/teTeX-base
-RUN_DEPENDS=	tetex-modesw:${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 \
-		${X11BASE}/${TTFMINCHO}:${PORTSDIR}/japanese/kochi-ttfonts \
-		${X11BASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/kochi-ttfonts
-
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		wwwcore.1:${PORTSDIR}/www/libwww \
-		t1.5:${PORTSDIR}/devel/t1lib
-
-DIST_SUBDIR=	xdvik
-USE_XLIB=	YES
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--datadir=${PREFIX}/${TEXMF:S,texmf$,,} \
-		--enable-a4 --enable-shrink=${SHRINK} \
-		--with-dvifilter=${DVIPS} \
-		--enable-xdviprint=${PREFIX}/libexec/xdviprint \
-		--enable-smallpanel --enable-zoombutton \
-		--enable-gf \
-		--with-system-wwwlib --with-libwww-libdir=${LIBWWW_PREFIX}/lib \
-		--with-libwww-include=${LIBWWW_PREFIX}/include/w3c-libwww \
-		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
-		--with-t1lib-include=${LIBT1_PREFIX}/include \
-		--enable-vikey --disable-multiplatform \
-		--with-vflib=vf2ft
-CONFIGURE_ENV=	INSTALL="${INSTALL}" \
-		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-		INSTALL_DATA="${INSTALL_DATA}" \
-		INSTALL_MAN="${INSTALL_MAN}" \
-		XDEFS='-DMFMODE=\"${MF_MODE}\"' \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-SCRIPTS_ENV=	MV=${MV} SED=${SED}
-PATCH_STRIP=	-p1
-MAN1=		xdvi.1 xdvizilla.1 t1mapper.1
-
-VERSION_XDVIK=	22.40y1
-VERSION_JPATCH=	1.21
-LIBWWW_PREFIX?=	${LOCALBASE}
-LIBT1_PREFIX?=	${LOCALBASE}
-
-TEXMF=		share/texmf
-XDVIDIR=	${TEXMF}/xdvi
-TETEX_MODESW=	${LOCALBASE}/bin/tetex-modesw
-MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
-
-CIDFONTDIR=	${TEXMF}/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
-VFONTCAPFT_SUB=	CIDFONTDIR=${LOCALBASE}/${CIDFONTDIR} \
-		TTFMINCHO=${X11BASE}/${TTFMINCHO} \
-		TTFGOTHIC=${X11BASE}/${TTFGOTHIC}
-
-PKGINSTALL=	${WRKDIR}/pkg-install.sh
-PKGDEINSTALL=	${WRKDIR}/pkg-install.sh
-PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
-		MKTEXLSR=${MKTEXLSR}
-
-PLIST_SUB=	TEXMF=${TEXMF}
-
-BDPI?=		600
-SHRINK?=	6
-DVIPS?=		dvips
-.if !defined(MF_MODE) || empty(MF_MODE)
-MF_MODE!=	case ${BDPI} in\
-		118) ${ECHO_CMD} bitgraph ;;\
-		240) ${ECHO_CMD} canonlbp ;;\
-		300) ${ECHO_CMD} cx ;;\
-		360) ${ECHO_CMD} canonbjc ;;\
-		400) ${ECHO_CMD} nexthi ;;\
-		600) ${ECHO_CMD} ljfour ;;\
-		*) ${ECHO_CMD} cx ;;\
-		esac
-.endif
-
-DOCS=	FAQ xdvi.icon CHANGES.xdvik-jp.html \
-	README.xdvik-jp README.src-specials \
-	README.t1fonts README.t1mapper \
-	READMEs/ChangeLog.xdvik20a-j1.1 READMEs/ChangeLog.xdvik20c-j1.0 \
-	READMEs/HEADERS.DOC READMEs/InternalVars \
-	READMEs/README.jp+toc+hal2 READMEs/README.jp-patch \
-	READMEs/README.markpage+toc+printdvi \
-	READMEs/README.markpage+toc+printdvi+paper \
-	READMEs/README.miyu-beta6 READMEs/README.ptex \
-	READMEs/README.tasai-ussy READMEs/README.xdvik18f-j1.0.patch \
-	READMEs/README.xdvik18f-j1.1p5.patch \
-	READMEs/README.xdvik20a-j1.1.patch \
-	READMEs/README.xdvik20c-j1.0+hal2+dvisel \
-	READMEs/README.xdvik20c-j1.0p1.patch READMEs/README.vf2ft \
-	READMEs/README.xdvik-22.15-j1.04.patch
-
-pre-build:
-	${SED} ${PKGINSTALL_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
-	${CHMOD} 0755 ${PKGINSTALL}
-	@(cd ${WRKSRC} && ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
-	${SED} ${VFONTCAPFT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/vfontmap.freetype \
-		> ${VFONTCAPFT_SRC}
-
-do-install:
-	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \
-		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
-
-post-install:
-	${RM} -f ${PREFIX}/${XDVIDIR}/vfontmap.freetype
-	${RM} -f ${PREFIX}/${XDVIDIR}/vfontmap.vflib
-	${INSTALL_DATA} \
-		${VFONTCAPFT_SRC} \
-		${PREFIX}/${XDVIDIR}/vfontmap.dist
-	${INSTALL_DATA} \
-		${VFONTCAPFT_SRC} \
-		${PREFIX}/${XDVIDIR}/vfontmap
-	${INSTALL_DATA} \
-		${WRKSRC}/texk/xdvik/texmf/XDvi \
-		${PREFIX}/${XDVIDIR}/XDvi.ptex-tetex
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/texk/xdvik/,} ${DOCSDIR}
-.endif
-	@${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include <bsd.port.post.mk>
diff --git a/japanese/xdvik-vflib/distinfo b/japanese/xdvik-vflib/distinfo
deleted file mode 100644
index 53dd0434b58a..000000000000
--- a/japanese/xdvik-vflib/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 (xdvik/xdvik-22.40y1.tar.gz) = ab9083c9580e215715dc0369db3c028b
-SIZE (xdvik/xdvik-22.40y1.tar.gz) = 2256174
-MD5 (xdvik/xdvik-22.40y1-j1.21.patch.gz) = 9ce0615764079502f3b76692127a068a
-SIZE (xdvik/xdvik-22.40y1-j1.21.patch.gz) = 166908
diff --git a/japanese/xdvik-vflib/files/patch-ab b/japanese/xdvik-vflib/files/patch-ab
deleted file mode 100644
index 56383278c625..000000000000
--- a/japanese/xdvik-vflib/files/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
---- xdvik-22.40w/texk/xdvik/Makefile.in.orig	Wed Apr 16 23:26:11 2003
-+++ xdvik-22.40w/texk/xdvik/Makefile.in	Wed Apr 16 23:29:12 2003
-@@ -80,7 +80,7 @@
-   paper.o tategaki.o vfontmap.o vf2ft.o \
-   $(ALLOCA) dvips.o tfmload.o
- 
--program = xdvi.bin
-+program = xdvi
- perlprog = t1mapper
- 
- default all: $(program) $(perlprog) xdvi.1 t1mapper.1 xdviprint
-@@ -148,7 +148,6 @@
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir)
- 	for p in $(program); do $(INSTALL_LIBTOOL_PROG) $(bindir) $$p; done
- 	$(INSTALL_SCRIPT) $(srcdir)/$(perlprog) $(scriptdir)/$(perlprog)
--	$(INSTALL_SCRIPT) $(srcdir)/xdvi-sh $(scriptdir)/xdvi
- ### fix wrong CVS permissions for shell script
- 	chmod +x $(srcdir)/xdvizilla
- 	$(INSTALL_SCRIPT) $(srcdir)/xdvizilla $(scriptdir)/xdvizilla
-@@ -159,7 +158,7 @@
- 	fi
- 
- uninstall-exec:
--	for p in $(program) $(perlprog) xdvi; do rm -f $(bindir)/$$p; done
-+	for p in $(program) $(perlprog); do rm -f $(bindir)/$$p; done
- 
- ### //FIXME: add installation for encoding.map here!! (same place where psfonts.map is?)
- install-data: xdvi.1 t1mapper.1 vfontmap.sample
diff --git a/japanese/xdvik-vflib/files/pkg-install.in b/japanese/xdvik-vflib/files/pkg-install.in
deleted file mode 100644
index 52eee144d440..000000000000
--- a/japanese/xdvik-vflib/files/pkg-install.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $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} xdvi forceinstall
-	${MKTEXLSR}
-	;;
-DEINSTALL)
-	${TETEX_MODESW} default xdvi forceinstall
-	${MKTEXLSR}
-	;;
-esac
diff --git a/japanese/xdvik-vflib/files/vfontmap.freetype b/japanese/xdvik-vflib/files/vfontmap.freetype
deleted file mode 100644
index 6ef76725dea8..000000000000
--- a/japanese/xdvik-vflib/files/vfontmap.freetype
+++ /dev/null
@@ -1,113 +0,0 @@
-% $FreeBSD$
-%
-% Sample "vfontmap" (--with-vflib=vf2ft)
-%
-
-% "/font/file/name"
-%    "tfm name1" "{,unicode,adobejapan,cidv}"
-%    "tfm name2" "{,unicode,adobejapan,cidv}"
-
-%%%CIDFONTDIR%%/HiraMinPro-W3.otf
-%%TTFMINCHO%%
-	min
-	tmin
-	nmin
-	jis
-	jis-v
-	dm
-%%%CIDFONTDIR%%/HiraKakuPro-W6.otf
-%%TTFGOTHIC%%
-	goth
-	tgoth
-	ngoth
-	jisg
-	jisg-v
-	dg
-%%CIDFONTDIR%%/HiraMinPro-W6.otf
-	fmin
-%%CIDFONTDIR%%/HiraKakuPro-W8.otf
-	fgoth
-%%CIDFONTDIR%%/HiraMaruPro-W4.otf
-	maru
-
-% UTF package
-%%CIDFONTDIR%%/HiraMinPro-W3.otf
-	unijmin-h  unicode      % \UTF font
-	unijmin-v  unicode      % \UTF font
-	cidmin-h   adobejapan   % \CID font
-	cidmin-v   adobejapan   % \CID font
-	hmr                     % \CID font
-	hmrv       cidv         % \CID font
-
-%%CIDFONTDIR%%/HiraKakuPro-W6.otf
-	unijgoth-h  unicode     % \UTF font
-	unijgoth-v  unicode     % \UTF font
-	cidgoth-h   adobejapan  % \CID font
-	cidgoth-v   adobejapan  % \CID font
-	hkb                     % \CID font
-	hkbv        cidv        % \CID font
-
-% OTF package
-%%CIDFONTDIR%%/HiraMinPro-W3.otf
-	otf-ujmr-h  unicode
-	otf-ujmr-v  unicode
-	otf-cjmr-h  adobejapan
-	otf-cjmr-v  adobejapan
-	hminr-h    
-	hminr-v     cidv
-
-%%CIDFONTDIR%%/HiraKakuPro-W3.otf
-	otf-ujgr-h  unicode
-	otf-ujgr-v  unicode
-	otf-cjgr-h  adobejapan
-	otf-cjgr-v  adobejapan
-	hgothr-h   
-	hgothr-v    cidv
-
-%%CIDFONTDIR%%/HiraMinPro-W6.otf
-	otf-ujmb-h  unicode
-	otf-ujmb-v  unicode
-	otf-cjmb-h  adobejapan
-	otf-cjmb-v  adobejapan
-	hminb-h
-	hminb-v     cidv
-
-%%CIDFONTDIR%%/HiraKakuPro-W6.otf
-	otf-ujgb-h  unicode
-	otf-ujgb-v  unicode
-	otf-cjgb-h  adobejapan
-	otf-cjgb-v  adobejapan
-	hgothb-h
-	hgothb-v    cidv
-
-%%CIDFONTDIR%%/HiraMaruPro-W4.otf
-	otf-ujmgr-h  unicode
-	otf-ujmgr-v  unicode
-	otf-cjmgr-h  adobejapan
-	otf-cjmgr-v  adobejapan
-	hmgothr-h
-	hmgothr-v    cidv
-
-%%CIDFONTDIR%%/MSungStd-Light-Acro.otf
-	otf-utmr-h  unicode
-	otf-utmr-v  unicode
-
-%%CIDFONTDIR%%/MHei-Medium.otf
-	otf-utgr-h  unicode
-	otf-utgr-v  unicode
-
-%%CIDFONTDIR%%/STSongStd-Light-Acro.otf
-	otf-ucmr-h  unicode
-	otf-ucmr-v  unicode
-
-%%CIDFONTDIR%%/STHeiti-Regular.otf
-	otf-ucgr-h  unicode
-	otf-ucgr-v  unicode
-
-%%CIDFONTDIR%%/HYSMyeongJoStd-Medium-Acro.otf
-	otf-ukmr-h  unicode
-	otf-ukmr-v  unicode
-
-%%CIDFONTDIR%%/HYGoThic-Medium-UniKS.otf
-	otf-ukgr-h  unicode
-	otf-ukgr-v  unicode
diff --git a/japanese/xdvik-vflib/pkg-descr b/japanese/xdvik-vflib/pkg-descr
deleted file mode 100644
index 54155c7c0e3c..000000000000
--- a/japanese/xdvik-vflib/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-This is a Japanese dvi file previewer for X which supports:
-
-    1. dvi file of ASCII Japanese TeX(and pTeX) and NTT jTeX.
-    2. Color dvi file.(support color anti-aliasing.)
-    3. built-in EPS preview (using ghostscript)
-    4. printing (using lpr).
-    5. convert dvi -> ps (using japanese/dvipsk by default).
-    6. wheel mouse.
-
-And this requires METAFONT, FreeType2 (vector font library),
-and kpathsearch libraries version 3.2 (search library).
-
-WWW: http://www.nn.iij4u.or.jp/~tutimura/tex/xdvi.html
diff --git a/japanese/xdvik-vflib/pkg-plist b/japanese/xdvik-vflib/pkg-plist
deleted file mode 100644
index 1877a3a82e01..000000000000
--- a/japanese/xdvik-vflib/pkg-plist
+++ /dev/null
@@ -1,38 +0,0 @@
-@comment $FreeBSD$
-bin/t1mapper
-bin/xdvi
-bin/xdvizilla
-libexec/xdviprint
-%%TEXMF%%/xdvi/vfontmap
-%%TEXMF%%/xdvi/vfontmap.dist
-%%TEXMF%%/xdvi/xdvi.cfg
-%%TEXMF%%/xdvi/xdvipaper.dvi2ps-j
-%%TEXMF%%/xdvi/xdvipaper.dvips
-%%TEXMF%%/xdvi/xdvipaper.jdvi2kps
-%%TEXMF%%/xdvi/XDvi.ptex-tetex
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp.html
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20a-j1.1
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20c-j1.0
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/HEADERS.DOC
-%%PORTDOCS%%%%DOCSDIR%%/InternalVars
-%%PORTDOCS%%%%DOCSDIR%%/README.jp+toc+hal2
-%%PORTDOCS%%%%DOCSDIR%%/README.jp-patch
-%%PORTDOCS%%%%DOCSDIR%%/README.markpage+toc+printdvi
-%%PORTDOCS%%%%DOCSDIR%%/README.markpage+toc+printdvi+paper
-%%PORTDOCS%%%%DOCSDIR%%/README.miyu-beta6
-%%PORTDOCS%%%%DOCSDIR%%/README.ptex
-%%PORTDOCS%%%%DOCSDIR%%/README.src-specials
-%%PORTDOCS%%%%DOCSDIR%%/README.t1fonts
-%%PORTDOCS%%%%DOCSDIR%%/README.t1mapper
-%%PORTDOCS%%%%DOCSDIR%%/README.tasai-ussy
-%%PORTDOCS%%%%DOCSDIR%%/README.vf2ft
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-jp
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik18f-j1.0.patch
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik18f-j1.1p5.patch
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20a-j1.1.patch
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0+hal2+dvisel
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik20c-j1.0p1.patch
-%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-22.15-j1.04.patch
-%%PORTDOCS%%%%DOCSDIR%%/xdvi.icon
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index f9dced046da1..b189c5e3724f 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
@@ -22,8 +22,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X. + freetype support
 
-.include <bsd.port.pre.mk>
-
 BUILD_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base
@@ -33,7 +31,6 @@ RUN_DEPENDS=	tetex-modesw:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMF}/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 \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
@@ -91,6 +88,8 @@ PKGINSTALL_SUB=	TETEX_MODESW=${TETEX_MODESW} \
 
 PLIST_SUB=	TEXMF=${TEXMF}
 
+.include <bsd.port.pre.mk>
+
 BDPI?=		600
 SHRINK?=	6
 DVIPS?=		dvips
diff --git a/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in b/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in
new file mode 100644
index 000000000000..396813cc44c5
--- /dev/null
+++ b/japanese/xdvik/files/patch-texk::kpathsea::Makefile.in
@@ -0,0 +1,11 @@
+--- xdvik-22.40w/texk/kpathsea/Makefile.in.orig	Sun Feb 16 02:21:42 2003
++++ xdvik-22.40w/texk/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/xdvik/files/patch-texk::kpathsea::texmf.in b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
new file mode 100644
index 000000000000..317171b0e05b
--- /dev/null
+++ b/japanese/xdvik/files/patch-texk::kpathsea::texmf.in
@@ -0,0 +1,77 @@
+--- 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
+@@ -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.
+@@ -62,7 +62,7 @@
+ 
+ % If defined, teTeX's texconfig stores modifications here (instead of the
+ % TEXMFMAIN tree).
+-%   VARTEXMF = @texmf@-var
++VARTEXMF = @texmf@-var
+ 
+ % 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
+-TEXMF = {$HOMETEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
++TEXMF = {$HOMETEXMF,!!$VARTEXMF,!!$TEXMFLOCAL,!!$TEXMFMAIN}
+ 
+ % The system trees.  These are the trees that are shared by all the users.
+ SYSTEXMF = $TEXMF
+@@ -144,6 +144,13 @@
+ TEXINPUTS.latex = .;$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//
+ 
+@@ -201,12 +208,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;$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
+ 
+ % Device-independent font metric files.
+ VFFONTS = .;$TEXMF/fonts/vf//
+@@ -318,7 +325,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,}/{web2c-ptex,web2c}};$TETEXDIR;@web2c@;$TEXMF/web2c
+ 
+ 
+ 
+@@ -483,3 +490,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/xdvik/files/patch-texk::make::paths.mk b/japanese/xdvik/files/patch-texk::make::paths.mk
new file mode 100644
index 000000000000..7494e1d8cfed
--- /dev/null
+++ b/japanese/xdvik/files/patch-texk::make::paths.mk
@@ -0,0 +1,11 @@
+--- xdvik-22.40w/texk/make/paths.mk.orig	Sat Jun 12 12:13:14 2004
++++ xdvik-22.40w/texk/make/paths.mk	Sat Jun 12 12:13:04 2004
+@@ -61,7 +61,7 @@
+ dvilj_latex2e_macrodir = $(texinputdir)/latex/dvilj
+ 
+ # mktex.cnf, texmf.cnf, etc.
+-web2cdir = $(texmf)/web2c
++web2cdir = $(texmf)/web2c-ptex
+ 
+ # The top-level font directory.
+ fontdir = $(texmf)/fonts