Update tex-ptex{,-doc} to 3.2.

Changes:
- Make Japanese font maps available to updmap.
- Generate LaTeX format using eptex instead of ptex.

4 files changed, 34 insertions, 22 deletions

diff --git a/print/tex-ptex/Makefile b/print/tex-ptex/Makefile
index e08d4629846..4c4417a9b9c 100644
--- a/print/tex-ptex/Makefile
+++ b/print/tex-ptex/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2011/02/07 19:59:44 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2012/03/04 01:20:20 minskim Exp $
 
 DISTNAME=	ptex
-PKGNAME=	tex-${DISTNAME}-3.1.9
-PKGREVISION=	1
-TEXLIVE_REV=	21270
+PKGNAME=	tex-${DISTNAME}-3.2
+TEXLIVE_REV=	25342
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	TeX system for publishing in Japanese
 
 CONFLICTS+=	ja-ptex-bin-[0-9]*
 DEPENDS+=	tex-adobemapping-[0-9]*:../../fonts/tex-adobemapping
+DEPENDS+=	tex-hyph-utf8-[0-9]*:../../print/tex-hyph-utf8
+DEPENDS+=	tex-hyphen-base-[0-9]*:../../print/tex-hyphen-base
+DEPENDS+=	tex-ipaex-[0-9]*:../../fonts/tex-ipaex
+DEPENDS+=	tex-japanese-[0-9]*:../../print/tex-japanese
+DEPENDS+=	tex-japanese-otf-[0-9]*:../../fonts/tex-japanese-otf
 DEPENDS+=	tex-latex>=2010:../../print/tex-latex
 DEPENDS+=	tex-tex-[0-9]*:../../print/tex-tex
 DEPENDS+=	web2c>=2010nb5:../../print/web2c
@@ -22,13 +26,15 @@ CONF_FILES+=	${PREFIX}/share/texmf-dist/tex/ptexgeneric/config/language.ptx \
 
 INSTALLATION_DIRS+=	bin
 
-TEX_FORMATS+=		"ptex ptex - ptex.ini\\nplatex ptex language.ptx platex.ini\\n"
+TEX_FORMATS+=		"ptex ptex - ptex.ini\\neptex eptex language.def *eptex.ini\\nplatex eptex language.ptx *platex.ini\\n"
+TEX_KANJIMAP_FILES+=	morisawa.map
+TEX_KANJIMAP_FILES+=	ptex-@kanjiEmbed@@kanjiVariant@.map
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
 .include "../../print/texlive/package.mk"
 
 post-install:
-	${LN} -sf ptex ${DESTDIR}${PREFIX}/bin/platex
+	${LN} -sf eptex ${DESTDIR}${PREFIX}/bin/platex
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-ptex/PLIST b/print/tex-ptex/PLIST
index d310bce7793..6b8adb68743 100644
--- a/print/tex-ptex/PLIST
+++ b/print/tex-ptex/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2011/02/07 19:59:44 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/03/04 01:20:20 minskim Exp $
 bin/platex
+share/texmf-dist/fonts/map/dvipdfmx/ptex/morisawa.map
+share/texmf-dist/fonts/map/dvipdfmx/ptex/ptex-noEmbed.map
 share/texmf-dist/fonts/source/ptex/ascgrp/ascgrp.mf
 share/texmf-dist/fonts/source/ptex/ascgrp/ascii.mf
 share/texmf-dist/fonts/source/ptex/ascgrp/ascii10.mf
@@ -211,6 +213,7 @@ share/texmf-dist/tex/platex/base/jy1mc.fd
 share/texmf-dist/tex/platex/base/kinsoku.tex
 share/texmf-dist/tex/platex/base/nidanfloat.sty
 share/texmf-dist/tex/platex/base/oldpfont.sty
+share/texmf-dist/tex/platex/base/pl209.def
 share/texmf-dist/tex/platex/base/platex.ltx
 share/texmf-dist/tex/platex/base/plcore.ltx
 share/texmf-dist/tex/platex/base/pldefs.ltx
@@ -233,11 +236,13 @@ share/texmf-dist/tex/platex/base/tsize12.clo
 share/texmf-dist/tex/platex/config/hyphen.cfg
 share/texmf-dist/tex/platex/config/platex.ini
 share/texmf-dist/tex/ptex/base/ascii-jplain.tex
+share/texmf-dist/tex/ptex/base/eptex.src
+share/texmf-dist/tex/ptex/base/eptexdefs.lib
 share/texmf-dist/tex/ptex/base/kinsoku.tex
 share/texmf-dist/tex/ptex/base/ptex.tex
