3 files changed, 23 insertions, 45 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index c4d302317ffd..e7cfdb0e96d6 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdvik
 PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	japanese print
 MASTER_SITES=	SF/xdvi
 PKGNAMEPREFIX=	ja-
@@ -28,8 +28,8 @@ RUN_DEPENDS=	${TEXMFLOCAL_LSR}:${PORTSDIR}/print/tex-texmflocal \
 		${LOCALBASE}/${TEXMFDISTDIR}/LICENSE.texmf:${PORTSDIR}/print/teTeX-texmf \
 		mktexlsr:${PORTSDIR}/print/teTeX-base \
 		${LOCALBASE}/${TEXMFDIR}/fonts/tfm/ptex/min10.tfm:${PORTSDIR}/japanese/ptex \
-		${LOCALBASE}/${TTFMINCHO}:${PORTSDIR}/japanese/ipa-ttfonts \
-		${LOCALBASE}/${TTFGOTHIC}:${PORTSDIR}/japanese/ipa-ttfonts
+		${LOCALBASE}/${MINCHO}:${PORTSDIR}/japanese/font-std \
+		${LOCALBASE}/${GOTHIC}:${PORTSDIR}/japanese/font-std
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
@@ -80,28 +80,29 @@ XDVIETCDIR=	${TEXMFDIR}/xdvi/ptex
 MKTEXLSR?=	${LOCALBASE}/bin/mktexlsr
 
 CIDFONTDIR=	${TEXMFDIR}/dvipdfm/CIDFont
-TTFMINCHO=	lib/X11/fonts/TrueType/ipam.ttf
-TTFGOTHIC=	lib/X11/fonts/TrueType/ipag.ttf
+MINCHO=		share/fonts/std.ja_JP/Ryumin-Light
+GOTHIC=		share/fonts/std.ja_JP/GothicBBB-Medium
 VFONTCAPFT_SRC=	${WRKSRC}/vfontmap.freetype
 VFONTCAPFT_SUB=	CIDFONTDIR=${LOCALBASE}/${CIDFONTDIR} \
-		TTFMINCHO=${LOCALBASE}/${TTFMINCHO} \
-		TTFGOTHIC=${LOCALBASE}/${TTFGOTHIC}
+		MINCHO=${LOCALBASE}/${MINCHO} \
+		GOTHIC=${LOCALBASE}/${GOTHIC}
 
 .include <bsd.port.pre.mk>
 
 BDPI?=		600
 SHRINK?=	6
 DVIPS?=		dvips
+MF_MODES=	118:bitgraph \
+		240:canonlbp \
+		300:cx \
+		360:canonbjc \
+		400:nexthi \
+		600:ljfour
+.for B in ${BDPI}
+MF_MODE?=	${MF_MODES:M${B}*:C/.*://}
+.endfor
 .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
+MF_MODE=	cx
 .endif
 
 DOCS=	FAQ xdvi.icon CHANGES.xdvik-jp.html \
@@ -120,6 +121,8 @@ DOCS=	FAQ xdvi.icon CHANGES.xdvik-jp.html \
 	READMEs/README.xdvik20c-j1.0p1.patch READMEs/README.vf2ft \
 	READMEs/README.xdvik-22.15-j1.04.patch
 
+PORTDOCS=	${DOCS:S,READMEs/,,}
+
 pre-build:
 	@(cd ${WRKSRC} && ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
 	${SED} ${VFONTCAPFT_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -140,7 +143,8 @@ post-install:
 		${PREFIX}/${XDVIETCDIR}/XDvi
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/texk/xdvik/,} ${DOCSDIR}
+	cd ${WRKSRC}/texk/xdvik && \
+		${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 	${MKTEXLSR}
 
diff --git a/japanese/xdvik/files/vfontmap.freetype b/japanese/xdvik/files/vfontmap.freetype
index 6ef76725dea8..c2538ce57458 100644
--- a/japanese/xdvik/files/vfontmap.freetype
+++ b/japanese/xdvik/files/vfontmap.freetype
@@ -8,7 +8,7 @@
 %    "tfm name2" "{,unicode,adobejapan,cidv}"
 
 %%%CIDFONTDIR%%/HiraMinPro-W3.otf
-%%TTFMINCHO%%
+%%MINCHO%%
 	min
 	tmin
 	nmin
@@ -16,7 +16,7 @@
 	jis-v
 	dm
 %%%CIDFONTDIR%%/HiraKakuPro-W6.otf
-%%TTFGOTHIC%%
+%%GOTHIC%%
 	goth
 	tgoth
 	ngoth
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index 5e0f1130e524..e7c1c97667c3 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -11,31 +11,5 @@ libexec/xdviprint
 %%XDVIETCDIR%%/xdvipaper.jdvi2kps
 %%XDVIETCDIR%%/XDvi
 @dirrm %%XDVIETCDIR%%
-%%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%%
 @exec %%MKTEXLSR%%
 @unexec %%MKTEXLSR%%