bug fix & version up (22.02 -> 22.05b).

PR:		12246
Submitted by:	maintainer

7 files changed, 56 insertions, 41 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index f3c8005e11de..d32791dcaf18 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -1,36 +1,35 @@
 # New ports collection makefile for:   xdvik + jp-patch
-# Version required:    22.02
+# Version required:    22.05b
 # Date created:        15 Jun 1998
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
-# $Id: Makefile,v 1.6 1999/06/11 19:03:24 steve Exp $
+# $Id: Makefile,v 1.7 1999/06/16 12:40:59 taoka Exp $
 #
 
-DISTNAME=	xdvik-22.02
-PKGNAME=	ja-vfxdvik-22.02
+DISTNAME=	xdvik-22.05b
+PKGNAME=	ja-vfxdvik-22.05b
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \
-		ftp://ftp.iij.ad.jp/pub/TeX/CTAN/dviware/xdvik/ \
+MASTER_SITES=	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/ptex218/web2c/ \
+		ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \
 		${MASTER_SITE_LOCAL}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ptex/plib-1.4-euc.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ptex/plib-1.4-euc.tar.gz \
+	xdvik-22.02-j1.02.patch.gz
 
-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.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
+#		${MASTER_SITE_LOCAL}
+#PATCHFILES=	xdvik-22.02-j1.02.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
 
-#RUN_DEPENDS=	mf:${PORTSDIR}/japanese/ptex-common
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_GMAKE=YES
 GNU_CONFIGURE=YES
-#CONFIGURE_ARGS= --enable-shared=yes \
 CONFIGURE_ARGS= \
 		--enable-a4 --enable-bdpi=300 --enable-shrink=8 \
 		--enable-xdviprint=${PREFIX}/libexec/xdviprint
@@ -42,6 +41,7 @@ VFFONTS=	.:${PREFIX}/share/fonts/makejvf//
 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
 
 TEXMF=		${PREFIX}/share/texmf
@@ -58,7 +58,7 @@ PTEXTFM=goth10.tfm goth5.tfm goth6.tfm goth7.tfm goth8.tfm goth9.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 \
+DOCS=	FAQ \
 		xdvi.icon \
 		README \
 		README.xdvik-22.x-jp \
@@ -116,8 +116,11 @@ post-extract:
 	@${TAR} -C ${WRKDIR}/ -zxf ${DISTDIR}/ptex/plib-1.4-euc.tar.gz \
 		texmf/fonts/tfm/ptex
 
+pre-patch:
+	@${GZCAT} ${DISTDIR}/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} -p1 -s -d ${WRKSRC}
+	@${CAT} ${FILESDIR}/zeit.c.diff | ${PATCH} ${PATCH_ARGS} -d ${WRKSRC}
 
 pre-build:
 	@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
@@ -125,7 +128,7 @@ pre-build:
 pre-install:
 	@${MKDIR} ${PTEXTFMDIR}
 	@for i in ${PTEXTFM} ; do \
-	    ${INSTALL_DATA} ${WRKDIR}/texmf/fonts/tfm/ptex/$$i \
+		${INSTALL_DATA} ${WRKDIR}/texmf/fonts/tfm/ptex/$$i \
 			${PTEXTFMDIR} ; \
 	done
 
diff --git a/japanese/xdvik/distinfo b/japanese/xdvik/distinfo
index 703f8006458d..4d31511b35b3 100644
--- a/japanese/xdvik/distinfo
+++ b/japanese/xdvik/distinfo
@@ -1,3 +1,3 @@
-MD5 (xdvik-22.02.tar.gz) = 1a331c609753e9eb6a099fef2eda595e
+MD5 (xdvik-22.05b.tar.gz) = cf6e2c78f114e9e3f5c3954163c47d9d
 MD5 (ptex/plib-1.4-euc.tar.gz) = 8913238d89fd1d4a57e9853a91c76c4d
 MD5 (xdvik-22.02-j1.02.patch.gz) = fbb1a3a85dae5fd7710332435298e148
diff --git a/japanese/xdvik/files/patch-ab b/japanese/xdvik/files/patch-ab
index c3bc292f890b..298dca8a7e64 100644
--- a/japanese/xdvik/files/patch-ab
+++ b/japanese/xdvik/files/patch-ab
@@ -1,5 +1,5 @@
---- texk/xdvik/Makefile.in.orig	Thu Apr  8 21:47:48 1999
-+++ texk/xdvik/Makefile.in	Thu Apr  8 21:48:39 1999
+--- xdvik-22.02.orig/texk/xdvik/Makefile.in.orig	Thu Apr  8 21:47:48 1999
++++ xdvik-22.02/texk/xdvik/Makefile.in	Thu Apr  8 21:48:39 1999
 @@ -65,7 +65,7 @@
    paper.o tategaki.o vfontmap.o \
    $(ALLOCA)
