Sync tex-tetex{,-doc} with TeX Live r25424.

This version supports Japanese font maps for pTeX and pLaTeX.

9 files changed, 44 insertions, 25 deletions

diff --git a/print/tex-tetex-doc/Makefile b/print/tex-tetex-doc/Makefile
index 6eba07bc12c..0e37638c6d8 100644
--- a/print/tex-tetex-doc/Makefile
+++ b/print/tex-tetex-doc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2011/11/06 08:43:28 minskim Exp $
+# $NetBSD: Makefile,v 1.10 2012/03/04 01:01:43 minskim Exp $
 
 DISTNAME=	tetex.doc
 PKGNAME=	tex-${DISTNAME:S/./-/}-3.0.24482
-TEXLIVE_REV=	24482
+TEXLIVE_REV=	25424
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-tetex
diff --git a/print/tex-tetex-doc/distinfo b/print/tex-tetex-doc/distinfo
index d425c11fb71..16b11f0d492 100644
--- a/print/tex-tetex-doc/distinfo
+++ b/print/tex-tetex-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2011/11/06 08:43:28 minskim Exp $
+$NetBSD: distinfo,v 1.10 2012/03/04 01:01:43 minskim Exp $
 
-SHA1 (tex-tetex-24482/tetex.doc.tar.xz) = 873a2b5e082debd382d9b72fee1704ef85fc6578
-RMD160 (tex-tetex-24482/tetex.doc.tar.xz) = 3d53f36ddb15a26c3224c3c40f4d9f6c0cb24dd3
-Size (tex-tetex-24482/tetex.doc.tar.xz) = 326444 bytes
+SHA1 (tex-tetex-25424/tetex.doc.tar.xz) = 61bc15a4e9a319d5bb86847deff01464e93cb5d4
+RMD160 (tex-tetex-25424/tetex.doc.tar.xz) = 401d141d4066cf9d0c50a32d355520dc5c8ff1c0
+Size (tex-tetex-25424/tetex.doc.tar.xz) = 326440 bytes
diff --git a/print/tex-tetex/DEINSTALL b/print/tex-tetex/DEINSTALL
index 86cf44aafa9..11314e1468a 100644
--- a/print/tex-tetex/DEINSTALL
+++ b/print/tex-tetex/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1 2011/11/06 08:43:28 minskim Exp $
+# $NetBSD: DEINSTALL,v 1.2 2012/03/04 01:01:43 minskim Exp $
 
 TEXMFSYSVAR="@VARBASE@/lib/texmf"
 
@@ -24,7 +24,8 @@ DEINSTALL)
 		${TEXMFSYSVAR}/web2c \
 		${TEXMFSYSVAR}/fonts/map/dvipdfm/updmap \
 		${TEXMFSYSVAR}/fonts/map/dvips/updmap \
-		${TEXMFSYSVAR}/fonts/map/pdftex/updmap
+		${TEXMFSYSVAR}/fonts/map/pdftex/updmap \
+		${TEXMFSYSVAR}/fonts/map/pxdvi/updmap
 	do
 		@RMDIR@ -p "$dir" 2>/dev/null || @TRUE@
 	done
diff --git a/print/tex-tetex/Makefile b/print/tex-tetex/Makefile
index b1f4aa0ca3a..0e825d20efe 100644
--- a/print/tex-tetex/Makefile
+++ b/print/tex-tetex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2011/11/06 08:43:28 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2012/03/04 01:01:43 minskim Exp $
 
 DISTNAME=	tetex
-PKGNAME=	tex-${DISTNAME}-3.0.24482
-TEXLIVE_REV=	24482
+PKGNAME=	tex-${DISTNAME}-3.0.25424
+TEXLIVE_REV=	25424
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Supplementary files for updmap
diff --git a/print/tex-tetex/distinfo b/print/tex-tetex/distinfo
index 99998d0d8af..e83e272f299 100644
--- a/print/tex-tetex/distinfo
+++ b/print/tex-tetex/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.10 2011/11/06 08:43:28 minskim Exp $
+$NetBSD: distinfo,v 1.11 2012/03/04 01:01:43 minskim Exp $
 
