4 files changed, 38 insertions, 31 deletions

diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 9e31b30d4831..3a4c5f7c3ba0 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	pTeX-euc
+# New ports collection makefile for:	pTeX
 # Date created:		05 Oct 1997
 # Whom:			max
 #
@@ -6,42 +6,46 @@
 #
 
 PORTNAME=	ptex
-PORTVERSION=	2.1.11
+PORTVERSION=	3.1.2
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/tetex/
 PKGNAMEPREFIX=	ja-
-PKGNAMESUFFIX=	-euc
-DISTNAME=	ptex-src-2.1.10
-DIST_SUBDIR=	teTeX/ptex
+DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+DIST_SUBDIR=	teTeX
 
 MAINTAINER=	max@FreeBSD.org
-COMMENT=	Japanese pTeX files to support EUC character set
+COMMENT=	Japanese specific files for ASCII Japanese pTeX
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	ptex2.1.10-11.patch
+BUILD_DEPENDS=	${PREFIX}/share/texmf/ptex/plain/base/ptex.tex:${PORTSDIR}/japanese/ptex-base
+RUN_DEPENDS=	${PREFIX}/share/texmf/ptex/plain/base/ptex.tex:${PORTSDIR}/japanese/ptex-base
 
-BUILD_DEPENDS=	${PREFIX}/share/texmf/ptex/plain/base/ptex.tex:${PORTSDIR}/japanese/ptex-common
-RUN_DEPENDS=	${PREFIX}/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
-CONFIGURE_ARGS=	euc
-WRKSRC=	${WRKDIRPREFIX}${.CURDIR}/../ptex-common/work/teTeX-1.0/texk/web2c/${SRCDIR}
+CONFIGURE_ARGS=	${KANJICODE}
+WRKSRC=	${WRKDIRPREFIX}${.CURDIR}/../ptex-base/work/tetex-src-${TETEX_VERSION}/texk/web2c/${SRCDIR}
 ALL_TARGET=	default
 
-SRCDIR=		ptex-src-2.1.10
+KANJICODE?=	jis
+SRCDIR=		ptex-${PORTVERSION}
+TETEX_VERSION=	2.0.1
 BINARIES=	ptex pdvitype jbibtex pltotf tftopl
 
 pre-extract:
-.if !exists(${WRKDIRPREFIX}${.CURDIR}/../ptex-common/work/.build_done)
-	@(cd ${.CURDIR}/../ptex-common; \
+	@${ECHO} "The default kanji code is ${KANJICODE}."
+	@${ECHO} "You can change the kanji code at ptex runtime with the -kanji option."
+	@${ECHO} "e.g. ptex -kanji=sjis"
+	@${ECHO} "If you would like to change the default kanji code, run make as follows:"
+	@${ECHO} "    make KANJICODE=sjis"
+	@${ECHO} "for Shift-JIS.  KANJICODE can be one of sjis, jis or euc."
+	@sleep 10
+.if !exists(${WRKDIRPREFIX}${.CURDIR}/../ptex-base/work/.build_done.ja-ptex-base-${PORTVERSION})
+	@(cd ${.CURDIR}/../ptex-base; \
 	  ${SETENV} ${MAKE_ENV} ${MAKE})
 .endif
 
 post-extract:
 	@${RM} -rf ${WRKSRC}
-	@${MV} ${WRKDIR}/${SRCDIR} ${WRKDIRPREFIX}${.CURDIR}/../ptex-common/work/teTeX-1.0/texk/web2c
+	@${MV} ${WRKDIR}/${SRCDIR} ${WRKDIRPREFIX}${.CURDIR}/../ptex-base/work/tetex-src-${TETEX_VERSION}/texk/web2c
 
 pre-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/japanese/ptex/distinfo b/japanese/ptex/distinfo
index 208b5df74d53..cfbd4509d0f9 100644
--- a/japanese/ptex/distinfo
+++ b/japanese/ptex/distinfo
@@ -1,2 +1 @@
-MD5 (teTeX/ptex/ptex-src-2.1.10.tar.gz) = cc8f47d5c97868e6967bd4f87503ce90
-MD5 (teTeX/ptex/ptex2.1.10-11.patch) = dd6915dbfc57f983d6380c84d116ee1b
+MD5 (teTeX/ptex-src-3.1.2.tar.gz) = dba257433562c3a5a33206ecb1157a74
diff --git a/japanese/ptex/pkg-descr b/japanese/ptex/pkg-descr
index f0d9e521d80c..299a599aed80 100644
--- a/japanese/ptex/pkg-descr
+++ b/japanese/ptex/pkg-descr
@@ -1,18 +1,17 @@
-This is pTeX, TeX system with Japanese support.
+This is pTeX, TeX system with Japanese support.  This package installs
+Japanese specific executables and other files.
 
-This system is based on teTeX 1.0.7 which contains TeX, LaTeX2e, and
+This system is based on teTeX 2.0.1 which contains TeX, LaTeX2e, and
 various other TeX related programs.  
 
-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.)
+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.
+Note: xdvi, dvips, and dvipdfm, which are part of teTeX package, are
+not included in this package since they are not localized for
+Japanese.  Use corresponding ports/packages in the japanese or print
+category.
 
 - Max
 WWW: http://www.ascii.co.jp/pb/ptex/
diff --git a/japanese/ptex/pkg-plist b/japanese/ptex/pkg-plist
index 8b6c4a36a243..bef11b998420 100644
--- a/japanese/ptex/pkg-plist
+++ b/japanese/ptex/pkg-plist
@@ -4,9 +4,14 @@ bin/pdvitype
 bin/platex
 bin/pltotf
 bin/ptex
-bin/tftopl
 bin/virptex
+share/texmf/web2c/platex-euc.fmt
+share/texmf/web2c/platex-jis.fmt
+share/texmf/web2c/platex-sjis.fmt
 share/texmf/web2c/platex.fmt
+share/texmf/web2c/ptex-euc.fmt
+share/texmf/web2c/ptex-jis.fmt
+share/texmf/web2c/ptex-sjis.fmt
 share/texmf/web2c/ptex.fmt
 share/texmf/web2c/ptex.pool
 share/texmf/web2c/texmf.cnf