7 files changed, 72 insertions, 161 deletions

diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 3e71018ccf61..3059f4a7ada2 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -6,29 +6,33 @@
 #
 
 PORTNAME=	ptex
-PORTVERSION=	2.1.8
-PKGNAMESUFFIX=	-euc
+PORTVERSION=	2.1.10
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/${DISTNAME}/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/
+PKGNAMEPREFIX=	ja-
+PKGNAMESUFFIX=	-euc
+DISTNAME=	ptex-src-2.1.9-1
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		plib-1.4${PKGNAMESUFFIX}.tar.gz \
-		Makefile.in.patch.txt
+		  ${PTEX_PATCHFILES}
+DIST_SUBDIR=	teTeX/ptex
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	max@FreeBSD.org
 
-RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common
+BUILD_DEPENDS=	${LOCALBASE}/share/texmf/ptex/plain/base/ptex.tex:${PORTSDIR}/japanese/ptex-common
+RUN_DEPENDS=	${LOCALBASE}/share/texmf/ptex/plain/base/ptex.tex:${PORTSDIR}/japanese/ptex-common
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-DIST_SUBDIR=	ptex
 CONFIGURE_ARGS=	euc
-WRKSRC=	${WRKDIRPREFIX}${.CURDIR}/../ptex-common/work/web2c-7.2/web2c/${DISTNAME}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+WRKSRC=	${WRKDIRPREFIX}${.CURDIR}/../ptex-common/work/teTeX-1.0/texk/web2c/${SRCDIR}
 ALL_TARGET=	default
 
-BINARIES=	iniptex jbibtex pdvitype pltotf ptex tftopl virptex
+SRCDIR=		ptex-src-2.1.9
+PTEX_PATCHFILES=	ptex2.1.9-10.patch ptex2.1.9-10_2.patch \
+			pltotf1.3-4.patch
+BINARIES=	ptex pdvitype jbibtex pltotf tftopl
 
 pre-extract:
 .if !exists(${WRKDIRPREFIX}${.CURDIR}/../ptex-common/work/.build_done)
@@ -38,19 +42,23 @@ pre-extract:
 
 post-extract:
 	@${RM} -rf ${WRKSRC}
-	@${MV} ${WRKDIR}/${DISTNAME} ${WRKDIRPREFIX}${.CURDIR}/../ptex-common/work/web2c-7.2/web2c
+	@${MV} ${WRKDIR}/${SRCDIR} ${WRKDIRPREFIX}${.CURDIR}/../ptex-common/work/teTeX-1.0/texk/web2c
 
-pre-patch:
-	@/usr/bin/uudecode -p ${DISTDIR}/${DIST_SUBDIR}/Makefile.in.patch.txt | \
+do-patch:
+.for f in ${PTEX_PATCHFILES}
+	@/usr/bin/uudecode -p ${DISTDIR}/${DIST_SUBDIR}/$f | \
 	  ${PATCH} ${PATCH_DIST_ARGS}
+.endfor
 
 pre-install:
-	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4${PKGNAMESUFFIX}.tar.gz
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
 .for bin in ${BINARIES}
-	@strip ${PREFIX}/bin/${bin}
+	@/usr/bin/strip ${PREFIX}/bin/${bin}
 .endfor
+	@${LN} -sf ptex ${PREFIX}/bin/platex
+	@${PREFIX}/bin/mktexlsr ${PREFIX}/share/texmf
 
 pre-clean:
 	@${RM} -rf ${WRKSRC}