diff --git a/japanese/xdvik/files/vfontmap b/japanese/xdvik/files/vfontmap
index f681fe4584c1..405f8d2f95b2 100644
--- a/japanese/xdvik/files/vfontmap
+++ b/japanese/xdvik/files/vfontmap
@@ -1,12 +1,26 @@
+## ---- start of defaults ----
+#dg		goth	# for NTT
+#dm		min		# for NTT
 
-min		min     # for ASCII
-nmin	min     # for ASCII
-goth	goth    # for ASCII
-ngoth	goth    # for ASCII
+#ngoth	goth	# for ASCII
+#tgoth	goth	# for ASCII
+#goth	goth	# for ASCII
+#nmin	min		# for ASCII
+#tmin	min		# for ASCII
+#min	min		# for ASCII
+## ---- end of defaults ----
 
-dm		min     # for NTT
-dg		goth    # for NTT
+## ---- other ----
+#mgoth	maru
+#fmin	fmin
+#fgoth	goth
 
-mgoth	maru
-fmin	fmin
-fgoth	goth
+## ---- tate fonts ----
+#tmin    tmin     # for ASCII
+#tgoth   tgoth    # for ASCII
+
+## ---- not use pTeX TFM (VF) ----
+#rml     min
+#gbm     goth
+#rmlv    tmin
+#gbmv    tgoth
diff --git a/japanese/xdvik/pkg-comment b/japanese/xdvik/pkg-comment
index 47218c5decdc..650692eba9be 100644
--- a/japanese/xdvik/pkg-comment
+++ b/japanese/xdvik/pkg-comment
@@ -1 +1 @@
-DVI Previewer(kpathsearch) for X + jp-patch
+DVI Previewer(kpathsearch) for X. + jp-patch
diff --git a/japanese/xdvik/pkg-descr b/japanese/xdvik/pkg-descr
index 0428ab5389aa..c50083d6806f 100644
--- a/japanese/xdvik/pkg-descr
+++ b/japanese/xdvik/pkg-descr
@@ -1,5 +1,5 @@
 Japanese dvi file previewer for X.
-(xdvik-22.02 + xdvik-22.02-j1.02)
+(xdvik-22.05b + xdvik-22.02-j1.02)
 
     1. support dvi file of ASCII Japanese TeX(and pTeX) and NTT jTeX.
     2. require METAFONT and VFlib (vector font library).
@@ -9,6 +9,4 @@ Japanese dvi file previewer for X.
     6. print out from this program (use lpr).
     7. convert dvi -> ps (default use japanese/dvipsk).
 
----- 
-Kentaro Inagaki
-inagaki@tg.rim.or.jp
+- Kentaro Inagaki <inagaki@tg.rim.or.jp>
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index 16b2ccb06d2d..441db1015fe4 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -1,11 +1,17 @@
 bin/xdvi
 libexec/xdviprint
+share/texmf/xdvi/vfontmap
+share/texmf/xdvi/xdvipaper.dvi2ps-j
+share/texmf/xdvi/xdvipaper.dvips
+share/texmf/xdvi/xdvipaper.jdvi2kps
+share/doc/xdvi/FAQ
+share/doc/xdvi/xdvi.icon
+share/doc/xdvi/README
+share/doc/xdvi/README.xdvik-22.x-jp
 share/doc/xdvi/ChangeLog.xdvik20a-j1.1
 share/doc/xdvi/ChangeLog.xdvik20c-j1.0
-share/doc/xdvi/FAQ
 share/doc/xdvi/HEADERS.DOC
 share/doc/xdvi/InternalVars
-share/doc/xdvi/README
 share/doc/xdvi/README.jp+toc+hal2
 share/doc/xdvi/README.jp-patch
 share/doc/xdvi/README.markpage+toc+printdvi
@@ -13,7 +19,6 @@ share/doc/xdvi/README.markpage+toc+printdvi+paper
 share/doc/xdvi/README.miyu-beta6
 share/doc/xdvi/README.ptex
 share/doc/xdvi/README.tasai-ussy
-share/doc/xdvi/README.xdvik-22.x-jp
 share/doc/xdvi/README.xdvik18f-j1.0.patch
 share/doc/xdvi/README.xdvik18f-j1.1p5.patch
 share/doc/xdvi/README.xdvik20a-j1.1.patch
@@ -55,12 +60,7 @@ share/fonts/tfm/ptex/tmin6.tfm
 share/fonts/tfm/ptex/tmin7.tfm
 share/fonts/tfm/ptex/tmin8.tfm
 share/fonts/tfm/ptex/tmin9.tfm
-share/doc/xdvi/xdvi.icon
+@dirrm share/texmf/xdvi
 @dirrm share/fonts/tfm/ptex
 @dirrm share/fonts/tfm
-share/texmf/xdvi/vfontmap
-share/texmf/xdvi/xdvipaper.dvi2ps-j
-share/texmf/xdvi/xdvipaper.dvips
-share/texmf/xdvi/xdvipaper.jdvi2kps
 @dirrm share/doc/xdvi
-@dirrm share/texmf/xdvi