Remove a couple of BUILD_DEPENDS, cleanup DESC/COMMENT, and get

ready to split into vftool and vftool-misc.

PR:		7520
Submitted by:	maintainer

7 files changed, 64 insertions, 147 deletions

diff --git a/japanese/vftool/Makefile b/japanese/vftool/Makefile
index 6cb52f2bcba4..6ebb146432c1 100644
--- a/japanese/vftool/Makefile
+++ b/japanese/vftool/Makefile
@@ -1,48 +1,50 @@
-# New ports collection makefile for: virtual fonts tools
+# New ports collection makefile for: virtual fonts tools(n2a,a2n,a2bk,p2pn)
 # Version required:	1.2
 # Date created:		12 September 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
-# $Id: Makefile,v 1.3 1998/03/22 07:58:44 asami Exp $
+# $Id: Makefile,v 1.4 1998/07/20 03:15:17 steve Exp $
 #
 
 DISTNAME=	vftool-1.2
 PKGNAME=	ja-vftool-1.2
 CATEGORIES=	print japanese
-MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/
+MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/ \
+		ftp://bash.cc.keio.ac.jp/pub/TeX/ASCII/ \
+		ftp://ftp.iis.u-tokyo.ac.jp/TeX/NTT-JTeX/:old/ \
+		ftp://ftp.iis.u-tokyo.ac.jp/TeX/fonts/pk/ \
+		ftp://ftp.waseda.ac.jp/pub/tex/ascii-OLD/
+DISTFILES=	vftool-1.2.tar.gz plib13-euc.tar.gz jtex-1.52.tar.gz
 
 MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
-BUILD_DEPENDS=	${JFMDIR}/goth10.tfm:${PORTSDIR}/japanese/ptex-${JACODE} \
-		${AFMDIR}/GothicBBB-Medium-H:${PORTSDIR}/japanese/japaneseAFM \
-		${GOTTFMDIR}/dgjgreek10.tfm:${PORTSDIR}/japanese/jtex209-${JTEX} \
-		${PKDIR}/dmjsy10.${RESOLUTION}pk:${PORTSDIR}/japanese/pkfonts
+BUILD_DEPENDS=	${AFMDIR}/GothicBBB-Medium-H:${PORTSDIR}/japanese/japaneseAFM
 
-ALL_TARGET=	n2a a2n a2bk p2pn tjsy tjsypk rot
-SCRIPTS_ENV=	SED=${SED} \
-		PKDIR=${PKDIR} WRKSRC=${WRKSRC} \
-		AFMDIR=${AFMDIR} GOTTFMDIR=${GOTTFMDIR} \
-		JFMDIR=${JFMDIR} MINTFMDIR=${MINTFMDIR}
-MAKE_ENV=	AFM=${AFMDIR} GOTTFM=${GOTTFMDIR} JFM=${JFMDIR} \
-		MINTFM=${MINTFMDIR} PK=${PKDIR}
+EXTRACT_ONLY=	vftool-1.2.tar.gz
+
+ALL_TARGET=	n2a a2n a2bk p2pn
+SCRIPTS_ENV=	MV=${MV} SED=${SED} AFMDIR=${AFMDIR} JFMDIR=${JFMDIR}
+MAKE_ENV=	AFM=${AFMDIR} JFM=${JFMDIR}
 
 AFMDIR=		${PREFIX}/share/fonts/afm
 FONTSDIR=	${PREFIX}/share/fonts
-GOTTFMDIR=	${PREFIX}/share/tex/jfonts/gothic
-JFMDIR=		${PREFIX}/share/texmf/fonts/tfm/ptex
-MINTFMDIR=	${PREFIX}/share/tex/jfonts/mincho
-PKDIR=		${PREFIX}/lib/fonts/pk${RESOLUTION}J
+JFMDIR=		${WRKDIR}/share/texmf/fonts/tfm/ptex
 PORTSDOCDIR=	${PREFIX}/share/doc/vftool
