upgrade to 22.15.

PR:		14161
Submitted by:	Kentaro Inagaki <inagaki@tg.rim.or.jp>

5 files changed, 72 insertions, 100 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 01b8eddce6cc..4c88b396a245 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -1,68 +1,70 @@
 # New ports collection makefile for:   xdvik + jp-patch
-# Version required:    22.05b
+# Version required:    22.15
 # Date created:        15 Jun 1998
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xdvik-22.05b
-PKGNAME=	ja-vfxdvik-22.05b
+DISTNAME=	xdvik-22.15
+PKGNAME=	ja-vfxdvik-22.15
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/TeX/CTAN/dviware/xdvik/ \
+MASTER_SITES=	ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
 		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
-		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/ \
+		ftp://komadori.planet.sci.kobe-u.ac.jp/pub/xdvi/ \
+		ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/xdvi/ \
+		ftp://ftp.iij.ad.jp/pub/TeX/CTAN/dviware/xdvik/ \
+		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
+		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
 		ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \
 		${MASTER_SITE_LOCAL}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib-1.4-euc.tar.gz \
-		xdvik-22.02-j1.02.patch.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-#PATCH_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
-#		${MASTER_SITE_LOCAL}
-#PATCHFILES=	xdvik-22.02-j1.02.patch.gz
+PATCH_SITES=	ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
+		ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
+		ftp://komadori.planet.sci.kobe-u.ac.jp/pub/xdvi/ \
+		ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/xdvi/ \
+		${MASTER_SITE_LOCAL}
+PATCHFILES=	xdvik-22.15-j1.03.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
 
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
+RUN_DEPENDS=	makejvf:${PORTSDIR}/japanese/makejvf
 
-DIST_SUBDIR=	ptex
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-USE_GMAKE=YES
-GNU_CONFIGURE=YES
+DIST_SUBDIR=	xdvik
+USE_GMAKE=	YES
+GNU_CONFIGURE=	YES
 CONFIGURE_ARGS= \
 		--enable-a4 --enable-bdpi=300 --enable-shrink=8 \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint
 CONFIGURE_ENV= INSTALL="${INSTALL}" \
-	INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-	INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
+		INSTALL_PROGRAM="${INSTALL_PROGRAM}" INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
+		INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
-VFFONTS=	.:${PREFIX}/share/fonts/makejvf//
-TFMFONTS=	.:${PREFIX}/share/fonts/{makejvf:tfm/ptex}//
+VFFONTS=	.:${PREFIX}/share/fonts/makejvf/vf//
+TFMFONTS=	.:${PREFIX}/share/fonts/makejvf/tfm/ptex//
 PKFONTS=	.:${PREFIX}/lib/fonts/pk{118:240:300:360:400:600}//
 MAKE_ENV=	XDEFS="-DDEFAULT_VFFONTS='"\"\\\"${VFFONTS}\\\""\"' -DDEFAULT_TFMFONTS='"\"\\\"${TFMFONTS}\\\""\"' -DDEFAULT_PKFONTS='"\"\\\"${PKFONTS}\\\""\"'"
 PATCH_STRIP=	-p1
-MAN1=xdvi.1
+MAN1=		xdvi.1
 
 TEXMF=		${PREFIX}/share/texmf
-VARTEXFONTS=/var/tmp/texfonts
+VARTEXFONTS=	/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
-PTEXTFMDIR=	${PREFIX}/share/fonts/tfm/ptex
+MAKEJVFDIR=	${PREFIX}/share/fonts/makejvf
 MAKETEX_MODE?=	ljfour
 DVIPS?=		dvipsk
 