-SHA1 (tex-tetex-24482/tetex.tar.xz) = 0af33275c49cc4f1cc1dacaa369020745a6c7d54
-RMD160 (tex-tetex-24482/tetex.tar.xz) = 62abb5bbcd0286535d31e453f2c58bed9785d479
-Size (tex-tetex-24482/tetex.tar.xz) = 22376 bytes
+SHA1 (tex-tetex-25424/tetex.tar.xz) = 78eacc487d1b98be71abf9a0781ddadeed4dbc2b
+RMD160 (tex-tetex-25424/tetex.tar.xz) = 4ec522869f6373f1a15fa84581cf143d5951b8f5
+Size (tex-tetex-25424/tetex.tar.xz) = 23108 bytes
 SHA1 (patch-bin_updmap) = 993283ee01bad935a41cd22e78b5ff57d9b32e2e
 SHA1 (patch-bin_updmap-sys) = adf818f5e13cb20f104d3d590eb4a7d1b4598139
-SHA1 (patch-texmf_web2c_updmap.cfg) = 86c4bc369b85ed981a23a0c66a122216de9115b7
+SHA1 (patch-texmf_web2c_updmap.cfg) = 035ae7d36dd04baa31717e113c4778148c667aab
diff --git a/print/tex-tetex/files/map-deinstall.tmpl b/print/tex-tetex/files/map-deinstall.tmpl
index e0f0cd018ac..5e0b97f47e1 100644
--- a/print/tex-tetex/files/map-deinstall.tmpl
+++ b/print/tex-tetex/files/map-deinstall.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: map-deinstall.tmpl,v 1.1 2011/11/06 08:43:28 minskim Exp $
+# $NetBSD: map-deinstall.tmpl,v 1.2 2012/03/04 01:01:43 minskim Exp $
 #
 # Disable font maps and remove entries from updmap.cfg.
 #
@@ -19,6 +19,12 @@ DEINSTALL)
 		       ${UPDMAP_CFG}.tmp &&
 		${MV} ${UPDMAP_CFG}.tmp ${UPDMAP_CFG}
 	done
+	kanjimap_files="@KANJIMAP_FILES@"
+	for map in $kanjimap_files ; do
+		${GREP} -v "^KanjiMap ${map}" ${UPDMAP_CFG} > \
+		       ${UPDMAP_CFG}.tmp &&
+		${MV} ${UPDMAP_CFG}.tmp ${UPDMAP_CFG}
+	done
 	@UPDMAP_SYS@
         ;;
 *)
diff --git a/print/tex-tetex/files/map-install.tmpl b/print/tex-tetex/files/map-install.tmpl
index 3bd430a092a..2c42f73effb 100644
--- a/print/tex-tetex/files/map-install.tmpl
+++ b/print/tex-tetex/files/map-install.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: map-install.tmpl,v 1.1 2011/11/06 08:43:28 minskim Exp $
+# $NetBSD: map-install.tmpl,v 1.2 2012/03/04 01:01:43 minskim Exp $
 #
 # Enable font maps.
 #
@@ -15,6 +15,10 @@ POST-INSTALL)
 	for map in $mixedmap_files ; do
 	    echo "MixedMap ${map}" >> ${UPDMAP_CFG}
 	done
+	kanjimap_files="@KANJIMAP_FILES@"
+	for map in $kanjimap_files ; do
+	    echo "KanjiMap ${map}" >> ${UPDMAP_CFG}
+	done
 	@UPDMAP_SYS@
         ;;
 *)
diff --git a/print/tex-tetex/map.mk b/print/tex-tetex/map.mk
index 05e4f395b4d..00ebb16deb6 100644
--- a/print/tex-tetex/map.mk
+++ b/print/tex-tetex/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.1 2011/11/06 08:43:28 minskim Exp $
+# $NetBSD: map.mk,v 1.2 2012/03/04 01:01:43 minskim Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install font maps for TeX.  It updates font map entries in updmap.cfg
@@ -10,16 +10,19 @@
 #
 #    TEX_MIXEDMAP_FILES - A list of mixed map files.
 #