-TARGETDIRS=	vf-n2a vf-a2n vf-a2bk vf-p2pn vf-tjsy pk-tjsy
-
-pre-configure:
-	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tmpl
+TARGETDIRS=	vf-n2a vf-a2n vf-a2bk vf-p2pn
+
+post-extract:
+	(cd ${WRKDIR}; \
+		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/plib13-euc.tar.gz \
+			share/texmf/fonts/tfm/ptex; \
+		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/jtex-1.52.tar.gz \
+			jtex-1.52/JTeXfonts/dnpfonts/mincho/tfm \
+			jtex-1.52/JTeXfonts/dnpfonts/gothic/tfm; \
+	)
 
 do-install:
 	@(cd ${FONTSDIR}; ${MKDIR} ${TARGETDIRS})
 	@(cd ${WRKSRC}; \
-	${INSTALL_PROGRAM} mka2bkvf mka2nvf mkn2avf mkp2nvf mktjsyvf \
-		mktjsygf mkrotvf mkrotgf ${PREFIX}/bin; \
+	${INSTALL_PROGRAM} mka2bkvf mka2nvf mkn2avf mkp2nvf ${PREFIX}/bin; \
 	)
 .for t in ${TARGETDIRS}
 	@${INSTALL_DATA} ${WRKSRC}/${t}/* ${FONTSDIR}/${t}
@@ -51,11 +53,9 @@ do-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PORTSDOCDIR}
 	@(cd ${WRKSRC}; \
-	${INSTALL_SCRIPT} MKASC2BKall MKASC2NTT MKNTT2ASC MKPTEX2PNTT \
-		MKTJSY MKTJSYPK ${PORTSDOCDIR}; \
+	${INSTALL_SCRIPT} MKASC2BKall MKASC2NTT MKNTT2ASC MKPTEX2PNTT ${PORTSDOCDIR}; \
 	${INSTALL_DATA} Makefile README vfdata.doc ${PORTSDOCDIR}; \
 	)
 .endif
 
-.include "${.CURDIR}/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/japanese/vftool/distinfo b/japanese/vftool/distinfo
index ce16997fdf3e..f870723436d8 100644
--- a/japanese/vftool/distinfo
+++ b/japanese/vftool/distinfo
@@ -1,2 +1,3 @@
 MD5 (vftool-1.2.tar.gz) = 22568177a86169945295056598dee052
-MD5 (japaneseAFM.tar.gz) = ea5fa1c0cad94559f6702bae3e862f09
+MD5 (plib13-euc.tar.gz) = 5f0f4639c8f37ed0eb5d759626f5f4c2
+MD5 (jtex-1.52.tar.gz) = e392c0ed837374a021499a5f48f3feb1
diff --git a/japanese/vftool/files/patch-aa b/japanese/vftool/files/patch-aa
index 2e45e20d521d..ab6fc3db9f17 100644
--- a/japanese/vftool/files/patch-aa
+++ b/japanese/vftool/files/patch-aa
@@ -1,42 +1,17 @@
 --- Makefile.orig	Mon Aug  7 02:48:48 1995
-+++ Makefile	Thu Sep 11 20:55:16 1997
-@@ -1,21 +1,22 @@
++++ Makefile	Sun Aug  2 15:55:56 1998
+@@ -1,12 +1,12 @@
  #
  # where you can find ASCII Nihongo TeX jfm files: min10.tfm ...
 -JFM = /usr/local/lib/tex/jfonts/jfm
 +JFM ?= %%JFM%%
  #
  # where you can find NTT JTeX tfm files: dmjsy10.tfm ...
--SUBTFM = /usr/local/lib/tex/jfonts/tfm
-+MINTFM ?= %%MINTFM%%
-+GOTTFM ?= %%GOTTFM%%
+ SUBTFM = /usr/local/lib/tex/jfonts/tfm
  #
  # where you can find afm files: Ryumin-Light-H ...
 -AFM = afm
 +AFM ?= %%AFM%%
  # builtin kanji fonts 
--bkfonts = ${t1} ${t2}
-+bkfonts = ${t1} ${t2} ${t3} ${t4}
+ bkfonts = ${t1} ${t2}
  t1=rml:Ryumin-Light-H:min:monokan
- t2=gbm:GothicBBB-Medium-H:goth:monokan
- t3=rmlv:Ryumin-Light-V:tmin:monokan-v
- t4=gbmv:GothicBBB-Medium-V:tgoth:monokan-v
- #
--# where you can tind dmjsy10.300pk ...
--PK = /usr/local/lib/tex/jfonts/pk
-+# where you can find dmjsy10.300pk ...
-+PK ?= %%PK%%
- 
- FILES = Makefile README vfdata.doc prninfo.ps \
- 	MKNTT2ASC MKASC2NTT MKASC2BKall MKASC2BK \
-@@ -53,8 +54,8 @@
- 
- tjsy: mktjsyvf
- 	-mkdir vf-tjsy
--	./MKTJSY vrotdnp dm tdm ${SUBTFM} vf-tjsy
--	./MKTJSY vrotdnp dg tdg ${SUBTFM} vf-tjsy
-+	./MKTJSY vrotdnp dm tdm ${MINTFM} vf-tjsy
-+	./MKTJSY vrotdnp dg tdg ${GOTTFM} vf-tjsy
- 
- tjsypk: mktjsygf
- 	-mkdir pk-tjsy
diff --git a/japanese/vftool/pkg-comment b/japanese/vftool/pkg-comment
index 61efdfc880e4..195f3e98241b 100644
--- a/japanese/vftool/pkg-comment
+++ b/japanese/vftool/pkg-comment
@@ -1 +1 @@
-Virtual font kit for using in dvi2ps, dvipsk or dvi2dvi.
+Virtual font kit for using in dvi2ps, dvipsk or dvi2dvi (n2a,a2n,a2bk,p2pn)
diff --git a/japanese/vftool/pkg-descr b/japanese/vftool/pkg-descr
index 9e8e57415511..7886edc50852 100644
--- a/japanese/vftool/pkg-descr
+++ b/japanese/vftool/pkg-descr
@@ -1,7 +1,7 @@
 This kit is for making virtual font using in dvi2ps, dvipsk or dvi2dvi.
 
-This port provides virtual fonts with tartget of all 
-following 7 targets(n2a, a2n, a2bk, p2pn, tjsy, tjsypk and rot).
+This port provides virtual fonts with tartget of following 4
+targets(n2a, a2n, a2bk, p2pn):
 
 n2a     virtual font for transform from dvi file of NTT JTeX to ASCII
         Japanese TeX.
@@ -10,9 +10,6 @@ a2n     virtual font for transform from dvi file of ASCII Japanese TeX to
 a2bk    virtual font for transform from dvi file of ASCII Japanese TeX to
         dvi file using printer-builtin mono space Kanji fonts.
 p2pn    virtual font for transform from dvi file of pTeX to NTT JTeX.
-tjsy    virtual font for transform from dmjsy*,dgjsy* to rotated -90".
-tjsypk  virtual font for transform from dmjsy*pk,dgjsy*pk to rotated -90".
-rot     make utilies for rotate english pk-fonts.
 
 If you make use of Japanese "Takegaki" style in pTeX or pLaTeX2e, you must be
 installed this port before installing dvi2ps.
diff --git a/japanese/vftool/pkg-plist b/japanese/vftool/pkg-plist
index 2afb53f7a91f..9fab46bc02b2 100644
--- a/japanese/vftool/pkg-plist
+++ b/japanese/vftool/pkg-plist
@@ -2,59 +2,13 @@ bin/mka2bkvf
 bin/mka2nvf
 bin/mkn2avf
 bin/mkp2nvf
-bin/mkrotgf
-bin/mkrotvf
-bin/mktjsygf
-bin/mktjsyvf
 share/doc/vftool/MKASC2BKall
 share/doc/vftool/MKASC2NTT
 share/doc/vftool/MKNTT2ASC
 share/doc/vftool/MKPTEX2PNTT
-share/doc/vftool/MKTJSY
-share/doc/vftool/MKTJSYPK
 share/doc/vftool/Makefile
 share/doc/vftool/README
 share/doc/vftool/vfdata.doc
-share/fonts/vf-a2bk/gbm.tfm
-share/fonts/vf-a2bk/gbmv.tfm
-share/fonts/vf-a2bk/goth10.vf
-share/fonts/vf-a2bk/goth5.vf
-share/fonts/vf-a2bk/goth6.vf
-share/fonts/vf-a2bk/goth7.vf
-share/fonts/vf-a2bk/goth8.vf
-share/fonts/vf-a2bk/goth9.vf
-share/fonts/vf-a2bk/min10.vf
-share/fonts/vf-a2bk/min5.vf
-share/fonts/vf-a2bk/min6.vf
-share/fonts/vf-a2bk/min7.vf
-share/fonts/vf-a2bk/min8.vf
-share/fonts/vf-a2bk/min9.vf
-share/fonts/vf-a2bk/rml.tfm
-share/fonts/vf-a2bk/rmlv.tfm
-share/fonts/vf-a2bk/tgoth10.vf
-share/fonts/vf-a2bk/tgoth5.vf
-share/fonts/vf-a2bk/tgoth6.vf
-share/fonts/vf-a2bk/tgoth7.vf
-share/fonts/vf-a2bk/tgoth8.vf
-share/fonts/vf-a2bk/tgoth9.vf
-share/fonts/vf-a2bk/tmin10.vf
-share/fonts/vf-a2bk/tmin5.vf
-share/fonts/vf-a2bk/tmin6.vf
-share/fonts/vf-a2bk/tmin7.vf
-share/fonts/vf-a2bk/tmin8.vf
-share/fonts/vf-a2bk/tmin9.vf
-share/fonts/vf-a2n/goth10.vf
-share/fonts/vf-a2n/goth5.vf
-share/fonts/vf-a2n/goth6.vf
-share/fonts/vf-a2n/goth7.vf
-share/fonts/vf-a2n/goth8.vf
-share/fonts/vf-a2n/goth9.vf
-share/fonts/vf-a2n/min10.vf
-share/fonts/vf-a2n/min5.vf
-share/fonts/vf-a2n/min6.vf
-share/fonts/vf-a2n/min7.vf
-share/fonts/vf-a2n/min8.vf
-share/fonts/vf-a2n/min9.vf
 share/fonts/vf-n2a/dgjgreek10.vf
 share/fonts/vf-n2a/dgjgreek12.vf
 share/fonts/vf-n2a/dgjgreek17.vf
@@ -649,6 +603,32 @@ share/fonts/vf-n2a/dmjsy6.vf
 share/fonts/vf-n2a/dmjsy7.vf
 share/fonts/vf-n2a/dmjsy8.vf
 share/fonts/vf-n2a/dmjsy9.vf
+share/fonts/vf-a2n/goth10.vf
+share/fonts/vf-a2n/goth5.vf
+share/fonts/vf-a2n/goth6.vf
+share/fonts/vf-a2n/goth7.vf
+share/fonts/vf-a2n/goth8.vf
+share/fonts/vf-a2n/goth9.vf
+share/fonts/vf-a2n/min10.vf
+share/fonts/vf-a2n/min5.vf
+share/fonts/vf-a2n/min6.vf
+share/fonts/vf-a2n/min7.vf
+share/fonts/vf-a2n/min8.vf
+share/fonts/vf-a2n/min9.vf
+share/fonts/vf-a2bk/goth10.vf
+share/fonts/vf-a2bk/goth5.vf
+share/fonts/vf-a2bk/goth6.vf
+share/fonts/vf-a2bk/goth7.vf
+share/fonts/vf-a2bk/goth8.vf
+share/fonts/vf-a2bk/goth9.vf
+share/fonts/vf-a2bk/min10.vf
+share/fonts/vf-a2bk/min5.vf
+share/fonts/vf-a2bk/min6.vf
+share/fonts/vf-a2bk/min7.vf
+share/fonts/vf-a2bk/min8.vf
+share/fonts/vf-a2bk/min9.vf
+share/fonts/vf-a2bk/gbm.tfm
+share/fonts/vf-a2bk/rml.tfm
 share/fonts/vf-p2pn/tgoth10.vf
 share/fonts/vf-p2pn/tgoth5.vf
 share/fonts/vf-p2pn/tgoth6.vf
@@ -661,44 +641,8 @@ share/fonts/vf-p2pn/tmin6.vf
 share/fonts/vf-p2pn/tmin7.vf
 share/fonts/vf-p2pn/tmin8.vf
 share/fonts/vf-p2pn/tmin9.vf
-share/fonts/vf-tjsy/dgjsy10.vf
-share/fonts/vf-tjsy/dgjsy5.vf
-share/fonts/vf-tjsy/dgjsy6.vf
-share/fonts/vf-tjsy/dgjsy7.vf
-share/fonts/vf-tjsy/dgjsy8.vf
-share/fonts/vf-tjsy/dgjsy9.vf
-share/fonts/vf-tjsy/dmjsy10.vf
-share/fonts/vf-tjsy/dmjsy5.vf
-share/fonts/vf-tjsy/dmjsy6.vf
-share/fonts/vf-tjsy/dmjsy7.vf
-share/fonts/vf-tjsy/dmjsy8.vf
-share/fonts/vf-tjsy/dmjsy9.vf
-share/fonts/pk-tjsy/tdgjsy10.300pk
-share/fonts/pk-tjsy/tdgjsy10.329pk
-share/fonts/pk-tjsy/tdgjsy10.360pk
-share/fonts/pk-tjsy/tdgjsy10.432pk
-share/fonts/pk-tjsy/tdgjsy10.518pk
-share/fonts/pk-tjsy/tdgjsy10.622pk
-share/fonts/pk-tjsy/tdgjsy10.746pk
-share/fonts/pk-tjsy/tdgjsy12.300pk
-share/fonts/pk-tjsy/tdgjsy17.300pk
-share/fonts/pk-tjsy/tdgjsy8.300pk
-share/fonts/pk-tjsy/tdgjsy9.300pk
-share/fonts/pk-tjsy/tdmjsy10.300pk
-share/fonts/pk-tjsy/tdmjsy10.329pk
-share/fonts/pk-tjsy/tdmjsy10.360pk
-share/fonts/pk-tjsy/tdmjsy10.432pk
-share/fonts/pk-tjsy/tdmjsy10.518pk
-share/fonts/pk-tjsy/tdmjsy10.622pk
-share/fonts/pk-tjsy/tdmjsy10.746pk
-share/fonts/pk-tjsy/tdmjsy12.300pk
-share/fonts/pk-tjsy/tdmjsy17.300pk
-share/fonts/pk-tjsy/tdmjsy8.300pk
-share/fonts/pk-tjsy/tdmjsy9.300pk
 @dirrm share/fonts/vf-n2a
 @dirrm share/fonts/vf-a2n
 @dirrm share/fonts/vf-a2bk
 @dirrm share/fonts/vf-p2pn
-@dirrm share/fonts/vf-tjsy
-@dirrm share/fonts/pk-tjsy
 @dirrm share/doc/vftool
diff --git a/japanese/vftool/scripts/configure b/japanese/vftool/scripts/configure
index 9417c62c3edb..43d0fa49da67 100644
--- a/japanese/vftool/scripts/configure
+++ b/japanese/vftool/scripts/configure
@@ -1,8 +1,8 @@
 #!/bin/sh
 
+${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.tmpl
+
 ${SED}  -e "s@%%AFM%%@${AFMDIR}@g" \
-	-e "s@%%GOTTFM%%@${GOTTFMDIR}@g" \
 	-e "s@%%JFM%%@${JFMDIR}@g" \
-	-e "s@%%MINTFM%%@${MINTFMDIR}@g" \
 	-e "s@%%PK%%@${PKDIR}@g" \
 		<  ${WRKSRC}/Makefile.tmpl > ${WRKSRC}/Makefile