-PTEXTFM=goth10.tfm goth5.tfm goth6.tfm goth7.tfm goth8.tfm goth9.tfm \
-		min10.tfm min5.tfm min6.tfm min7.tfm min8.tfm min9.tfm \
-		ngoth10.tfm ngoth5.tfm ngoth6.tfm ngoth7.tfm ngoth8.tfm ngoth9.tfm \
-		nmin10.tfm nmin5.tfm nmin6.tfm nmin7.tfm nmin8.tfm nmin9.tfm \
-		tgoth10.tfm tgoth5.tfm tgoth6.tfm tgoth7.tfm tgoth8.tfm tgoth9.tfm \
-		tmin10.tfm tmin5.tfm tmin6.tfm tmin7.tfm tmin8.tfm tmin9.tfm
-
-DOCS=	FAQ \
+PTEXTFM=	standard nmin-ngoth jis morisawa
+DOCS=		FAQ \
 		xdvi.icon \
+		CHANGES.xdvik-jp \
 		README \
-		README.xdvik-22.x-jp \
+		README.xdvik-jp \
 		READMEs/ChangeLog.xdvik20a-j1.1 \
 		READMEs/ChangeLog.xdvik20c-j1.0 \
 		READMEs/HEADERS.DOC \
@@ -113,26 +115,9 @@ pre-fetch:
 	${ECHO} "*          Please refer to Makefile about a change.        *"; \
 	${ECHO} "************************************************************")
 
-post-extract:
-	@${TAR} -C ${WRKDIR}/ -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz \
-		texmf/fonts/tfm/ptex
-
-pre-patch:
-	@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/xdvik-22.02-j1.02.patch.gz | ${PATCH} ${PATCH_ARGS} -d ${WRKSRC} 2> /dev/null || exit 0
-
-post-patch:
-	@${CAT} ${FILESDIR}/zeit.c.diff | ${PATCH} ${PATCH_ARGS} -d ${WRKSRC}
-
 pre-build:
 	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
 
-pre-install:
-	@${MKDIR} ${PTEXTFMDIR}
-	@for i in ${PTEXTFM} ; do \
-		${INSTALL_DATA} ${WRKDIR}/texmf/fonts/tfm/ptex/$$i \
-			${PTEXTFMDIR} ; \
-	done
-
 do-install:
 	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
diff --git a/japanese/xdvik/distinfo b/japanese/xdvik/distinfo
index 05552dd0636c..6ff034f44177 100644
--- a/japanese/xdvik/distinfo
+++ b/japanese/xdvik/distinfo
@@ -1,3 +1,2 @@
-MD5 (ptex/xdvik-22.05b.tar.gz) = cf6e2c78f114e9e3f5c3954163c47d9d
-MD5 (ptex/plib-1.4-euc.tar.gz) = 8913238d89fd1d4a57e9853a91c76c4d
-MD5 (ptex/xdvik-22.02-j1.02.patch.gz) = fbb1a3a85dae5fd7710332435298e148
+MD5 (xdvik/xdvik-22.15.tar.gz) = 2052b671e87c9d41ea8ef5fb7aafeb5e
+MD5 (xdvik/xdvik-22.15-j1.03.patch.gz) = 06071006a05c23be2817a722dc9b1852
diff --git a/japanese/xdvik/files/vfontmap b/japanese/xdvik/files/vfontmap
index 405f8d2f95b2..49f58e71ec84 100644
--- a/japanese/xdvik/files/vfontmap
+++ b/japanese/xdvik/files/vfontmap
@@ -1,23 +1,47 @@
 ## ---- start of defaults ----
-#dg		goth	# for NTT
-#dm		min		# for NTT
 
-#ngoth	goth	# for ASCII
-#tgoth	goth	# for ASCII
-#goth	goth	# for ASCII
-#nmin	min		# for ASCII
-#tmin	min		# for ASCII
-#min	min		# for ASCII
+## ---- 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
 
-## ---- tate fonts ----
-#tmin    tmin     # for ASCII
-#tgoth   tgoth    # for ASCII
+## ---- pTeX tate fonts ----
+#tmin    tmin
+#tgoth   tgoth
 
 ## ---- not use pTeX TFM (VF) ----
 #rml     min
diff --git a/japanese/xdvik/pkg-descr b/japanese/xdvik/pkg-descr
index c50083d6806f..8e17544ba6f0 100644
--- a/japanese/xdvik/pkg-descr
+++ b/japanese/xdvik/pkg-descr
@@ -1,5 +1,5 @@
 Japanese dvi file previewer for X.