+#    TEX_KANJIMAP_FILES - A list of kanji map files.
+#
 
 .if !defined(TEX_MAP_MK)
 TEX_MAP_MK=		# defined
 
-DEPENDS+=		tex-tetex>=3.0.24482:../../print/tex-tetex
+DEPENDS+=		tex-tetex>=3.0.25424:../../print/tex-tetex
 
 EVAL_PREFIX+=		TETEX_PREFIX=tex-tetex
 FILES_SUBST+=		UPDMAP_SYS=${TETEX_PREFIX:Q}/bin/updmap-sys
 FILES_SUBST+=		MAP_FILES=${TEX_MAP_FILES:Q}
 FILES_SUBST+=		MIXEDMAP_FILES=${TEX_MIXEDMAP_FILES:Q}
+FILES_SUBST+=		KANJIMAP_FILES=${TEX_KANJIMAP_FILES:Q}
 INSTALL_TEMPLATES+=	../../print/tex-tetex/files/map-install.tmpl
 DEINSTALL_TEMPLATES+=	../../print/tex-tetex/files/map-deinstall.tmpl
 
diff --git a/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg b/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg
index 39b0ea98da5..f9a216dffb9 100644
--- a/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg
+++ b/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg
@@ -1,8 +1,8 @@
-$NetBSD: patch-texmf_web2c_updmap.cfg,v 1.1 2011/11/06 08:43:28 minskim Exp $
+$NetBSD: patch-texmf_web2c_updmap.cfg,v 1.2 2012/03/04 01:01:43 minskim Exp $
 
---- texmf/web2c/updmap.cfg.orig	2011-11-03 03:30:53.000000000 +0000
-+++ texmf/web2c/updmap.cfg
-@@ -111,214 +111,4 @@ kanjiEmbed noEmbed
+--- texmf/web2c/updmap.cfg.orig	2012-02-17 19:22:37.000000000 -0800
++++ texmf/web2c/updmap.cfg	2012-03-03 13:54:51.000000000 -0800
+@@ -111,219 +111,4 @@
  # Map files should be marked by "#! " (without the quotes), not just #.
  #
  
@@ -27,6 +27,7 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.1 2011/11/06 08:43:28 minskim Exp $
 -Map gbsnu.map
 -Map gkaiu.map
 -Map ascii.map
+-Map aspectratio.map
 -Map augie.map
 -Map auncial.map
 -Map aurical.map
@@ -80,8 +81,10 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.1 2011/11/06 08:43:28 minskim Exp $
 -Map fge.map
 -Map foekfont.map
 -Map fonetika.map
+-Map tlwg.map
 -Map fourier-utopia-expert.map
 -Map fourier.map
+-Map frcursive.map
 -Map garuda-c90.map
 -Map gfsartemisia.map
 -Map gfsbaskerville.map
@@ -123,6 +126,7 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.1 2011/11/06 08:43:28 minskim Exp $
 -Map iwona.map
 -KanjiMap otf-@kanjiEmbed@.map
 -KanjiMap otf-cktx.map
+-KanjiMap otf-up-@kanjiEmbed@.map
 -Map kerkis.map
 -Map knitfont.map
 -Map kpfonts.map
@@ -140,6 +144,7 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.1 2011/11/06 08:43:28 minskim Exp $
 -Map mdbch.map
 -Map mdput.map
 -Map mdugm.map
+-Map mdsymbol.map
 -Map troff-updmap.map
 -MixedMap mflogo.map
 -Map MnSymbol.map
@@ -163,7 +168,7 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.1 2011/11/06 08:43:28 minskim Exp $
 -Map pazo.map
 -Map utopia.map
 -KanjiMap morisawa.map
--KanjiMap ptex-@kanjiEmbed@.map
+-KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map
 -Map pxfonts.map
 -Map pxtx.map
 -Map recycle.map