diff --git a/japanese/ptex/distinfo b/japanese/ptex/distinfo
index 523a7a7439cf..518ebd851503 100644
--- a/japanese/ptex/distinfo
+++ b/japanese/ptex/distinfo
@@ -1,3 +1,4 @@
-MD5 (ptex/ptex218.tar.gz) = f2cd2e3a0162b4bb8319562ec3331c65
-MD5 (ptex/plib-1.4-euc.tar.gz) = 8913238d89fd1d4a57e9853a91c76c4d
-MD5 (ptex/Makefile.in.patch.txt) = c2fc4ffad2a90eabf7a8f0c645b4cd77
+MD5 (teTeX/ptex/ptex-src-2.1.9-1.tar.gz) = 7f3f1b50648c7422d877e7c72274f1f2
+MD5 (teTeX/ptex/ptex2.1.9-10.patch) = b0cfe1fb0173ec26585152e94cd32c46
+MD5 (teTeX/ptex/ptex2.1.9-10_2.patch) = 013e47675a240cb65fec634adeb14e73
+MD5 (teTeX/ptex/pltotf1.3-4.patch) = 2a4cd574cdf5ec833f9fe94ea1149f43
diff --git a/japanese/ptex/files/patch-aa b/japanese/ptex/files/patch-aa
deleted file mode 100644
index 07380e757a4f..000000000000
--- a/japanese/ptex/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Wed Jun 24 07:02:38 1998
-+++ Makefile.in	Wed Jun 24 07:03:31 1998
-@@ -3,7 +3,7 @@
- 
- kanjicode = @kanjicode@
- 
--default : programs formats
-+default : programs #formats
- 
- programs=ptex tftopl pltotf pdvitype jbibtex
- formats=ptex.fmt
-@@ -160,7 +160,7 @@
- 
- texmf.cnf: ../../kpathsea/texmf.cnf
- 	cp ../../kpathsea/texmf.cnf texmf.cnf
--	$(SHELL) $(thisdir)/mkconf $(thisdir)
-+#	$(SHELL) $(thisdir)/mkconf $(thisdir)
- 
- dumpenv = TEXMFCNF=$(thisdir) TEXMF=$(texmf) 
- 
diff --git a/japanese/ptex/pkg-deinstall b/japanese/ptex/pkg-deinstall
new file mode 100644
index 000000000000..c432da27777a
--- /dev/null
+++ b/japanese/ptex/pkg-deinstall
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Preserve files installed by ptex-common, or other package/application.
+#
+files="${PKG_PREFIX}/bin/pltotf ${PKG_PREFIX}/bin/tftopl ${PKG_PREFIX}/share/texmf/web2c/texmf.cnf ${PKG_PREFIX}/share/texmf/ls-R"
+
+if [ "$2" != "POST-DEINSTALL" ]; then
+  exit;
+fi
+
+for f in ${files}; do
+  if [ -f $f.old ]; then
+    mv $f.old $f
+  fi
+done
diff --git a/japanese/ptex/pkg-descr b/japanese/ptex/pkg-descr
index 86bfd0b53c53..f0d9e521d80c 100644
--- a/japanese/ptex/pkg-descr
+++ b/japanese/ptex/pkg-descr
@@ -1,7 +1,18 @@
 This is pTeX, TeX system with Japanese support.
 
-This system is based on TeX 3.14159.
+This system is based on teTeX 1.0.7 which contains TeX, LaTeX2e, and
+various other TeX related programs.  
 
-pTeX system installed using this package supports EUC code.
+By installing this package, pTeX uses EUC for output to terminal and
+log files.  EUC and JIS can be used in input files.
+
+Note: Some of the features provided by teTeX may not work with
+Japanese language, even though The TeX and LaTeX2e are able to handle
+Japanese.  Use ptex and platex respectively.)
+
+Note: xdvi and dvips, which are part of teTeX package, are not
+included in this packages since they are not localized for Japanese.
+Use corresponding ports/packages in the japanese category.
 
 - Max
+WWW: http://www.ascii.co.jp/pb/ptex/
diff --git a/japanese/ptex/pkg-install b/japanese/ptex/pkg-install
new file mode 100644
index 000000000000..3c64b806ae06
--- /dev/null
+++ b/japanese/ptex/pkg-install
@@ -0,0 +1,14 @@
+#!/bin/sh
+# Preserve files installed by ptex-common, or other package/application.
+#
+files="${PKG_PREFIX}/bin/pltotf ${PKG_PREFIX}/bin/tftopl ${PKG_PREFIX}/share/texmf/web2c/texmf.cnf ${PKG_PREFIX}/share/texmf/ls-R"
+
+if [ "$2" != "PRE-INSTALL" ]; then
+  exit;
+fi
+
+for f in ${files}; do
+    if [ -f $f ]; then
+      mv $f $f.old
+      fi
+    done
diff --git a/japanese/ptex/pkg-plist b/japanese/ptex/pkg-plist
index 7a4a263dd822..b1735ec26d41 100644
--- a/japanese/ptex/pkg-plist
+++ b/japanese/ptex/pkg-plist
@@ -1,129 +1,12 @@
 bin/iniptex
 bin/jbibtex
 bin/pdvitype
