Update and bug-fix by pathes contained in reply-mails of 11599

PR:		11599
Submitted by:	maintainer

5 files changed, 82 insertions, 17 deletions

diff --git a/japanese/xdvik/Makefile b/japanese/xdvik/Makefile
index 97c4fd86a14e..f3c8005e11de 100644
--- a/japanese/xdvik/Makefile
+++ b/japanese/xdvik/Makefile
@@ -3,14 +3,18 @@
 # Date created:        15 Jun 1998
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
-# $Id: Makefile,v 1.5 1999/01/18 03:07:17 steve Exp $
+# $Id: Makefile,v 1.6 1999/06/11 19:03:24 steve Exp $
 #
 
 DISTNAME=	xdvik-22.02
 PKGNAME=	ja-vfxdvik-22.02
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
+MASTER_SITES=	ftp://ftp.tex.ac.uk/tex-archive/dviware/xdvik/ \
+		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/ \
 		${MASTER_SITE_LOCAL}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ptex/plib-1.4-euc.tar.gz
 
 PATCH_SITES=	ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
 		${MASTER_SITE_LOCAL}
@@ -20,7 +24,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	inagaki@tg.rim.or.jp
 
 #RUN_DEPENDS=	mf:${PORTSDIR}/japanese/ptex-common
-#LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
+LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -28,23 +32,31 @@ USE_GMAKE=YES
 GNU_CONFIGURE=YES
 #CONFIGURE_ARGS= --enable-shared=yes \
 CONFIGURE_ARGS= \
-		--enable-bdpi=300 --enable-shrink=8 \
+		--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}"
 SCRIPTS_ENV=	MV=${MV} SED=${SED}
 VFFONTS=	.:${PREFIX}/share/fonts/makejvf//
-TFMFONTS=	.:${PREFIX}/share/fonts/makejvf//
-PKFONTS=	.:${PREFIX}/lib/fonts/pk300//
+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}\\\""\"'"
 MAN1=xdvi.1
 
 TEXMF=		${PREFIX}/share/texmf
 VARTEXFONTS=/var/tmp/texfonts
 XDVIDIR=	${TEXMF}/xdvi
-MAKETEX_MODE?=ljfour
-DVIPS?=	dvipsk
+PTEXTFMDIR=	${PREFIX}/share/fonts/tfm/ptex
+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 \
 		xdvi.icon \
@@ -81,17 +93,13 @@ DOCS=		FAQ \
 # ******************
 
 .if ${DVIPS} == dvi2ps
-RUN_DEPENDS+=	dvi2ps:${PORTSDIR}/japanese/dvi2ps
 CONFIGURE_ARGS+= --with-dvifilter=dvi2ps
 .elif ${DVIPS} == dvipsk-vflib
-RUN_DEPENDS+=	dvips:${PORTSDIR}/japanese/dvipsk-vflib
 CONFIGURE_ARGS+= --with-dvifilter=dvips
 .elif ${DVIPS} == dvipsk
-RUN_DEPENDS+=	dvips:${PORTSDIR}/japanese/dvipsk
 CONFIGURE_ARGS+= --with-dvifilter=dvips
 .else
 DVIPS=dvipsk
-RUN_DEPENDS+=	dvips:${PORTSDIR}/japanese/dvipsk
 CONFIGURE_ARGS+= --with-dvifilter=dvips
 .endif
 
@@ -104,11 +112,26 @@ pre-fetch:
 	${ECHO} "*          Please refer to Makefile about a change.        *"; \
 	${ECHO} "************************************************************")
 
+post-extract:
+	@${TAR} -C ${WRKDIR}/ -zxf ${DISTDIR}/ptex/plib-1.4-euc.tar.gz \
+		texmf/fonts/tfm/ptex
+
+post-patch:
+	@${CAT} ${FILESDIR}/zeit.c.diff | ${PATCH} -p1 -s -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})
+	@(cd ${WRKSRC}/texk/xdvik ; ${SETENV} ${MAKE_ENV} ${GMAKE} \
+		${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
 
 post-install:
 	@$(INSTALL_DATA) $(FILESDIR)/vfontmap $(XDVIDIR)
@@ -118,5 +141,6 @@ post-install:
 	    ${INSTALL_DATA} ${WRKSRC}/texk/xdvik/$$i ${PREFIX}/share/doc/xdvi ; \
 	done
 .endif
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/japanese/xdvik/distinfo b/japanese/xdvik/distinfo
index ebb54da0dd62..703f8006458d 100644
--- a/japanese/xdvik/distinfo
+++ b/japanese/xdvik/distinfo
@@ -1,2 +1,3 @@
 MD5 (xdvik-22.02.tar.gz) = 1a331c609753e9eb6a099fef2eda595e
+MD5 (ptex/plib-1.4-euc.tar.gz) = 8913238d89fd1d4a57e9853a91c76c4d
 MD5 (xdvik-22.02-j1.02.patch.gz) = fbb1a3a85dae5fd7710332435298e148
diff --git a/japanese/xdvik/files/vfontmap b/japanese/xdvik/files/vfontmap
index f1a95b4f87f5..f681fe4584c1 100644
--- a/japanese/xdvik/files/vfontmap
+++ b/japanese/xdvik/files/vfontmap
@@ -1,10 +1,11 @@
 
-min	min     # for ASCII
+min		min     # for ASCII
 nmin	min     # for ASCII
 goth	goth    # for ASCII
 ngoth	goth    # for ASCII
-dm	min     # for NTT
-dg	goth    # for NTT
+
+dm		min     # for NTT
+dg		goth    # for NTT
 
 mgoth	maru
 fmin	fmin
diff --git a/japanese/xdvik/pkg-descr b/japanese/xdvik/pkg-descr
index 85831e455a73..0428ab5389aa 100644
--- a/japanese/xdvik/pkg-descr
+++ b/japanese/xdvik/pkg-descr
@@ -9,5 +9,6 @@ Japanese dvi file previewer for X.
     6. print out from this program (use lpr).
     7. convert dvi -> ps (default use japanese/dvipsk).
 
-- Kentarou Inagaki
+---- 
+Kentaro Inagaki
 inagaki@tg.rim.or.jp
diff --git a/japanese/xdvik/pkg-plist b/japanese/xdvik/pkg-plist
index 10e194973b62..16b2ccb06d2d 100644
--- a/japanese/xdvik/pkg-plist
+++ b/japanese/xdvik/pkg-plist
@@ -19,7 +19,45 @@ 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
 share/doc/xdvi/xdvi.icon
+@dirrm share/fonts/tfm/ptex
+@dirrm share/fonts/tfm
 share/texmf/xdvi/vfontmap
 share/texmf/xdvi/xdvipaper.dvi2ps-j
 share/texmf/xdvi/xdvipaper.dvips