- Update to 22.40y1.1.21

- Add WITH_VF2FT knob

PR:		ports/62031
Submitted by:	hrs
Approved by:	maintainer timeout (2 weeks)

4 files changed, 113 insertions, 14 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index ef9aef74ed0e..92229bd39e1a 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -5,23 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xdvik-vflib
-PORTVERSION=	22.40w.1.17
-PORTREVISION=	1
+PORTNAME=	xdvik
+PORTVERSION=	22.40y1.1.21
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xdvi
-DISTNAME=	xdvik-22.40w
+DISTNAME=	xdvik-22.40y1
 
 PATCH_SITES=	http://www.nn.iij4u.or.jp/~tutimura/tex/
-PATCHFILES=	xdvik-22.40w-j1.17.patch.gz
+PATCHFILES=	xdvik-22.40y1-j1.21.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
 COMMENT=	DVI Previewer(kpathsearch) for X. + jp-patch
 
-LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib \
-		wwwcore.1:${PORTSDIR}/www/libwww \
+.if defined(WITH_VF2FT)
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+PKGNAMESUFFIX=	-ft
+.else
+LIB_DEPENDS=	VFlib2:${PORTSDIR}/japanese/vflib
+PKGNAMESUFFIX=	-vflib
+.endif
+LIB_DEPENDS+=	wwwcore.1:${PORTSDIR}/www/libwww \
 		t1.5:${PORTSDIR}/devel/t1lib
 
 DIST_SUBDIR=	xdvik
@@ -38,6 +43,9 @@ CONFIGURE_ARGS=	--enable-a4 --enable-shrink=${SHRINK} \
 		--with-system-t1lib --with-t1lib-libdir=${LIBT1_PREFIX}/lib \
 		--with-t1lib-include=${LIBT1_PREFIX}/include \
 		--enable-vikey --disable-multiplatform
+.if defined(WITH_VF2FT)
+CONFIGURE_ARGS+=	--with-vflib=vf2ft
+.endif
 CONFIGURE_ENV=	INSTALL="${INSTALL}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
@@ -54,6 +62,7 @@ TEXMF=		${PREFIX}/share/texmf
 #VARTEXFONTS=	/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
 APPDEFAULTSDIR?=	lib/X11/app-defaults
+CIDFONTDIR?=	${TEXMF}/dvipdfm/CIDFont
 
 PLIST_SUB+=	APPDEFAULTSDIR=${APPDEFAULTSDIR}
 
@@ -64,7 +73,7 @@ PLIST_SUB+=	APPDEFAULTSDIR=${APPDEFAULTSDIR}
 #PKFONTS=	.:${PREFIX}/lib/fonts/pk{118:240:300:360:400:600}//
 #XDEFS+=		-DDEFAULT_PKFONTS=\"\\\"${PKFONTS}\\\"\"
 
-DOCS=		FAQ xdvi.icon CHANGES.xdvik-jp \
+DOCS=		FAQ xdvi.icon CHANGES.xdvik-jp.html \
 		README.xdvik-jp \
 		README.src-specials \
 		README.t1fonts \
@@ -156,13 +165,15 @@ pre-fetch:
 
 pre-build:
 	@(cd ${WRKSRC} ; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;)
+	${SED} -e 's,%%CIDFONTDIR%%,${CIDFONTDIR},'\
+		< ${FILESDIR}/vfontmap > ${WRKSRC}/vfontmap
 
 do-install:
 	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
-	@${INSTALL_DATA} ${FILESDIR}/vfontmap ${XDVIDIR}
+	@${INSTALL_DATA} ${WRKSRC}/vfontmap ${XDVIDIR}
 	@${INSTALL_DATA} ${WRKSRC}/texk/xdvik/texmf/XDvi ${X11BASE}/${APPDEFAULTSDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/japanese/xdvik/distinfo b/japanese/xdvik/distinfo
index d5b2b883d58f..53dd0434b58a 100644
--- a/japanese/xdvik/distinfo
+++ b/japanese/xdvik/distinfo
@@ -1,2 +1,4 @@
-MD5 (xdvik/xdvik-22.40w.tar.gz) = e484c7b21a6221c9b9f5015dfa2a6225
-MD5 (xdvik/xdvik-22.40w-j1.17.patch.gz) = dba1978dc924653cd75ee4a54109b3c2
+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/files/vfontmap b/japanese/xdvik/files/vfontmap
index 49f58e71ec84..111d3437b0b5 100644
--- a/japanese/xdvik/files/vfontmap
+++ b/japanese/xdvik/files/vfontmap
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
 ## ---- start of defaults ----
 
 ## ---- NTT jTeX fontset ----
@@ -48,3 +50,85 @@
 #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/pkg-plist b/japanese/xdvik/pkg-plist
index aeb6b72df48c..5d6062008264 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -3,11 +3,13 @@ bin/xdvi
 bin/xdvizilla
 libexec/xdviprint
 share/texmf/xdvi/vfontmap
+share/texmf/xdvi/vfontmap.freetype
+share/texmf/xdvi/vfontmap.vflib
 share/texmf/xdvi/xdvi.cfg
 share/texmf/xdvi/xdvipaper.dvi2ps-j
 share/texmf/xdvi/xdvipaper.dvips
 share/texmf/xdvi/xdvipaper.jdvi2kps
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.xdvik-jp.html
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20a-j1.1
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.xdvik20c-j1.0
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -29,8 +31,8 @@ share/texmf/xdvi/xdvipaper.jdvi2kps
 %%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%%/README.xdvik20c-j1.0p1.patch
+%%PORTDOCS%%%%DOCSDIR%%/README.xdvik-22.15-j1.04.patch
 %%PORTDOCS%%%%DOCSDIR%%/xdvi.icon
 @dirrm share/texmf/xdvi
 @dirrm %%DOCSDIR%%