+share/texmf-dist/tex/ptex/config/eptex.ini
 share/texmf-dist/tex/ptex/config/ptex.ini
 share/texmf-dist/tex/ptexgeneric/config/language.ptx
-share/texmf-dist/tex/ptexgeneric/hyphen/copthyph.tex
 share/texmf-dist/tex/ptexgeneric/hyphen/grahyph5.tex
 share/texmf-dist/tex/ptexgeneric/hyphen/grmhyph5.tex
 share/texmf-dist/tex/ptexgeneric/hyphen/grphyph5.tex
diff --git a/print/tex-ptex/distinfo b/print/tex-ptex/distinfo
index 9b196f67a74..8e1d222e549 100644
--- a/print/tex-ptex/distinfo
+++ b/print/tex-ptex/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2011/02/07 19:59:44 minskim Exp $
+$NetBSD: distinfo,v 1.3 2012/03/04 01:20:20 minskim Exp $
 
-SHA1 (tex-ptex-21270/ptex.tar.xz) = d22797983328cff055077de9be34898d015cd069
-RMD160 (tex-ptex-21270/ptex.tar.xz) = b53823cbbcb90e5dc6b2df1be1034e5d02d61732
-Size (tex-ptex-21270/ptex.tar.xz) = 99232 bytes
-SHA1 (patch-aa) = e53be2bf0bdb5bb700096d190a9a3813418c1439
+SHA1 (tex-ptex-25342/ptex.tar.xz) = 8d6e94f651b30af4ceb77b1895f96774b005e768
+RMD160 (tex-ptex-25342/ptex.tar.xz) = 0d0cdd994e45e0a0c1301e32f26c383bcd8e3783
+Size (tex-ptex-25342/ptex.tar.xz) = 105544 bytes
+SHA1 (patch-aa) = ad476760c8edd55bc863edc575c86bbfbb797922
diff --git a/print/tex-ptex/patches/patch-aa b/print/tex-ptex/patches/patch-aa
index aea8e5cccde..490c5438dae 100644
--- a/print/tex-ptex/patches/patch-aa
+++ b/print/tex-ptex/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2011/02/07 19:59:44 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2012/03/04 01:20:21 minskim Exp $
 
---- texmf-dist/tex/ptexgeneric/config/language.ptx.orig	2011-02-02 03:39:34.000000000 +0000
+--- texmf-dist/tex/ptexgeneric/config/language.ptx.orig	2011-08-09 21:54:20.000000000 +0000
 +++ texmf-dist/tex/ptexgeneric/config/language.ptx
-@@ -15,161 +15,3 @@ english		hyphen.tex  % do not change!
+@@ -15,162 +15,3 @@ english		hyphen.tex  % do not change!
  dumylang	dumyhyph.tex    %for testing a new language.
  nohyphenation	zerohyph.tex    %a language with no patterns at all.
  
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.2 2011/02/07 19:59:44 minskim Exp $
 -% from hyphen-catalan:
 -catalan loadhyph-ca.tex
 -% from hyphen-chinese:
--pinyin loadhyph-zh-latn.tex
+-pinyin loadhyph-zh-latn-pinyin.tex
 -% from hyphen-croatian:
 -croatian loadhyph-hr.tex
 -% from hyphen-czech:
@@ -89,6 +89,7 @@ $NetBSD: patch-aa,v 1.2 2011/02/07 19:59:44 minskim Exp $
 -russian loadhyph-ru.tex
 -% from hyphen-serbian:
 -serbian loadhyph-sr-latn.tex
+-serbianc loadhyph-sr-cyrl.tex
 -% from hyphen-slovak:
 -slovak loadhyph-sk.tex
 -% from hyphen-slovenian:
@@ -126,13 +127,13 @@ $NetBSD: patch-aa,v 1.2 2011/02/07 19:59:44 minskim Exp $
 -% from hyphen-coptic:
 -coptic loadhyph-cop.tex
 -
--%-------------%
--% not working %
--%-------------%
+-%------------------------%
+-% empty (no support yet) %
+-%------------------------%
 -% % from dehyph-exptl:
--% german-x-2009-06-19 dehypht-x-2009-06-19.tex
+-% german-x-2011-07-01 dehypht-x-2011-07-01.tex
 -% =german-x-latest
--% ngerman-x-2009-06-19 dehyphn-x-2009-06-19.tex
+-% ngerman-x-2011-07-01 dehyphn-x-2011-07-01.tex
 -% =ngerman-x-latest
 -
 -%-------%