+bin/platex
 bin/pltotf
 bin/ptex
 bin/tftopl
 bin/virptex
-share/texmf/tex/ptex/jplain.tex
-share/texmf/tex/ptex/kinsoku.tex
-share/texmf/tex/ptex/ptex.tex
-share/texmf/plib-1.4-euc.txt
-share/texmf/fonts/tfm/ptex/goth10.tfm
-share/texmf/fonts/tfm/ptex/goth5.tfm
-share/texmf/fonts/tfm/ptex/goth6.tfm
-share/texmf/fonts/tfm/ptex/goth7.tfm
-share/texmf/fonts/tfm/ptex/goth8.tfm
-share/texmf/fonts/tfm/ptex/goth9.tfm
-share/texmf/fonts/tfm/ptex/min10.tfm
-share/texmf/fonts/tfm/ptex/min5.tfm
-share/texmf/fonts/tfm/ptex/min6.tfm
-share/texmf/fonts/tfm/ptex/min7.tfm
-share/texmf/fonts/tfm/ptex/min8.tfm
-share/texmf/fonts/tfm/ptex/min9.tfm
-share/texmf/fonts/tfm/ptex/ngoth10.tfm
-share/texmf/fonts/tfm/ptex/ngoth5.tfm
-share/texmf/fonts/tfm/ptex/ngoth6.tfm
-share/texmf/fonts/tfm/ptex/ngoth7.tfm
-share/texmf/fonts/tfm/ptex/ngoth8.tfm
-share/texmf/fonts/tfm/ptex/ngoth9.tfm
-share/texmf/fonts/tfm/ptex/nmin10.tfm
-share/texmf/fonts/tfm/ptex/nmin5.tfm
-share/texmf/fonts/tfm/ptex/nmin6.tfm
-share/texmf/fonts/tfm/ptex/nmin7.tfm
-share/texmf/fonts/tfm/ptex/nmin8.tfm
-share/texmf/fonts/tfm/ptex/nmin9.tfm
-share/texmf/fonts/tfm/ptex/tgoth10.tfm
-share/texmf/fonts/tfm/ptex/tgoth5.tfm
-share/texmf/fonts/tfm/ptex/tgoth6.tfm
-share/texmf/fonts/tfm/ptex/tgoth7.tfm
-share/texmf/fonts/tfm/ptex/tgoth8.tfm
-share/texmf/fonts/tfm/ptex/tgoth9.tfm
-share/texmf/fonts/tfm/ptex/tmin10.tfm
-share/texmf/fonts/tfm/ptex/tmin5.tfm
-share/texmf/fonts/tfm/ptex/tmin6.tfm
-share/texmf/fonts/tfm/ptex/tmin7.tfm
-share/texmf/fonts/tfm/ptex/tmin8.tfm
-share/texmf/fonts/tfm/ptex/tmin9.tfm
-share/texmf/fonts/tfm/ascgrp/ascii10.tfm
-share/texmf/fonts/tfm/ascgrp/ascii36.tfm
-share/texmf/fonts/tfm/ascgrp/ascgrp.tfm
-share/texmf/fonts/source/ptex/goth10.pl
-share/texmf/fonts/source/ptex/goth5.pl
-share/texmf/fonts/source/ptex/goth6.pl
-share/texmf/fonts/source/ptex/goth7.pl
-share/texmf/fonts/source/ptex/goth8.pl
-share/texmf/fonts/source/ptex/goth9.pl
-share/texmf/fonts/source/ptex/min10.pl
-share/texmf/fonts/source/ptex/min5.pl
-share/texmf/fonts/source/ptex/min6.pl
-share/texmf/fonts/source/ptex/min7.pl
-share/texmf/fonts/source/ptex/min8.pl
-share/texmf/fonts/source/ptex/min9.pl
-share/texmf/fonts/source/ptex/ngoth10.pl
-share/texmf/fonts/source/ptex/ngoth5.pl
-share/texmf/fonts/source/ptex/ngoth6.pl
-share/texmf/fonts/source/ptex/ngoth7.pl
-share/texmf/fonts/source/ptex/ngoth8.pl
-share/texmf/fonts/source/ptex/ngoth9.pl
-share/texmf/fonts/source/ptex/nmin10.pl
-share/texmf/fonts/source/ptex/nmin5.pl
-share/texmf/fonts/source/ptex/nmin6.pl
-share/texmf/fonts/source/ptex/nmin7.pl
-share/texmf/fonts/source/ptex/nmin8.pl
-share/texmf/fonts/source/ptex/nmin9.pl
-share/texmf/fonts/source/ptex/tgoth10.pl
-share/texmf/fonts/source/ptex/tgoth5.pl
-share/texmf/fonts/source/ptex/tgoth6.pl
-share/texmf/fonts/source/ptex/tgoth7.pl
-share/texmf/fonts/source/ptex/tgoth8.pl
-share/texmf/fonts/source/ptex/tgoth9.pl
-share/texmf/fonts/source/ptex/tmin10.pl
-share/texmf/fonts/source/ptex/tmin5.pl
-share/texmf/fonts/source/ptex/tmin6.pl
-share/texmf/fonts/source/ptex/tmin7.pl
-share/texmf/fonts/source/ptex/tmin8.pl
-share/texmf/fonts/source/ptex/tmin9.pl
-share/texmf/fonts/source/ascgrp/ascgrp.mf
-share/texmf/fonts/source/ascgrp/ascii10.mf
-share/texmf/fonts/source/ascgrp/ascii36.mf
-share/texmf/fonts/source/ascgrp/ascii.mf
-share/texmf/doc/ptex/ptexskip.tex
-share/texmf/doc/ptex/jfm.tex
-share/texmf/doc/ptex/jtex.tex
-share/texmf/doc/ptex/jtexdoc.tex
-share/texmf/doc/ptex/ptexdoc.tex
-share/texmf/doc/jbibtex/doc-ascii/Makefile
-share/texmf/doc/jbibtex/doc-ascii/README
-share/texmf/doc/jbibtex/doc-ascii/cpp.awk
-share/texmf/doc/jbibtex/doc-ascii/generate.sh
-share/texmf/doc/jbibtex/doc-ascii/jbibtex.bib
-share/texmf/doc/jbibtex/doc-ascii/jbibtex.tex
-share/texmf/doc/jbibtex/doc-ascii/jbtxbst.doc
-share/texmf/doc/jbibtex/doc-ascii/jbtxdoc.bib
-share/texmf/doc/jbibtex/doc-ascii/jbtxdoc.tex
-share/texmf/doc/jbibtex/doc-ascii/jbtxhak.tex
-share/texmf/doc/jbibtex/doc-ascii/README.1st
+share/texmf/web2c/platex.fmt
 share/texmf/web2c/ptex.fmt
 share/texmf/web2c/ptex.pool
-share/texmf/jbibtex/bib/jxampl.bib
-share/texmf/jbibtex/bst/jabbrv.bst
-share/texmf/jbibtex/bst/jalpha.bst
-share/texmf/jbibtex/bst/jipsj.bst
-share/texmf/jbibtex/bst/jname.bst
-share/texmf/jbibtex/bst/jorsj.bst
-share/texmf/jbibtex/bst/jplain.bst
-share/texmf/jbibtex/bst/junsrt.bst
-share/texmf/jbibtex/bst/tieice.bst
-share/texmf/jbibtex/bst/tipsj.bst
-@dirrm share/texmf/jbibtex/bst
-@dirrm share/texmf/jbibtex/bib
-@dirrm share/texmf/jbibtex
-@dirrm share/texmf/tex/ptex
-@dirrm share/texmf/fonts/tfm/ascgrp
-@dirrm share/texmf/fonts/tfm/ptex
-@dirrm share/texmf/fonts/source/ptex
-@dirrm share/texmf/fonts/source/ascgrp
-@dirrm share/texmf/doc/jbibtex/doc-ascii
-@dirrm share/texmf/doc/jbibtex
-@dirrm share/texmf/doc/ptex
+share/texmf/web2c/texmf.cnf