[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

final? ptex and platex (Re: ptex and platex)



おはようございます。

SUNAGAWA Keiki <Keiki_SUNAGAWA@yokogawa.co.jp> wrote:

kei> ありゃ。これは意図したものではありません。何をどうやっ
kei> てこうなったのか今は不明ですが、帰宅したら調べてみます。

結局原因は分かりませんでした。寝惚けていたようです。

最新バージョンを下につけます。

○例によって19991104版からの差分です。
○ptex-euc/texmfはミスでしたので削除しました。
○X-Ml-Count: 546の大石さんの修正を含んでいます。
○dvipskの修正が不完全でしたので直しました。

diff -Nru platex-19991104/dvipsk/Makefile dvipsk/Makefile
--- platex-19991104/dvipsk/Makefile	Thu Nov  4 15:00:01 1999
+++ dvipsk/Makefile	Tue Dec 14 09:26:50 1999
@@ -1,3 +1,5 @@
+# $NetBSD$
+
 DISTNAME=	dvipsk-5.78a
 PKGNAME=	ja-dvipsk-5.78a
 CATEGORIES=	japanese print
@@ -5,12 +7,12 @@
 		ftp://ftp.center.osaka-u.ac.jp/CTAN/dviware/dvipsk/ \
 		ftp://ftp.riken.go.jp/pub/CTAN/dviware/dvipsk/ \
 		ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/dviware/dvipsk/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4c.tar.gz 
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4c.tar.gz
 
-MAINTAINER=	
+MAINTAINER=	oishi@ims.ac.jp
 
-DEPENDS=	ja-ptex-common-2.1.8:../../japanese/ptex-common \
-		ja-virtualfont-1.0:../../japanese/virtualfont 
+DEPENDS+=	ja-ptex-common-2.1.8:../../japanese/ptex-common \
+		ja-virtualfont-1.0:../../japanese/virtualfont
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -22,18 +24,18 @@
 			--exec_prefix=${INSTDIR} \
 			--mandir=${INSTDIR}/man \
 			--infodir=${INSTDIR}/dvipsk/info
- 
+
 pre-patch:
 	@${PATCH} -p -s -d ${WRKSRC} < ${WRKDIR}/dvipsk.patch
 
 post-install:
 	${CAT} ${FILESDIR}/jdvips | \
-		sed -e 's#@BINDIR@#${PREFIX}/libexec/ptex/bin#g' | \
-		sed -e 's#@TEXMF@#${TEXMF}#g' \
+		${SED} -e 's#@BINDIR@#${PREFIX}/libexec/ptex/bin#g' | \
+		${SED} -e 's#@TEXMF@#${TEXMF}#g' \
 		> ${PREFIX}/bin/jdvips
 	${CHMOD} 755 ${PREFIX}/bin/jdvips
-	${LN} -sf ../../../../japanese ${TEXMF}/texmf/fonts/tfm/japanese 
+	${LN} -sf ../../../../japanese ${TEXMF}/texmf/fonts/tfm/japanese
 	${MKDIR} ${TEXMF}/texmf/fonts/vf
-	${LN} -sf ../../../../japanese ${TEXMF}/texmf/fonts/vf/japanese 
+	${LN} -sf ../../../../japanese ${TEXMF}/texmf/fonts/vf/japanese
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru platex-19991104/dvipsk/files/jdvips dvipsk/files/jdvips
--- platex-19991104/dvipsk/files/jdvips	Thu Nov  4 14:47:36 1999
+++ dvipsk/files/jdvips	Mon Dec 13 23:13:52 1999
@@ -1,6 +1,7 @@
 #!/bin/sh
 PATH='@BINDIR@:/usr/bin:/bin'
 if [ $TEXMFCNF="" ]; then
-TEXMFCNF='@TEXMF@/texmf/web2c/ptex'
-fi
+TEXMFCNF='@TEXMF@/texmf/web2c/ptex' @BINDIR@/dvips $*
+else
 @BINDIR@/dvips $*
+fi
diff -Nru platex-19991104/dvipsk/files/patch-sum dvipsk/files/patch-sum
--- platex-19991104/dvipsk/files/patch-sum	Thu Jan  1 09:00:00 1970
+++ dvipsk/files/patch-sum	Tue Dec 14 09:24:48 1999
@@ -0,0 +1,4 @@
+$NetBSD$
+
+MD5 (patch-aa) = 617a3080851cdbe1c2506cae679838e1
+MD5 (patch-ab) = 5ff14d422f4c57ad7116a1bd3199b73b
diff -Nru platex-19991104/dvipsk/patches/patch-aa dvipsk/patches/patch-aa
--- platex-19991104/dvipsk/patches/patch-aa	Mon Nov  1 15:26:26 1999
+++ dvipsk/patches/patch-aa	Wed Dec  8 09:45:26 1999
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- Makefile.in.orig	Thu Mar 12 06:37:45 1998
 +++ Makefile.in	Sun Jun 28 11:41:59 1998
 @@ -34,7 +34,7 @@
diff -Nru platex-19991104/dvipsk/patches/patch-ab dvipsk/patches/patch-ab
--- platex-19991104/dvipsk/patches/patch-ab	Mon Nov  1 15:26:26 1999
+++ dvipsk/patches/patch-ab	Wed Dec  8 09:45:28 1999
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- dvipsk/config.ps.orig	Sun Jun 28 11:43:25 1998
 +++ dvipsk/config.ps	Sun Jun 28 11:46:02 1998
 @@ -4,9 +4,9 @@
diff -Nru platex-19991104/dvipsk/pkg/DESCR dvipsk/pkg/DESCR
--- platex-19991104/dvipsk/pkg/DESCR	Mon Nov  1 15:26:26 1999
+++ dvipsk/pkg/DESCR	Tue Dec 14 09:24:05 1999
@@ -0,0 +1,13 @@
+A DVI to PostScript translator + Japanese patch.
+
+
+Dvipsk is free software; Tom Rokicki's original files are public domain.
+The files I wrote (originally for the Free Software Foundation) are
+covered by the GNU General Public License -- see the files COPYING*.
+
+
+dvipsk-jpatch is a patch to make dvipsk-5.78 support ASCII Japanese TeX
+(ptex).  It adds following features to dvipsk-5.78.
+
+    o JFM (Japanese TFM) support
+    o vertical writing support
diff -Nru platex-19991104/dvipsk/pkg/PLIST dvipsk/pkg/PLIST
--- platex-19991104/dvipsk/pkg/PLIST	Thu Nov  4 14:48:29 1999
+++ dvipsk/pkg/PLIST	Mon Dec 13 23:55:53 1999
@@ -1,3 +1,5 @@
+@comment $NetBSD$
+
 bin/jdvips
 libexec/ptex/bin/afm2tfm
 libexec/ptex/bin/dvips
@@ -36,3 +38,8 @@
 share/fonts/ptex/texmf/dvips/base/xt2.enc
 share/fonts/ptex/texmf/fonts/tfm/japanese
 share/fonts/ptex/texmf/fonts/vf/japanese
+@dirrm share/fonts/ptex/texmf/fonts/vf
+@dirrm share/fonts/ptex/texmf/dvips/base
+@dirrm share/fonts/ptex/texmf/dvips
+@dirrm libexec/ptex/dvipsk/info
+@dirrm libexec/ptex/dvipsk
diff -Nru platex-19991104/platex-common/Makefile platex-common/Makefile
--- platex-19991104/platex-common/Makefile	Thu Oct 21 21:10:57 1999
+++ platex-common/Makefile	Thu Dec  9 00:18:58 1999
@@ -1,15 +1,18 @@
-DISTNAME=	base-9806
-PKGNAME=	ja-platex2e-common-1998.09.01.0
+# $NetBSD$
+
+DISTNAME=	base-9906
+PKGNAME=	ja-platex2e-common-1999.08.09.0
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1998-09-01/ \
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1999-08-09/ \
 		ftp://ftp.ams.org/pub/tex/ \
 		${MASTER_SITE_LOCAL}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ecfonts-1.0.tar.gz tfm.tar \
 		amsfonts-sources.tar.Z
 
-MAINTAINER=	
+MAINTAINER=	oishi@ims.ac.jp
+HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
 
-DEPENDS=	ja-ptex-common-2.1.8:../../japanese/ptex-common
+DEPENDS+=	ja-ptex-common-2.1.8:../../japanese/ptex-common
 
 WRKSRC=		${WRKDIR}/base
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ecfonts-1.0.tar.gz  \
@@ -20,7 +23,7 @@
 TEX=		${PREFIX}/libexec/ptex/bin/tex
 
 post-extract:
-	@tar -C ${WRKDIR} -xf ${DISTDIR}/${DIST_SUBDIR}/tfm.tar
+	@${GTAR} -C ${WRKDIR} -xf ${DISTDIR}/${DIST_SUBDIR}/tfm.tar
 
 do-build:
 	@(cd ${WRKSRC}; ${TEX} -ini unpack.ins ; ${TEX} -ini latex.ltx)
@@ -38,4 +41,4 @@
 	${CP} ${WRKDIR}/ec/src/* ${TEXMF}/fonts/source/public/ec
 	${LN} -fs ${TEX} ${PREFIX}/libexec/ptex/bin/latex
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru platex-19991104/platex-common/files/md5 platex-common/files/md5
--- platex-19991104/platex-common/files/md5	Tue Aug  3 18:06:45 1999
+++ platex-common/files/md5	Wed Dec  8 23:54:44 1999
@@ -1,4 +1,6 @@
+$NetBSD$
+
+MD5 (platex2e/base-9906.tar.gz) = c1e96980f1620cd655397eb8bbfce930
 MD5 (platex2e/ecfonts-1.0.tar.gz) = 9170ab2ad76c9f274385b8666bb35c8c
 MD5 (platex2e/tfm.tar) = a7a206fa43eb1c1aa1425e51ccaf30bc
 MD5 (platex2e/amsfonts-sources.tar.Z) = b14c71a12dfa7580c254e80497a6b0c8
-MD5 (platex2e/base-9806.tar.gz) = 8adc6cf71427bbbff5fc6cb57bfe1aee
diff -Nru platex-19991104/platex-common/pkg/PLIST platex-common/pkg/PLIST
--- platex-19991104/platex-common/pkg/PLIST	Thu Oct 21 21:04:20 1999
+++ platex-common/pkg/PLIST	Fri Dec 10 01:01:41 1999
@@ -1,3 +1,6 @@
+@comment $NetBSD$
+
+libexec/ptex/bin/latex
 share/fonts/ptex/texmf/fonts/source/public/ams/READ.ME
 share/fonts/ptex/texmf/fonts/source/public/ams/cyrillic/cyrcsc.mf
 share/fonts/ptex/texmf/fonts/source/public/ams/cyrillic/cyrfont.mf
@@ -892,58 +895,163 @@
 share/fonts/ptex/texmf/fonts/tfm/public/ec/tcvt2488.tfm
 share/fonts/ptex/texmf/fonts/tfm/public/ec/tcvt2986.tfm
 share/fonts/ptex/texmf/fonts/tfm/public/ec/tcvt3583.tfm
+share/fonts/ptex/texmf/tex/latex/base/00Contents
+share/fonts/ptex/texmf/tex/latex/base/00readme.txt
+share/fonts/ptex/texmf/tex/latex/base/Makefile.unx
+share/fonts/ptex/texmf/tex/latex/base/alltt.dtx
+share/fonts/ptex/texmf/tex/latex/base/alltt.ins
+share/fonts/ptex/texmf/tex/latex/base/amiweb2c.txt
+share/fonts/ptex/texmf/tex/latex/base/autoload.ins
+share/fonts/ptex/texmf/tex/latex/base/autoload.txt
+share/fonts/ptex/texmf/tex/latex/base/begleit.err
+share/fonts/ptex/texmf/tex/latex/base/bugs.txt
+share/fonts/ptex/texmf/tex/latex/base/cfgguide.tex
+share/fonts/ptex/texmf/tex/latex/base/changes.txt
+share/fonts/ptex/texmf/tex/latex/base/classes.dtx
+share/fonts/ptex/texmf/tex/latex/base/classes.ins
+share/fonts/ptex/texmf/tex/latex/base/clsguide.tex
+share/fonts/ptex/texmf/tex/latex/base/cmextra.ins
+share/fonts/ptex/texmf/tex/latex/base/cmfonts.fdd
+share/fonts/ptex/texmf/tex/latex/base/cmfonts.ins
+share/fonts/ptex/texmf/tex/latex/base/compan.err
+share/fonts/ptex/texmf/tex/latex/base/cstex.txt
+share/fonts/ptex/texmf/tex/latex/base/cyrguide.tex
+share/fonts/ptex/texmf/tex/latex/base/decustex.txt
+share/fonts/ptex/texmf/tex/latex/base/directex.txt
+share/fonts/ptex/texmf/tex/latex/base/doc.dtx
+share/fonts/ptex/texmf/tex/latex/base/docstrip.dtx
+share/fonts/ptex/texmf/tex/latex/base/docstrip.ins
+share/fonts/ptex/texmf/tex/latex/base/ec.ins
+share/fonts/ptex/texmf/tex/latex/base/emtex.txt
+share/fonts/ptex/texmf/tex/latex/base/emtextds.txt
+share/fonts/ptex/texmf/tex/latex/base/exscale.dtx
+share/fonts/ptex/texmf/tex/latex/base/exscale.ins
+share/fonts/ptex/texmf/tex/latex/base/fntguide.tex
+share/fonts/ptex/texmf/tex/latex/base/fontdef.dtx
+share/fonts/ptex/texmf/tex/latex/base/format.ins
+share/fonts/ptex/texmf/tex/latex/base/gglo.ist
+share/fonts/ptex/texmf/tex/latex/base/gind.ist
+share/fonts/ptex/texmf/tex/latex/base/graphpap.dtx
+share/fonts/ptex/texmf/tex/latex/base/graphpap.ins
+share/fonts/ptex/texmf/tex/latex/base/grphcomp.err
+share/fonts/ptex/texmf/tex/latex/base/handbuch.err
+share/fonts/ptex/texmf/tex/latex/base/ifthen.dtx
+share/fonts/ptex/texmf/tex/latex/base/ifthen.ins
+share/fonts/ptex/texmf/tex/latex/base/inputenc.dtx
+share/fonts/ptex/texmf/tex/latex/base/inputenc.ins
+share/fonts/ptex/texmf/tex/latex/base/install.txt
+share/fonts/ptex/texmf/tex/latex/base/latex.fmt
+share/fonts/ptex/texmf/tex/latex/base/latex.log
+share/fonts/ptex/texmf/tex/latex/base/latex209.dtx
+share/fonts/ptex/texmf/tex/latex/base/latex209.ins
+share/fonts/ptex/texmf/tex/latex/base/latexbug.el
+share/fonts/ptex/texmf/tex/latex/base/latexsym.dtx
+share/fonts/ptex/texmf/tex/latex/base/latexsym.ins
+share/fonts/ptex/texmf/tex/latex/base/legal.txt
+share/fonts/ptex/texmf/tex/latex/base/letter.dtx
+share/fonts/ptex/texmf/tex/latex/base/letter.ins
+share/fonts/ptex/texmf/tex/latex/base/lindner.txt
+share/fonts/ptex/texmf/tex/latex/base/lppl-1-0.txt
+share/fonts/ptex/texmf/tex/latex/base/lppl.txt
+share/fonts/ptex/texmf/tex/latex/base/ltalloc.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltbibl.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltboxes.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltclass.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltcntrl.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltcounts.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltdefns.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltdirchk.dtx
+share/fonts/ptex/texmf/tex/latex/base/lterror.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfiles.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfinal.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfloat.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfntcmd.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfssbas.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfsscmp.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfssdcl.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfssini.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltfsstrc.dtx
+share/fonts/ptex/texmf/tex/latex/base/lthyphen.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltidxglo.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltlength.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltlists.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltlogos.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltmath.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltmiscen.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltnews01.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews02.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews03.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews04.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews05.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews06.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews07.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews08.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews09.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews10.tex
+share/fonts/ptex/texmf/tex/latex/base/ltnews11.tex
+share/fonts/ptex/texmf/tex/latex/base/ltoutenc.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltoutenc.ins
+share/fonts/ptex/texmf/tex/latex/base/ltoutput.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltpage.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltpageno.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltpar.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltpictur.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltplain.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltsect.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltspace.dtx
+share/fonts/ptex/texmf/tex/latex/base/lttab.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltthm.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltvers.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltx3info.tex
+share/fonts/ptex/texmf/tex/latex/base/ltxcheck.tex
+share/fonts/ptex/texmf/tex/latex/base/ltxdoc.dtx
+share/fonts/ptex/texmf/tex/latex/base/ltxref.dtx
+share/fonts/ptex/texmf/tex/latex/base/makeindx.dtx
+share/fonts/ptex/texmf/tex/latex/base/makeindx.ins
+share/fonts/ptex/texmf/tex/latex/base/manifest.txt
+share/fonts/ptex/texmf/tex/latex/base/manual.err
+share/fonts/ptex/texmf/tex/latex/base/microtex.txt
+share/fonts/ptex/texmf/tex/latex/base/miktex.txt
+share/fonts/ptex/texmf/tex/latex/base/modguide.tex
+share/fonts/ptex/texmf/tex/latex/base/multitex.txt
+share/fonts/ptex/texmf/tex/latex/base/newdc.ins
+share/fonts/ptex/texmf/tex/latex/base/newlfont.dtx
+share/fonts/ptex/texmf/tex/latex/base/olddc.ins
+share/fonts/ptex/texmf/tex/latex/base/oldlfont.dtx
+share/fonts/ptex/texmf/tex/latex/base/oztex.txt
+share/fonts/ptex/texmf/tex/latex/base/pastex.txt
+share/fonts/ptex/texmf/tex/latex/base/patches.txt
+share/fonts/ptex/texmf/tex/latex/base/pctex.txt
+share/fonts/ptex/texmf/tex/latex/base/pict2e.dtx
+share/fonts/ptex/texmf/tex/latex/base/pict2e.ins
+share/fonts/ptex/texmf/tex/latex/base/preload.dtx
+share/fonts/ptex/texmf/tex/latex/base/proc.dtx
+share/fonts/ptex/texmf/tex/latex/base/proc.ins
+share/fonts/ptex/texmf/tex/latex/base/slides.dtx
+share/fonts/ptex/texmf/tex/latex/base/slides.ins
+share/fonts/ptex/texmf/tex/latex/base/slifonts.fdd
+share/fonts/ptex/texmf/tex/latex/base/source2e.tex
+share/fonts/ptex/texmf/tex/latex/base/syntonly.dtx
+share/fonts/ptex/texmf/tex/latex/base/syntonly.ins
+share/fonts/ptex/texmf/tex/latex/base/template.txt
+share/fonts/ptex/texmf/tex/latex/base/tex2.txt
+share/fonts/ptex/texmf/tex/latex/base/texpert.txt
+share/fonts/ptex/texmf/tex/latex/base/texsys.aux
+share/fonts/ptex/texmf/tex/latex/base/textures.txt
+share/fonts/ptex/texmf/tex/latex/base/truetex.txt
+share/fonts/ptex/texmf/tex/latex/base/unpack.ins
+share/fonts/ptex/texmf/tex/latex/base/unpack.log
+share/fonts/ptex/texmf/tex/latex/base/usrguide.tex
+share/fonts/ptex/texmf/tex/latex/base/vtex.txt
+share/fonts/ptex/texmf/tex/latex/base/web2ctex.txt
+share/fonts/ptex/texmf/tex/latex/base/webcomp.err
+share/fonts/ptex/texmf/tex/latex/base/yandytex.txt
 share/fonts/ptex/texmf/web2c/latex.fmt
-@dirrm share/fonts/ptex/texmf/web2c
-@dirrm share/fonts/ptex/texmf/tex/texinfo
-@dirrm share/fonts/ptex/texmf/tex/ptex
-@dirrm share/fonts/ptex/texmf/tex/plain/dvips
-@dirrm share/fonts/ptex/texmf/tex/plain/base
-@dirrm share/fonts/ptex/texmf/tex/plain
-@dirrm share/fonts/ptex/texmf/tex/latex/tools
-@dirrm share/fonts/ptex/texmf/tex/latex/graphics
-@dirrm share/fonts/ptex/texmf/tex/latex/dvips
-@dirrm share/fonts/ptex/texmf/tex/latex/dvilj
-@dirrm share/fonts/ptex/texmf/tex/latex/config
-@dirrm share/fonts/ptex/texmf/tex/latex/base
-@dirrm share/fonts/ptex/texmf/tex/latex
-@dirrm share/fonts/ptex/texmf/tex/generic/misc
-@dirrm share/fonts/ptex/texmf/tex/generic/hyphen
-@dirrm share/fonts/ptex/texmf/tex/generic
-@dirrm share/fonts/ptex/texmf/tex
-@dirrm share/fonts/ptex/texmf/fonts/tfm/public/misc
-@dirrm share/fonts/ptex/texmf/fonts/tfm/public/mflogo
-@dirrm share/fonts/ptex/texmf/fonts/tfm/public/latex
 @dirrm share/fonts/ptex/texmf/fonts/tfm/public/ec
-@dirrm share/fonts/ptex/texmf/fonts/tfm/public/concrete
-@dirrm share/fonts/ptex/texmf/fonts/tfm/public/cmextra
-@dirrm share/fonts/ptex/texmf/fonts/tfm/public/cm
 @dirrm share/fonts/ptex/texmf/fonts/tfm/public/ams
-@dirrm share/fonts/ptex/texmf/fonts/tfm/public
-@dirrm share/fonts/ptex/texmf/fonts/tfm/ptex
-@dirrm share/fonts/ptex/texmf/fonts/tfm/ascgrp
-@dirrm share/fonts/ptex/texmf/fonts/tfm
-@dirrm share/fonts/ptex/texmf/fonts/source/public/misc
-@dirrm share/fonts/ptex/texmf/fonts/source/public/mflogo
-@dirrm share/fonts/ptex/texmf/fonts/source/public/latex
 @dirrm share/fonts/ptex/texmf/fonts/source/public/ec
-@dirrm share/fonts/ptex/texmf/fonts/source/public/concrete
-@dirrm share/fonts/ptex/texmf/fonts/source/public/cmextra
-@dirrm share/fonts/ptex/texmf/fonts/source/public/cm
 @dirrm share/fonts/ptex/texmf/fonts/source/public/ams/symbols
 @dirrm share/fonts/ptex/texmf/fonts/source/public/ams/extracm
 @dirrm share/fonts/ptex/texmf/fonts/source/public/ams/euler
 @dirrm share/fonts/ptex/texmf/fonts/source/public/ams/cyrillic
 @dirrm share/fonts/ptex/texmf/fonts/source/public/ams
-@dirrm share/fonts/ptex/texmf/fonts/source/public
-@dirrm share/fonts/ptex/texmf/fonts/source/ptex
-@dirrm share/fonts/ptex/texmf/fonts/source/jknappen/tc
-@dirrm share/fonts/ptex/texmf/fonts/source/jknappen/ec
-@dirrm share/fonts/ptex/texmf/fonts/source/jknappen
-@dirrm share/fonts/ptex/texmf/fonts/source/ascgrp
-@dirrm share/fonts/ptex/texmf/fonts/source
-@dirrm share/fonts/ptex/texmf/fonts
-@dirrm share/fonts/ptex/texmf
-@dirrm share/fonts/ptex/share/texmf
-@dirrm share/fonts/ptex/share
-@dirrm share/fonts/ptex/bin
-@dirrm share/fonts/ptex
diff -Nru platex-19991104/platex-euc/Makefile platex-euc/Makefile
--- platex-19991104/platex-euc/Makefile	Thu Nov  4 14:53:08 1999
+++ platex-euc/Makefile	Thu Dec  9 00:14:43 1999
@@ -1,15 +1,18 @@
-DISTNAME=	pl19980901e
-PKGNAME=	ja-platex2e-euc-1998.09.01.0
+# $NetBSD$
+
+DISTNAME=	pl19990809e
+PKGNAME=	ja-platex2e-euc-1999.08.09.0
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1998-09-01/
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1999-08-09/
 
-MAINTAINER=	
+MAINTAINER=	oishi@ims.ac.jp
+HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
 
-DEPENDS=	ja-ptex-euc-2.1.8:../../japanese/ptex-euc \
-		ja-platex2e-common-1998.09.01.0:../../japanese/platex-common
+DEPENDS+=	ja-ptex-euc-2.1.8:../../japanese/ptex-euc \
+		ja-platex2e-common-1999.08.09.0:../../japanese/platex-common
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
-WRKSRC=		${WRKDIR}/19980901
+WRKSRC=		${WRKDIR}/19990809
 DIST_SUBDIR=	platex2e
 INST_SUBDIR=	libexec/ptex
 TEXMF=		${PREFIX}/share/fonts/ptex/texmf
@@ -21,10 +24,10 @@
 	${MKDIR} ${TEXMF}/tex/platex/base
 	@${CP} ${WRKSRC}/* ${TEXMF}/tex/platex/base
 	${MV} -f ${TEXMF}/tex/platex/base/platex.fmt ${TEXMF}/web2c
-	${LN} -fs ${PREFIX}/${INST_SUBDIR}/bin/ptex ${PREFIX}/${INST_SUBDIR}/bin/platex 
-	${CAT} ${FILESDIR}/platex | sed -e 's#@BINDIR@#${PREFIX}/libexec/ptex/bin#g' | \
-		sed -e 's#@TEXMF@#${TEXMF}#g' \
+	${LN} -fs ${PREFIX}/${INST_SUBDIR}/bin/ptex ${PREFIX}/${INST_SUBDIR}/bin/platex
+	${CAT} ${FILESDIR}/platex | ${SED} -e 's#@BINDIR@#${PREFIX}/libexec/ptex/bin#g' | \
+		${SED} -e 's#@TEXMF@#${TEXMF}#g' \
 		> ${PREFIX}/bin/platex
 	${CHMOD} 755 ${PREFIX}/bin/platex
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru platex-19991104/platex-euc/files/md5 platex-euc/files/md5
--- platex-19991104/platex-euc/files/md5	Tue Aug  3 18:35:40 1999
+++ platex-euc/files/md5	Wed Dec  8 23:55:04 1999
@@ -1 +1,3 @@
-MD5 (platex2e/pl19980901e.tar.gz) = bbd80458d9d5deea30433020f3689eb6
+$NetBSD$
+
+MD5 (platex2e/pl19990809e.tar.gz) = c76a27a1fc56959158849c631be4b825
diff -Nru platex-19991104/platex-euc/files/platex platex-euc/files/platex
--- platex-19991104/platex-euc/files/platex	Thu Nov  4 14:53:19 1999
+++ platex-euc/files/platex	Mon Dec 13 23:13:52 1999
@@ -1,6 +1,7 @@
 #!/bin/sh
 PATH='@BINDIR@:/usr/bin:/bin'
 if [ $TEXMFCNF="" ]; then
-TEXMFCNF='@TEXMF@/web2c/ptex'
-fi
+TEXMFCNF='@TEXMF@/web2c/ptex' @BINDIR@/platex $*
+else
 @BINDIR@/platex $*
+fi
diff -Nru platex-19991104/platex-euc/pkg/PLIST platex-euc/pkg/PLIST
--- platex-19991104/platex-euc/pkg/PLIST	Thu Oct 21 21:24:37 1999
+++ platex-euc/pkg/PLIST	Thu Dec  9 01:34:28 1999
@@ -1,3 +1,7 @@
+@comment $NetBSD$
+
+bin/platex
+libexec/ptex/bin/platex
 share/fonts/ptex/texmf/tex/platex/base/Changes.txt
 share/fonts/ptex/texmf/tex/platex/base/Copyright
 share/fonts/ptex/texmf/tex/platex/base/Files
@@ -5,7 +9,6 @@
 share/fonts/ptex/texmf/tex/platex/base/README2.txt
 share/fonts/ptex/texmf/tex/platex/base/Xins.ins
 share/fonts/ptex/texmf/tex/platex/base/ascmac.sty
-share/fonts/ptex/texmf/tex/platex/base/docstrip.cfg
 share/fonts/ptex/texmf/tex/platex/base/hyphen.cfg
 share/fonts/ptex/texmf/tex/platex/base/jarticle.cls
 share/fonts/ptex/texmf/tex/platex/base/jarticle.sty
@@ -33,7 +36,6 @@
 share/fonts/ptex/texmf/tex/platex/base/pl209.dtx
 share/fonts/ptex/texmf/tex/platex/base/pl209.ins
 share/fonts/ptex/texmf/tex/platex/base/platex.dtx
-share/fonts/ptex/texmf/tex/platex/base/platex.fmt
 share/fonts/ptex/texmf/tex/platex/base/platex.log
 share/fonts/ptex/texmf/tex/platex/base/platex.ltx
 share/fonts/ptex/texmf/tex/platex/base/plcls.ins
@@ -53,6 +55,7 @@
 share/fonts/ptex/texmf/tex/platex/base/plnews02.tex
 share/fonts/ptex/texmf/tex/platex/base/plnews03.tex
 share/fonts/ptex/texmf/tex/platex/base/plnews04.tex
+share/fonts/ptex/texmf/tex/platex/base/plnews05.tex
 share/fonts/ptex/texmf/tex/platex/base/plpatch.ltx
 share/fonts/ptex/texmf/tex/platex/base/plvers.dtx
 share/fonts/ptex/texmf/tex/platex/base/ptrace.sty
@@ -70,5 +73,6 @@
 share/fonts/ptex/texmf/tex/platex/base/tsize10.clo
 share/fonts/ptex/texmf/tex/platex/base/tsize11.clo
 share/fonts/ptex/texmf/tex/platex/base/tsize12.clo
+share/fonts/ptex/texmf/web2c/platex.fmt
 @dirrm share/fonts/ptex/texmf/tex/platex/base
 @dirrm share/fonts/ptex/texmf/tex/platex
diff -Nru platex-19991104/ptex-common/Makefile ptex-common/Makefile
--- platex-19991104/ptex-common/Makefile	Tue Nov  2 16:31:59 1999
+++ ptex-common/Makefile	Wed Dec  8 19:54:29 1999
@@ -1,18 +1,23 @@
-DISTNAME=	web2c-7.2
-PKGNAME=	ja-ptex-common-2.1.8
-CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz 
-
-MAINTAINER=	
-
-DEPENDS=	ja-texmflib-7.3:../../japanese/ptex-texmflib \
-		png-1.0.3:../../graphics/png \
-		jpeg-6b:../../graphics/jpeg
-USE_GMAKE=	yes
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz
-DIST_SUBDIR=	ptex
+# $NetBSD$
+
+DISTNAME=		web2c-7.2
+PKGNAME=		ja-ptex-common-2.1.8
+CATEGORIES=		japanese print
+MASTER_SITES=		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
+DISTFILES=		${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz
+
 PATCH_DIST_STRIP=	-p1
+
+MAINTAINER=		oishi@ims.ac.jp
+HOMEPAGE=		http://www.ascii.co.jp/pb/ptex/
+
+DEPENDS+=		ja-texmflib-7.3:../../japanese/ptex-texmflib \
+			png-1.0.3:../../graphics/png \
+			jpeg-6b:../../graphics/jpeg
+
+USE_GMAKE=		yes
+EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz
+DIST_SUBDIR=		ptex
 INST_SUBDIR=		libexec/ptex
 TEXMF_SUBDIR=		share/fonts/ptex
 INSTALL_PROGRAM=	${INSTALL} -c
@@ -22,12 +27,12 @@
 			--infodir=${PREFIX}/${INST_SUBDIR}/info \
 			--with-system-zlib \
 			--with-system-pnglib
-CONFIGURE_ENV+=	CC='${CC} -Dunix' 
+CONFIGURE_ENV+=		CC='${CC} -Dunix'
 
 post-install:
 		${MV} ${PREFIX}/${INST_SUBDIR}/bin/pltotf \
-			${PREFIX}/${INST_SUBDIR}/bin/en-pltotf 
+			${PREFIX}/${INST_SUBDIR}/bin/en-pltotf
 		${MV} ${PREFIX}/${INST_SUBDIR}/bin/tftopl \
-			${PREFIX}/${INST_SUBDIR}/bin/en-tftopl 
+			${PREFIX}/${INST_SUBDIR}/bin/en-tftopl
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru platex-19991104/ptex-common/files/md5 ptex-common/files/md5
--- platex-19991104/ptex-common/files/md5	Mon Aug  2 14:24:02 1999
+++ ptex-common/files/md5	Wed Dec  8 19:54:29 1999
@@ -1,2 +1,4 @@
+$NetBSD$
+
 MD5 (ptex/web2c-7.2.tar.gz) = 1451b51656d9624bee4052f6688af4cf
 MD5 (ptex/web-7.2.tar.gz) = e1ef22e0a79f9f0170730531b242f7f1
diff -Nru platex-19991104/ptex-common/files/patch-sum ptex-common/files/patch-sum
--- platex-19991104/ptex-common/files/patch-sum	Thu Jan  1 09:00:00 1970
+++ ptex-common/files/patch-sum	Wed Dec  8 19:54:29 1999
@@ -0,0 +1,4 @@
+$NetBSD$
+
+MD5 (patch-aa) = cb71bf55733f247e06d5182959f26b2e
+MD5 (patch-ab) = f614585f76b3c018128d9b15b7cc8b0d
diff -Nru platex-19991104/ptex-common/patches/patch-aa ptex-common/patches/patch-aa
--- platex-19991104/ptex-common/patches/patch-aa	Mon Aug  2 14:41:10 1999
+++ ptex-common/patches/patch-aa	Wed Dec  8 19:54:29 1999
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- web2c/Makefile.in.orig	Mon Aug  2 12:10:34 1999
 +++ web2c/Makefile.in	Mon Aug  2 13:55:02 1999
 @@ -5,7 +5,7 @@
diff -Nru platex-19991104/ptex-common/patches/patch-ab ptex-common/patches/patch-ab
--- platex-19991104/ptex-common/patches/patch-ab	Thu Jan  1 09:00:00 1970
+++ ptex-common/patches/patch-ab	Wed Dec  8 19:54:29 1999
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- config.sub.orig	Mon Nov  8 08:48:17 1999
++++ config.sub	Mon Nov  8 08:52:34 1999
+@@ -229,6 +229,9 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	bebox-* | macppc-* | ofppc-*)
++		basic_machine=powerpc-unknown
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+
diff -Nru platex-19991104/ptex-common/pkg/PLIST ptex-common/pkg/PLIST
--- platex-19991104/ptex-common/pkg/PLIST	Tue Nov  2 16:32:24 1999
+++ ptex-common/pkg/PLIST	Fri Dec 10 22:47:19 1999
@@ -1,84 +1,45 @@
-libexec/ptex/bin/mktexpk
-libexec/ptex/bin/mktexmf
-libexec/ptex/bin/mktextfm
-libexec/ptex/bin/mktexlsr
-libexec/ptex/bin/kpsewhich
-libexec/ptex/bin/kpsestat
+@comment $NetBSD$
+
 libexec/ptex/bin/access
-libexec/ptex/bin/readlink
-libexec/ptex/bin/mpto
-libexec/ptex/bin/newer
-libexec/ptex/bin/dmp
-libexec/ptex/bin/makempx
-libexec/ptex/bin/tie
 libexec/ptex/bin/bibtex
+libexec/ptex/bin/dmp
 libexec/ptex/bin/dvicopy
 libexec/ptex/bin/dvitomp
 libexec/ptex/bin/dvitype
+libexec/ptex/bin/en-pltotf
+libexec/ptex/bin/en-tftopl
 libexec/ptex/bin/gftodvi
 libexec/ptex/bin/gftopk
 libexec/ptex/bin/gftype
+libexec/ptex/bin/inimf
+libexec/ptex/bin/inimpost
+libexec/ptex/bin/initex
+libexec/ptex/bin/kpsestat
+libexec/ptex/bin/kpsewhich
+libexec/ptex/bin/makempx
 libexec/ptex/bin/mf
 libexec/ptex/bin/mft
+libexec/ptex/bin/mktexlsr
+libexec/ptex/bin/mktexmf
+libexec/ptex/bin/mktexpk
+libexec/ptex/bin/mktextfm
 libexec/ptex/bin/mpost
+libexec/ptex/bin/mpto
+libexec/ptex/bin/newer
 libexec/ptex/bin/patgen
 libexec/ptex/bin/pktogf
 libexec/ptex/bin/pktype
-libexec/ptex/bin/en-pltotf
 libexec/ptex/bin/pooltype
+libexec/ptex/bin/readlink
 libexec/ptex/bin/tangle
 libexec/ptex/bin/tex
-libexec/ptex/bin/en-tftopl
+libexec/ptex/bin/tie
 libexec/ptex/bin/vftovp
+libexec/ptex/bin/virmf
+libexec/ptex/bin/virmpost
+libexec/ptex/bin/virtex
 libexec/ptex/bin/vptovf
 libexec/ptex/bin/weave
-libexec/ptex/lib/libkpathsea.a
-libexec/ptex/man/man1/access.1
-libexec/ptex/man/man1/kpsestat.1
-libexec/ptex/man/man1/kpsewhich.1
-libexec/ptex/man/man1/readlink.1
-libexec/ptex/man/man1/mktexlsr.1
-libexec/ptex/man/man1/mktexmf.1
-libexec/ptex/man/man1/mktextfm.1
-libexec/ptex/man/man1/mktexpk.1
-libexec/ptex/man/man1/amstex.1
-libexec/ptex/man/man1/bibtex.1
-libexec/ptex/man/man1/dmp.1
-libexec/ptex/man/man1/dvicopy.1
-libexec/ptex/man/man1/dvitype.1
-libexec/ptex/man/man1/eplain.1
-libexec/ptex/man/man1/etex.1
-libexec/ptex/man/man1/gftodvi.1
-libexec/ptex/man/man1/gftopk.1
-libexec/ptex/man/man1/gftype.1
-libexec/ptex/man/man1/latex.1
-libexec/ptex/man/man1/makempx.1
-libexec/ptex/man/man1/mf.1
-libexec/ptex/man/man1/mft.1
-libexec/ptex/man/man1/mpost.1
-libexec/ptex/man/man1/mpto.1
-libexec/ptex/man/man1/newer.1
-libexec/ptex/man/man1/omega.1
-libexec/ptex/man/man1/patgen.1
-libexec/ptex/man/man1/pdftex.1
-libexec/ptex/man/man1/pktogf.1
-libexec/ptex/man/man1/pktype.1
-libexec/ptex/man/man1/pltotf.1
-libexec/ptex/man/man1/pooltype.1
-libexec/ptex/man/man1/tangle.1
-libexec/ptex/man/man1/tex.1
-libexec/ptex/man/man1/tftopl.1
-libexec/ptex/man/man1/vftovp.1
-libexec/ptex/man/man1/vptovf.1
-libexec/ptex/man/man1/weave.1
-libexec/ptex/man/man1/tie.1
-libexec/ptex/info/kpathsea.info
-libexec/ptex/info/dir
-libexec/ptex/info/web2c.info
-libexec/ptex/info/web2c.info-1
-libexec/ptex/info/web2c.info-2
-libexec/ptex/info/web2c.info-3
-libexec/ptex/info/web2c.info-4
 libexec/ptex/include/kpathsea/absolute.h
 libexec/ptex/include/kpathsea/c-auto.h
 libexec/ptex/include/kpathsea/c-ctype.h
@@ -130,19 +91,53 @@
 libexec/ptex/include/kpathsea/win32lib.h
 libexec/ptex/include/kpathsea/xopendir.h
 libexec/ptex/include/kpathsea/xstat.h
-share/fonts/ptex/texmf/web2c/mktex.opt
-share/fonts/ptex/texmf/web2c/mktexdir
-share/fonts/ptex/texmf/web2c/mktexdir.opt
-share/fonts/ptex/texmf/web2c/mktexnam
-share/fonts/ptex/texmf/web2c/mktexnam.opt
-share/fonts/ptex/texmf/web2c/mktexupd
-share/fonts/ptex/texmf/web2c/texmf.cnf
-share/fonts/ptex/texmf/web2c/tex.fmt
-share/fonts/ptex/texmf/web2c/mf.base
-share/fonts/ptex/texmf/web2c/mpost.mem
-share/fonts/ptex/texmf/web2c/tex.pool
-share/fonts/ptex/texmf/web2c/mf.pool
-share/fonts/ptex/texmf/web2c/mp.pool
+libexec/ptex/info/dir
+libexec/ptex/info/kpathsea.info
+libexec/ptex/info/web2c.info
+libexec/ptex/info/web2c.info-1
+libexec/ptex/info/web2c.info-2
+libexec/ptex/info/web2c.info-3
+libexec/ptex/info/web2c.info-4
+libexec/ptex/lib/libkpathsea.a
+libexec/ptex/man/man1/access.1
+libexec/ptex/man/man1/amstex.1
+libexec/ptex/man/man1/bibtex.1
+libexec/ptex/man/man1/dmp.1
+libexec/ptex/man/man1/dvicopy.1
+libexec/ptex/man/man1/dvitype.1
+libexec/ptex/man/man1/eplain.1
+libexec/ptex/man/man1/etex.1
+libexec/ptex/man/man1/gftodvi.1
+libexec/ptex/man/man1/gftopk.1
+libexec/ptex/man/man1/gftype.1
+libexec/ptex/man/man1/kpsestat.1
+libexec/ptex/man/man1/kpsewhich.1
+libexec/ptex/man/man1/latex.1
+libexec/ptex/man/man1/makempx.1
+libexec/ptex/man/man1/mf.1
+libexec/ptex/man/man1/mft.1
+libexec/ptex/man/man1/mktexlsr.1
+libexec/ptex/man/man1/mktexmf.1
+libexec/ptex/man/man1/mktexpk.1
+libexec/ptex/man/man1/mktextfm.1
+libexec/ptex/man/man1/mpost.1
+libexec/ptex/man/man1/mpto.1
+libexec/ptex/man/man1/newer.1
+libexec/ptex/man/man1/omega.1
+libexec/ptex/man/man1/patgen.1
+libexec/ptex/man/man1/pdftex.1
+libexec/ptex/man/man1/pktogf.1
+libexec/ptex/man/man1/pktype.1
+libexec/ptex/man/man1/pltotf.1
+libexec/ptex/man/man1/pooltype.1
+libexec/ptex/man/man1/readlink.1
+libexec/ptex/man/man1/tangle.1
+libexec/ptex/man/man1/tex.1
+libexec/ptex/man/man1/tftopl.1
+libexec/ptex/man/man1/tie.1
+libexec/ptex/man/man1/vftovp.1
+libexec/ptex/man/man1/vptovf.1
+libexec/ptex/man/man1/weave.1
 share/fonts/ptex/texmf/fontname/adobe.map
 share/fonts/ptex/texmf/fontname/apple.map
 share/fonts/ptex/texmf/fontname/bitstrea.map
@@ -160,15 +155,29 @@
 share/fonts/ptex/texmf/fontname/variant.map
 share/fonts/ptex/texmf/fontname/weight.map
 share/fonts/ptex/texmf/fontname/width.map
-@dirrm libexec/ptex/bin
-@dirrm libexec/ptex/lib
+share/fonts/ptex/texmf/web2c/mf.base
+share/fonts/ptex/texmf/web2c/mf.pool
+share/fonts/ptex/texmf/web2c/mktex.opt
+share/fonts/ptex/texmf/web2c/mktexdir
+share/fonts/ptex/texmf/web2c/mktexdir.opt
+share/fonts/ptex/texmf/web2c/mktexnam
+share/fonts/ptex/texmf/web2c/mktexnam.opt
+share/fonts/ptex/texmf/web2c/mktexupd
+share/fonts/ptex/texmf/web2c/mp.pool
+share/fonts/ptex/texmf/web2c/mpost.mem
+share/fonts/ptex/texmf/web2c/plain.base
+share/fonts/ptex/texmf/web2c/plain.fmt
+share/fonts/ptex/texmf/web2c/plain.mem
+share/fonts/ptex/texmf/web2c/tex.fmt
+share/fonts/ptex/texmf/web2c/tex.pool
+share/fonts/ptex/texmf/web2c/texmf.cnf
+@dirrm share/fonts/ptex/texmf/web2c
+@dirrm share/fonts/ptex/texmf/fontname
 @dirrm libexec/ptex/man/man1
 @dirrm libexec/ptex/man
+@dirrm libexec/ptex/lib
 @dirrm libexec/ptex/info
 @dirrm libexec/ptex/include/kpathsea
 @dirrm libexec/ptex/include
+@dirrm libexec/ptex/bin
 @dirrm libexec/ptex
-@dirrm share/fonts/ptex/texmf/web2c
-@dirrm share/fonts/ptex/texmf/fontname
-@dirrm share/fonts/ptex/texmf
-@dirrm share/fonts/ptex
diff -Nru platex-19991104/ptex-euc/Makefile ptex-euc/Makefile
--- platex-19991104/ptex-euc/Makefile	Thu Nov  4 14:09:50 1999
+++ ptex-euc/Makefile	Wed Dec  8 19:54:56 1999
@@ -1,3 +1,5 @@
+# $NetBSD$
+
 DISTNAME=	ptex218
 PKGNAME=	ja-ptex-euc-2.1.8
 CATEGORIES=	japanese print
@@ -5,9 +7,10 @@
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib-1.4-euc.tar.gz \
 		Makefile.in.patch.txt
 
-MAINTAINER=	
+MAINTAINER=	oishi@ims.ac.jp
+HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
 
-DEPENDS=	ptex-common:../../japanese/ptex-common
+DEPENDS+=	ja-ptex-common-2.1.8:../../japanese/ptex-common
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -15,28 +18,28 @@
 INST_SUBDIR=	libexec/ptex
 TEXMF_SUBDIR=	share/fonts/ptex
 CONFIGURE_ARGS=	euc
-WRKSRC=		${.CURDIR}/../ptex-common/work/web2c-7.2/web2c/${DISTNAME}
+WRKSRC=		${.CURDIR}/../ptex-common/${WRKDIR_BASENAME}/web2c-7.2/web2c/${DISTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 ALL_TARGET=	default
 
 BINARIES=	iniptex jbibtex pdvitype pltotf ptex tftopl virptex
 
 pre-extract:
-.if !exists(${.CURDIR}/../ptex-common/work/.build_done)
+.if !exists(${.CURDIR}/../ptex-common/${WRKDIR_BASENAME}/.build_done)
 	@(cd ${.CURDIR}/../ptex-common; \
 	  ${SETENV} ${MAKE_ENV} ${MAKE})
 .endif
 
 post-extract:
 	@${RM} -rf ${WRKSRC}
-	@${MV} ${WRKDIR}/${DISTNAME} ${.CURDIR}/../ptex-common/work/web2c-7.2/web2c
+	@${MV} ${WRKDIR}/${DISTNAME} ${.CURDIR}/../ptex-common/${WRKDIR_BASENAME}/web2c-7.2/web2c
 
 pre-patch:
 	@/usr/bin/uudecode -p ${DISTDIR}/${DIST_SUBDIR}/Makefile.in.patch.txt | \
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	tar -C ${PREFIX}/${TEXMF_SUBDIR} \
+	${GTAR} -C ${PREFIX}/${TEXMF_SUBDIR} \
 		-zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz
 
 post-install:
@@ -44,12 +47,12 @@
 	@strip ${PREFIX}/${INST_SUBDIR}/bin/${bin}
 .endfor
 	${CAT} ${FILESDIR}/ptex | \
-		sed -e 's#@BINDIR@#${PREFIX}/libexec/ptex/bin#g' | \
-		sed -e 's#@TEXMF@#${PREFIX}/${TEXMF_SUBDIR}#g' \
+		${SED} -e 's#@BINDIR@#${PREFIX}/libexec/ptex/bin#g' | \
+		${SED} -e 's#@TEXMF@#${PREFIX}/${TEXMF_SUBDIR}#g' \
 		> ${PREFIX}/bin/ptex
 	${CHMOD} 755 ${PREFIX}/bin/ptex
 
 pre-clean:
 	@${RM} -rf ${WRKSRC}
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru platex-19991104/ptex-euc/files/md5 ptex-euc/files/md5
--- platex-19991104/ptex-euc/files/md5	Tue Jun 29 18:19:05 1999
+++ ptex-euc/files/md5	Wed Dec  8 19:54:56 1999
@@ -1,3 +1,5 @@
+$NetBSD$
+
 MD5 (ptex/ptex218.tar.gz) = f2cd2e3a0162b4bb8319562ec3331c65
 MD5 (ptex/plib-1.4-euc.tar.gz) = 8913238d89fd1d4a57e9853a91c76c4d
 MD5 (ptex/Makefile.in.patch.txt) = c2fc4ffad2a90eabf7a8f0c645b4cd77
diff -Nru platex-19991104/ptex-euc/files/ptex ptex-euc/files/ptex
--- platex-19991104/ptex-euc/files/ptex	Thu Nov  4 13:53:41 1999
+++ ptex-euc/files/ptex	Mon Dec 13 23:13:52 1999
@@ -1,6 +1,7 @@
 #!/bin/sh
 PATH='@BINDIR@:/usr/bin:/bin'
 if [ $TEXMFCNF="" ]; then
-TEXMFCNF='@TEXMF@/texmf/web2c/ptex'
-fi
+TEXMFCNF='@TEXMF@/texmf/web2c/ptex' @BINDIR@/ptex $*
+else
 @BINDIR@/ptex $*
+fi
diff -Nru platex-19991104/ptex-euc/patches/patch-aa ptex-euc/patches/patch-aa
--- platex-19991104/ptex-euc/patches/patch-aa	Thu Nov  4 14:08:42 1999
+++ ptex-euc/patches/patch-aa	Wed Dec  8 19:54:56 1999
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- Makefile.in.orig	Thu Nov  4 14:06:20 1999
 +++ Makefile.in	Thu Nov  4 14:08:21 1999
 @@ -3,7 +3,7 @@
diff -Nru platex-19991104/ptex-euc/pkg/PLIST ptex-euc/pkg/PLIST
--- platex-19991104/ptex-euc/pkg/PLIST	Tue Nov  2 16:33:15 1999
+++ ptex-euc/pkg/PLIST	Thu Dec  9 19:36:33 1999
@@ -1,8 +1,13 @@
+@comment $NetBSD$
+
+bin/ptex
+libexec/ptex/bin/iniptex
 libexec/ptex/bin/jbibtex
 libexec/ptex/bin/pdvitype
 libexec/ptex/bin/pltotf
 libexec/ptex/bin/ptex
 libexec/ptex/bin/tftopl
+libexec/ptex/bin/virptex
 share/fonts/ptex/texmf/doc/jbibtex/doc-ascii/Makefile
 share/fonts/ptex/texmf/doc/jbibtex/doc-ascii/README
 share/fonts/ptex/texmf/doc/jbibtex/doc-ascii/README.1st
@@ -115,3 +120,15 @@
 share/fonts/ptex/texmf/web2c/ptex.fmt
 share/fonts/ptex/texmf/web2c/ptex.pool
 share/fonts/ptex/texmf/web2c/ptex/texmf.cnf
+@dirrm share/fonts/ptex/texmf/web2c/ptex
+@dirrm share/fonts/ptex/texmf/tex/ptex
+@dirrm share/fonts/ptex/texmf/jbibtex/bst
+@dirrm share/fonts/ptex/texmf/jbibtex/bib
+@dirrm share/fonts/ptex/texmf/jbibtex
+@dirrm share/fonts/ptex/texmf/fonts/tfm/ptex
+@dirrm share/fonts/ptex/texmf/fonts/tfm/ascgrp
+@dirrm share/fonts/ptex/texmf/fonts/source/ptex
+@dirrm share/fonts/ptex/texmf/fonts/source/ascgrp
+@dirrm share/fonts/ptex/texmf/doc/ptex
+@dirrm share/fonts/ptex/texmf/doc/jbibtex/doc-ascii
+@dirrm share/fonts/ptex/texmf/doc/jbibtex
diff -Nru platex-19991104/ptex-texmflib/Makefile ptex-texmflib/Makefile
--- platex-19991104/ptex-texmflib/Makefile	Tue Nov  2 12:08:41 1999
+++ ptex-texmflib/Makefile	Wed Dec  8 19:55:12 1999
@@ -1,17 +1,22 @@
+# $NetBSD$
+
 DISTNAME=	texmflib-7.3
 PKGNAME=	ja-texmflib-7.3
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} 
+
+MAINTAINER=	oishi@ims.ac.jp
+HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
+
 DIST_SUBDIR=	ptex
 INST_SUBDIR=	share/fonts/ptex
-MAINTAINER=	oishi@ims.ac.jp
-EXTRACT_CMD=	/usr/bin/true
+
+EXTRACT_CMD=	${TRUE}
 NO_BUILD=	yes
 
 do-install:
-		${MKDIR} ${PREFIX}/${INST_SUBDIR} 
+		${MKDIR} ${PREFIX}/${INST_SUBDIR}
 		${GTAR} -C ${PREFIX}/${INST_SUBDIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}
 		${RM} -R ${PREFIX}/${INST_SUBDIR}/texmf/dvips
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru platex-19991104/ptex-texmflib/files/md5 ptex-texmflib/files/md5
--- platex-19991104/ptex-texmflib/files/md5	Mon Aug  2 13:12:30 1999
+++ ptex-texmflib/files/md5	Wed Dec  8 19:55:12 1999
@@ -1 +1,3 @@
+$NetBSD$
+
 MD5 (ptex/texmflib-7.3.tar.gz) = 6ad489dab000f5830aa78b17c362a97a
diff -Nru platex-19991104/ptex-texmflib/pkg/PLIST ptex-texmflib/pkg/PLIST
--- platex-19991104/ptex-texmflib/pkg/PLIST	Tue Nov  2 12:10:19 1999
+++ ptex-texmflib/pkg/PLIST	Fri Dec 10 23:55:17 1999
@@ -1,3 +1,5 @@
+@comment $NetBSD$
+
 share/fonts/ptex/texmf/VERSION-7.3
 share/fonts/ptex/texmf/bibtex/bib/base/xampl.bib
 share/fonts/ptex/texmf/bibtex/bst/base/abbrv.bst
diff -Nru platex-19991104/virtualfont/Makefile virtualfont/Makefile
--- platex-19991104/virtualfont/Makefile	Tue Nov  2 12:06:37 1999
+++ virtualfont/Makefile	Fri Dec 10 02:00:16 1999
@@ -1,15 +1,18 @@
+# $NetBSD$
+
 DISTNAME=	virtualfont
 PKGNAME=	ja-virtualfont-1.0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/
+DISTFILES=	nmin-ngoth.tar.gz standard.tar.gz morisawa.tar.gz
 
-MAINTAINER=	
+MAINTAINER=	oishi@ims.ac.jp
+HOMEPAGE=	http://www.ascii.co.jp/pb/ptex/
 
-DISTFILES=	nmin-ngoth.tar.gz standard.tar.gz morisawa.tar.gz
 DIST_SUBDIR=	ptex
-NO_BUILD=	yes
 
 VFDIR=		${PREFIX}/share/fonts/japanese
+NO_BUILD=	yes
 
 do-install:
 	${MKDIR} ${VFDIR}
@@ -20,4 +23,4 @@
 .endfor
 	${MV} ${VFDIR}/vf ${VFDIR}/virtualfont
 
-.include <../../mk/bsd.pkg.mk>
+.include "../../mk/bsd.pkg.mk"
diff -Nru platex-19991104/virtualfont/pkg/PLIST virtualfont/pkg/PLIST
--- platex-19991104/virtualfont/pkg/PLIST	Tue Nov  2 12:05:10 1999
+++ virtualfont/pkg/PLIST	Sat Dec 11 09:01:26 1999
@@ -1,3 +1,5 @@
+@comment $NetBSD$
+
 share/fonts/japanese/dvips/futogo-b-v.tfm
 share/fonts/japanese/dvips/futogo-b.tfm
 share/fonts/japanese/dvips/futomin-b-v.tfm
@@ -114,3 +116,7 @@
 share/fonts/japanese/virtualfont/tmin7.vf
 share/fonts/japanese/virtualfont/tmin8.vf
 share/fonts/japanese/virtualfont/tmin9.vf
+@dirrm share/fonts/japanese/virtualfont
+@dirrm share/fonts/japanese/ptex
+@dirrm share/fonts/japanese/dvips
+@dirrm share/fonts/japanese