-(xdvik-22.05b + xdvik-22.02-j1.02)
+(xdvik-22.15 + xdvik-22.15-j1.03)
 
     1. support dvi file of ASCII Japanese TeX(and pTeX) and NTT jTeX.
     2. require METAFONT and VFlib (vector font library).
@@ -8,5 +8,6 @@ Japanese dvi file previewer for X.
     5. built-in EPS preview (need to any ghostscript)
     6. print out from this program (use lpr).
     7. convert dvi -> ps (default use japanese/dvipsk).
+    8. support wheel mouse.
 
 - Kentaro Inagaki <inagaki@tg.rim.or.jp>
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index 441db1015fe4..c280cfffcb51 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -6,8 +6,9 @@ share/texmf/xdvi/xdvipaper.dvips
 share/texmf/xdvi/xdvipaper.jdvi2kps
 share/doc/xdvi/FAQ
 share/doc/xdvi/xdvi.icon
+share/doc/xdvi/CHANGES.xdvik-jp
 share/doc/xdvi/README
-share/doc/xdvi/README.xdvik-22.x-jp
+share/doc/xdvi/README.xdvik-jp
 share/doc/xdvi/ChangeLog.xdvik20a-j1.1
 share/doc/xdvi/ChangeLog.xdvik20c-j1.0
 share/doc/xdvi/HEADERS.DOC
@@ -24,43 +25,5 @@ share/doc/xdvi/README.xdvik18f-j1.1p5.patch
 share/doc/xdvi/README.xdvik20a-j1.1.patch
 share/doc/xdvi/README.xdvik20c-j1.0+hal2+dvisel
 share/doc/xdvi/README.xdvik20c-j1.0p1.patch 
-share/fonts/tfm/ptex/goth10.tfm
-share/fonts/tfm/ptex/goth5.tfm
-share/fonts/tfm/ptex/goth6.tfm
-share/fonts/tfm/ptex/goth7.tfm
-share/fonts/tfm/ptex/goth8.tfm
-share/fonts/tfm/ptex/goth9.tfm
-share/fonts/tfm/ptex/min10.tfm
-share/fonts/tfm/ptex/min5.tfm
-share/fonts/tfm/ptex/min6.tfm
-share/fonts/tfm/ptex/min7.tfm
-share/fonts/tfm/ptex/min8.tfm
-share/fonts/tfm/ptex/min9.tfm
-share/fonts/tfm/ptex/ngoth10.tfm
-share/fonts/tfm/ptex/ngoth5.tfm
-share/fonts/tfm/ptex/ngoth6.tfm
-share/fonts/tfm/ptex/ngoth7.tfm
-share/fonts/tfm/ptex/ngoth8.tfm
-share/fonts/tfm/ptex/ngoth9.tfm
-share/fonts/tfm/ptex/nmin10.tfm
-share/fonts/tfm/ptex/nmin5.tfm
-share/fonts/tfm/ptex/nmin6.tfm
-share/fonts/tfm/ptex/nmin7.tfm
-share/fonts/tfm/ptex/nmin8.tfm
-share/fonts/tfm/ptex/nmin9.tfm
-share/fonts/tfm/ptex/tgoth10.tfm
-share/fonts/tfm/ptex/tgoth5.tfm
-share/fonts/tfm/ptex/tgoth6.tfm
-share/fonts/tfm/ptex/tgoth7.tfm
-share/fonts/tfm/ptex/tgoth8.tfm
-share/fonts/tfm/ptex/tgoth9.tfm
-share/fonts/tfm/ptex/tmin10.tfm
-share/fonts/tfm/ptex/tmin5.tfm
-share/fonts/tfm/ptex/tmin6.tfm
-share/fonts/tfm/ptex/tmin7.tfm
-share/fonts/tfm/ptex/tmin8.tfm
-share/fonts/tfm/ptex/tmin9.tfm
 @dirrm share/texmf/xdvi
-@dirrm share/fonts/tfm/ptex
-@dirrm share/fonts/tfm
 @dirrm share/doc/xdvi