o Add new vfontcap.freetype and vfontcap.vflib file (obtained from

  the Japanese patch), and use them instead of the old version.
  Bump PORTREVISION.
o Tidy up Makefile.

PR:		ports-jp/14598[1], ports/63536[2],
Submitted by:	SHIOZAKI Takehiko <st@be.to>[1], hrs[2]
Approved by:	maintainer no response

4 files changed, 169 insertions, 139 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 92229bd39e1a..ebcf52ba0f72 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	xdvik
-PORTVERSION=	22.40y1.1.21
+PORTVERSION=	${VERSION_XDVIK}.${VERSION_JPATCH}
+PORTREVISION=	1
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
-DISTNAME=	xdvik-22.40y1
+DISTNAME=	xdvik-${VERSION_XDVIK}
 
 PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/tex/
-PATCHFILES=	xdvik-22.40y1-j1.21.patch.gz
+PATCHFILES=	xdvik-${VERSION_XDVIK}-j${VERSION_JPATCH}.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
@@ -56,6 +57,8 @@ 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=		${PREFIX}/share/texmf
@@ -166,14 +169,21 @@ pre-fetch:
 pre-build:
 	@(cd ${WRKSRC} ; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
 	${SED} -e 's,%%CIDFONTDIR%%,${CIDFONTDIR},'\
-		< ${FILESDIR}/vfontmap > ${WRKSRC}/vfontmap
+		< ${FILESDIR}/vfontmap.freetype > ${WRKSRC}/vfontmap.freetype
+	${CP} ${FILESDIR}/vfontmap.vflib ${WRKSRC}/vfontmap.vflib
 
 do-install:
 	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/vfontmap ${XDVIDIR}
+	@${INSTALL_DATA} ${WRKSRC}/vfontmap.freetype ${XDVIDIR}
+	@${INSTALL_DATA} ${WRKSRC}/vfontmap.vflib ${XDVIDIR}
+.if defined(WITH_VF2FT)
+	@${INSTALL_DATA} ${WRKSRC}/vfontmap.freetype ${XDVIDIR}/vfontmap
+.else
+	@${INSTALL_DATA} ${WRKSRC}/vfontmap.vflib ${XDVIDIR}/vfontmap
+.endif
 	@${INSTALL_DATA} ${WRKSRC}/texk/xdvik/texmf/XDvi ${X11BASE}/${APPDEFAULTSDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/japanese/xdvik/files/vfontmap b/japanese/xdvik/files/vfontmap
deleted file mode 100644
index 111d3437b0b5..000000000000
--- a/japanese/xdvik/files/vfontmap
+++ /dev/null
@@ -1,134 +0,0 @@
-# $FreeBSD$
-
-## ---- start of defaults ----
-
-## ---- NTT jTeX fontset ----
-#dg	goth
-#dm	min
-
-## ---- pTeX fontset ----
-#goth	goth
-#min	min
-#ngoth	goth
-#nmin	min
-#tgoth	goth
-#tmin	min
-## ---- end of defaults ----
-
-## ---- jis fontset ----
-#jis	min
-#jisg	goth
-
-## ---- morisawa 5 fontset ----
-#Ryumin-Light-H		min
-#Ryumin-Light-J		min
-#Ryumin-Light-V		min
-#GothicBBB-Medium-H	goth
-#GothicBBB-Medium-J	goth
-#GothicBBB-Medium-V	goth
-#FutoMinA101-Bold-H	min
-#FutoMinA101-Bold-J	min
-#FutoMinA101-Bold-V	min
-#FutoGoB101-Bold-H	goth
-#FutoGoB101-Bold-J	goth
-#FutoGoB101-Bold-V	goth
-#Jun101-Light-H		min
-#Jun101-Light-J		min
-#Jun101-Light-V		min
-
-## ---- other ----
-#mgoth	maru
-#fmin	fmin
-#fgoth	goth
-
-## ---- pTeX tate fonts ----
-#tmin    tmin
-#tgoth   tgoth
-
-## ---- not use pTeX TFM (VF) ----
-#rml     min
-#gbm     goth
-#rmlv    tmin
-#gbmv    tgoth
-
-#  --with-vflib=vf2ft
-# min     %%CIDFONTDIR%%/HiraMinPro-W3.otf
-# goth    %%CIDFONTDIR%%/HiraKakuPro-W6.otf
-# tmin    %%CIDFONTDIR%%/HiraMinPro-W3.otf
-# tgoth   %%CIDFONTDIR%%/HiraKakuPro-W6.otf
-# nmin    %%CIDFONTDIR%%/HiraMinPro-W3.otf
-# ngoth   %%CIDFONTDIR%%/HiraKakuPro-W6.otf
-# jis     %%CIDFONTDIR%%/HiraMinPro-W3.otf
-# jisg    %%CIDFONTDIR%%/HiraKakuPro-W6.otf
-# dm      %%CIDFONTDIR%%/HiraMinPro-W3.otf  # not checked
-# dg      %%CIDFONTDIR%%/HiraKakuPro-W6.otf # not checked
-# mgoth   %%CIDFONTDIR%%/HiraMaruPro-W4.otf
-# fmin    %%CIDFONTDIR%%/HiraMinPro-W6.otf
-# fgoth   %%CIDFONTDIR%%/HiraKakuPro-W8.otf
-
-# UTF package (needed --with-vflib=vf2ft)
-#
-#  \UTF font 
-# unijmin-h %%CIDFONTDIR%%/HiraMinPro-W3.otf unicode
-# unijmin-v %%CIDFONTDIR%%/HiraMinPro-W3.otf unicode
-# unijgoth-h %%CIDFONTDIR%%/HiraKakuPro-W6.otf unicode
-# unijgoth-v %%CIDFONTDIR%%/HiraKakuPro-W6.otf unicode
-#  \CID font
-# cidmin-h %%CIDFONTDIR%%/HiraMinPro-W3.otf adobejapan
-# cidmin-v %%CIDFONTDIR%%/HiraMinPro-W3.otf adobejapan
-# cidgoth-h %%CIDFONTDIR%%/HiraKakuPro-W6.otf adobejapan
-# cidgoth-v %%CIDFONTDIR%%/HiraKakuPro-W6.otf adobejapan
-# hmr %%CIDFONTDIR%%/HiraMinPro-W3.otf
-# hmrv %%CIDFONTDIR%%/HiraMinPro-W3.otf cidv
-# hkb %%CIDFONTDIR%%/HiraKakuPro-W6.otf
-# hkbv %%CIDFONTDIR%%/HiraKakuPro-W6.otf cidv
-
-# OTF package (needed --with-vflib=vf2ft)
-#
-# otf-ujmr-h %%CIDFONTDIR%%/HiraMinPro-W3.otf unicode
-# otf-ujmr-v %%CIDFONTDIR%%/HiraMinPro-W3.otf unicode
-# otf-cjmr-h %%CIDFONTDIR%%/HiraMinPro-W3.otf adobejapan
-# otf-cjmr-v %%CIDFONTDIR%%/HiraMinPro-W3.otf adobejapan
-# hminr-h %%CIDFONTDIR%%/HiraMinPro-W3.otf
-# hminr-v %%CIDFONTDIR%%/HiraMinPro-W3.otf cidv
-#
-# otf-ujgr-h %%CIDFONTDIR%%/HiraKakuPro-W3.otf unicode
-# otf-ujgr-v %%CIDFONTDIR%%/HiraKakuPro-W3.otf unicode
-# otf-cjgr-h %%CIDFONTDIR%%/HiraKakuPro-W3.otf adobejapan
-# otf-cjgr-v %%CIDFONTDIR%%/HiraKakuPro-W3.otf adobejapan
-# hgothr-h %%CIDFONTDIR%%/HiraKakuPro-W3.otf
-# hgothr-v %%CIDFONTDIR%%/HiraKakuPro-W3.otf cidv
-#
-# otf-ujmb-h %%CIDFONTDIR%%/HiraMinPro-W6.otf unicode
-# otf-ujmb-v %%CIDFONTDIR%%/HiraMinPro-W6.otf unicode
-# otf-cjmb-h %%CIDFONTDIR%%/HiraMinPro-W6.otf adobejapan
-# otf-cjmb-v %%CIDFONTDIR%%/HiraMinPro-W6.otf adobejapan
-# hminb-h %%CIDFONTDIR%%/HiraMinPro-W6.otf
-# hminb-v %%CIDFONTDIR%%/HiraMinPro-W6.otf cidv
-#
-# otf-cjgb-h %%CIDFONTDIR%%/HiraKakuPro-W6.otf adobejapan
-# otf-cjgb-v %%CIDFONTDIR%%/HiraKakuPro-W6.otf adobejapan
-# otf-ujgb-h %%CIDFONTDIR%%/HiraKakuPro-W6.otf unicode
-# otf-ujgb-v %%CIDFONTDIR%%/HiraKakuPro-W6.otf unicode
-# hgothb-h %%CIDFONTDIR%%/HiraKakuPro-W6.otf
-# hgothb-v %%CIDFONTDIR%%/HiraKakuPro-W6.otf cidv
-#
-# otf-ujmgr-h %%CIDFONTDIR%%/HiraMaruPro-W4.otf unicode
-# otf-ujmgr-v %%CIDFONTDIR%%/HiraMaruPro-W4.otf unicode
-# otf-cjmgr-h %%CIDFONTDIR%%/HiraMaruPro-W4.otf adobejapan
-# otf-cjmgr-v %%CIDFONTDIR%%/HiraMaruPro-W4.otf adobejapan
-# hmgothr-h %%CIDFONTDIR%%/HiraMaruPro-W4.otf
-# hmgothr-v %%CIDFONTDIR%%/HiraMaruPro-W4.otf cidv
-#
-# otf-utmr-h %%CIDFONTDIR%%/MSungStd-Light-Acro.otf unicode
-# otf-utmr-v %%CIDFONTDIR%%/MSungStd-Light-Acro.otf unicode
-# otf-utgr-h %%CIDFONTDIR%%/MHei-Medium.otf unicode
-# otf-utgr-v %%CIDFONTDIR%%/MHei-Medium.otf unicode
-# otf-ucmr-h %%CIDFONTDIR%%/STSongStd-Light-Acro.otf unicode
-# otf-ucmr-v %%CIDFONTDIR%%/STSongStd-Light-Acro.otf unicode
-# otf-ucgr-h %%CIDFONTDIR%%/STHeiti-Regular.otf unicode
-# otf-ucgr-v %%CIDFONTDIR%%/STHeiti-Regular.otf unicode
-# otf-ukmr-h %%CIDFONTDIR%%/HYSMyeongJoStd-Medium-Acro.otf unicode
-# otf-ukmr-v %%CIDFONTDIR%%/HYSMyeongJoStd-Medium-Acro.otf unicode
-# otf-ukgr-h %%CIDFONTDIR%%/HYGoThic-Medium-UniKS.otf unicode
-# otf-ukgr-v %%CIDFONTDIR%%/HYGoThic-Medium-UniKS.otf unicode
diff --git a/japanese/xdvik/files/vfontmap.freetype b/japanese/xdvik/files/vfontmap.freetype
new file mode 100644
index 000000000000..8bc3d603b816
--- /dev/null
+++ b/japanese/xdvik/files/vfontmap.freetype
@@ -0,0 +1,113 @@
+% $FreeBSD$
+%
+% Sample "vfontmap" (--with-vflib=vf2ft)
+%
+
+% "/font/file/name"
+%    "tfm name1" "{,unicode,adobejapan,cidv}"
+%    "tfm name2" "{,unicode,adobejapan,cidv}"
+
+%%CIDFONTDIR%%/HiraMinPro-W3.otf
+%/usr/X11R6/lib/X11/fonts/truetype/kochi-mincho-subst.ttf
+%/usr/X11R6/lib/X11/fonts/TrueType/kochi-mincho.ttf
+	min
+	tmin
+	nmin
+	jis
+	jis-v
+%%CIDFONTDIR%%/HiraKakuPro-W6.otf
+%/usr/X11R6/lib/X11/fonts/truetype/kochi-gothic-subst.ttf
+%/usr/X11R6/lib/X11/fonts/TrueType/kochi-gothic.ttf
+	goth
+	tgoth
+	ngoth
+	jisg
+	jisg-v
+%%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/files/vfontmap.vflib b/japanese/xdvik/files/vfontmap.vflib
new file mode 100644
index 000000000000..cbbf6ec1f282
--- /dev/null
+++ b/japanese/xdvik/files/vfontmap.vflib
@@ -0,0 +1,41 @@
+% $FreeBSD$
+%
+% Sample "vfontmap" (--with-vflib=yes)
+%
+
+% "tfm name" "/etc/vfontcap entry" "{,tate}"
+
+% for ASCII pTeX
+min	min
+tmin	tmin
+nmin	min
+goth	goth
+tgoth	tgoth
+ngoth	goth
+
+% for JIS font metric
+jis	min
+jis-v	tmin
+jisg	goth
+jisg-v	tgoth
+
+% for NTT JTeX
+dm	min
+dg	goth
+
+% etc
+fmin	fmin
+fgoth	goth
+mgoth	maru
+
+% for morisawa
+ryumin-l    min
+ryumin-l-v  tmin
+gtbbb-m     goth
+gtbbb-m-v   tgoth
+futomin-b   min
+futomin-b-v tmin
+futogo-b    goth
+futogo-b-v  tgoth
+jun101-l    goth
+jun101-l-v  tgoth