Update tex-metapost{,-doc} to 1.212.

Changes:

* MetaPost now adheres to the openin_any / openout_any settings in
   texmf.cnf

* In some cases 'readfrom' made the file's path be prepended to the
   actually read string from the file.

* The 'prologues:=3 output' with embedded labels was unreliable,
   especially when the resulting eps was included into a TeX document
   via dvips.

* 'newinternal numeric' has been fixed, it generated an error in
   metapost 1.211.

* Label regeneration sometimes failed to run when the file time stamps
   were close together.

* Reallocation of the string pool during output file name creation
   ('outputtemplate') could cause corruption in the created file's name.

6 files changed, 135 insertions, 20 deletions

diff --git a/graphics/tex-metapost-doc/Makefile b/graphics/tex-metapost-doc/Makefile
index 35d64c8671d..ce320bfc87a 100644
--- a/graphics/tex-metapost-doc/Makefile
+++ b/graphics/tex-metapost-doc/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/16 23:58:11 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2011/12/15 22:34:40 minskim Exp $
 
 DISTNAME=	metapost.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-1.211
-TEXLIVE_REV=	17650
+PKGNAME=	tex-${DISTNAME:S/./-/}-1.212
+TEXLIVE_REV=	23089
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-metapost
 
 CONFLICTS+=	teTeX-texmf<=3.0nb25
 
+TEX_TEXMF_DIRS+=		${PREFIX}/share/texmf-dist
+TEXLIVE_IGNORE_PATTERNS=	texmf
 
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tex-metapost-doc/PLIST b/graphics/tex-metapost-doc/PLIST
index f00beddf844..4aaa64d8dc1 100644
--- a/graphics/tex-metapost-doc/PLIST
+++ b/graphics/tex-metapost-doc/PLIST
@@ -1,3 +1,73 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/06/16 23:58:11 minskim Exp $
-man/man1/dvitomp.1
-man/man1/mpost.1
+@comment $NetBSD: PLIST,v 1.2 2011/12/15 22:34:40 minskim Exp $
+share/texmf-dist/doc/metapost/base/grdemo-doc.pdf
+share/texmf-dist/doc/metapost/base/grdemo.pdf
+share/texmf-dist/doc/metapost/base/index.html
+share/texmf-dist/doc/metapost/base/mpboxes.pdf
+share/texmf-dist/doc/metapost/base/mpgraph.pdf
+share/texmf-dist/doc/metapost/base/mpintro.pdf
+share/texmf-dist/doc/metapost/base/mplibapi.pdf
+share/texmf-dist/doc/metapost/base/mpman.pdf
+share/texmf-dist/doc/metapost/base/source-manual/Makefile
+share/texmf-dist/doc/metapost/base/source-manual/README
+share/texmf-dist/doc/metapost/base/source-manual/TODO
+share/texmf-dist/doc/metapost/base/source-manual/agepop91.d
+share/texmf-dist/doc/metapost/base/source-manual/agepopm.d
+share/texmf-dist/doc/metapost/base/source-manual/charts.mp
+share/texmf-dist/doc/metapost/base/source-manual/cm2lm.map
+share/texmf-dist/doc/metapost/base/source-manual/countries.d
+share/texmf-dist/doc/metapost/base/source-manual/ctabbing.sty
+share/texmf-dist/doc/metapost/base/source-manual/demo.ms
+share/texmf-dist/doc/metapost/base/source-manual/energy.d
+share/texmf-dist/doc/metapost/base/source-manual/figs.1
+share/texmf-dist/doc/metapost/base/source-manual/figs.mp
+share/texmf-dist/doc/metapost/base/source-manual/grdemo-doc.ms
+share/texmf-dist/doc/metapost/base/source-manual/grdemo-doc.ps
+share/texmf-dist/doc/metapost/base/source-manual/grdemo.eps
+share/texmf-dist/doc/metapost/base/source-manual/grdemo.mp
+share/texmf-dist/doc/metapost/base/source-manual/grdemo.ms
+share/texmf-dist/doc/metapost/base/source-manual/lead.d
+share/texmf-dist/doc/metapost/base/source-manual/matmul.d
+share/texmf-dist/doc/metapost/base/source-manual/mpboxes.bib
+share/texmf-dist/doc/metapost/base/source-manual/mpboxes.mp
+share/texmf-dist/doc/metapost/base/source-manual/mpboxes.tex
+share/texmf-dist/doc/metapost/base/source-manual/mpgraph.bib
+share/texmf-dist/doc/metapost/base/source-manual/mpgraph.mp
+share/texmf-dist/doc/metapost/base/source-manual/mpgraph.tex
+share/texmf-dist/doc/metapost/base/source-manual/mplibapi.tex
+share/texmf-dist/doc/metapost/base/source-manual/mpman-app-legacy.tex
+share/texmf-dist/doc/metapost/base/source-manual/mpman-app-optab.tex
+share/texmf-dist/doc/metapost/base/source-manual/mpman-app-refman.tex
+share/texmf-dist/doc/metapost/base/source-manual/mpman-charts.mp
+share/texmf-dist/doc/metapost/base/source-manual/mpman.bib
+share/texmf-dist/doc/metapost/base/source-manual/mpman.ist
+share/texmf-dist/doc/metapost/base/source-manual/mpman.mp
+share/texmf-dist/doc/metapost/base/source-manual/mpman.tex
+share/texmf-dist/doc/metapost/base/source-manual/timepop.d
+share/texmf-dist/doc/metapost/base/source-tutorial/Makefile
+share/texmf-dist/doc/metapost/base/source-tutorial/abstract.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/annulus.mp
+share/texmf-dist/doc/metapost/base/source-tutorial/arrows.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/biblio.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/circles.mp
+share/texmf-dist/doc/metapost/base/source-tutorial/commands.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/compilation.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/conclusion.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/data.d
+share/texmf-dist/doc/metapost/base/source-tutorial/data.mp
+share/texmf-dist/doc/metapost/base/source-tutorial/data.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/draw.mp
+share/texmf-dist/doc/metapost/base/source-tutorial/draw.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/fill.mp
+share/texmf-dist/doc/metapost/base/source-tutorial/fill.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/graph.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/inclusion.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/intro.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/label.mp
+share/texmf-dist/doc/metapost/base/source-tutorial/label.tex
+share/texmf-dist/doc/metapost/base/source-tutorial/mpintro.bib
+share/texmf-dist/doc/metapost/base/source-tutorial/mpintro.ltx
+share/texmf-dist/doc/metapost/base/source-tutorial/paperclip.mp
+share/texmf-dist/doc/metapost/base/source-tutorial/parabola.mp
+share/texmf-dist/doc/metapost/base/source-tutorial/previewer.eps
+share/texmf-dist/doc/metapost/base/source-tutorial/previewer.pdf
+share/texmf-dist/doc/metapost/base/source-tutorial/previewer.png
diff --git a/graphics/tex-metapost-doc/distinfo b/graphics/tex-metapost-doc/distinfo
index 0ee851eeb95..fc4779b9df5 100644
--- a/graphics/tex-metapost-doc/distinfo
+++ b/graphics/tex-metapost-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/06/16 23:58:11 minskim Exp $
+$NetBSD: distinfo,v 1.2 2011/12/15 22:34:40 minskim Exp $
 
-SHA1 (tex-metapost-17650/metapost.doc.tar.xz) = 4bb181421f7ebda590c1f47bf1b8c6efd0736252
-RMD160 (tex-metapost-17650/metapost.doc.tar.xz) = c0f6cfc79814bd1cae9ae17f596a3cbe2abb5c52
-Size (tex-metapost-17650/metapost.doc.tar.xz) = 2000212 bytes
+SHA1 (tex-metapost-23089/metapost.doc.tar.xz) = 06fdbdc2d519f834d4a38dcac65ba154d3574986
+RMD160 (tex-metapost-23089/metapost.doc.tar.xz) = 7c6406b1da7bce80738e422eac3c3d9cac97abc8
+Size (tex-metapost-23089/metapost.doc.tar.xz) = 2281308 bytes
diff --git a/graphics/tex-metapost/Makefile b/graphics/tex-metapost/Makefile
index 4df4358bbd3..ae1511b89e1 100644
--- a/graphics/tex-metapost/Makefile
+++ b/graphics/tex-metapost/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2011/07/28 08:54:58 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2011/12/15 22:34:40 minskim Exp $
 
 DISTNAME=	metapost
-PKGNAME=	tex-${DISTNAME}-1.211
-PKGREVISION=	1
-TEXLIVE_REV=	17650
+PKGNAME=	tex-${DISTNAME}-1.212
+TEXLIVE_REV=	23089
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	A development of MetaFont for creating graphics
 
 CONFLICTS+=	teTeX-texmf<=3.0nb25
 DEPENDS+=	tex-kpathsea>=2009.16044:../../print/tex-kpathsea
-DEPENDS+=	web2c>=2009:../../print/web2c
+DEPENDS+=	web2c>=2011:../../print/web2c
 
+TEX_MAP_FILES=		troff-updmap.map
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf-dist
 
 .include "../../print/texlive/package.mk"
diff --git a/graphics/tex-metapost/PLIST b/graphics/tex-metapost/PLIST
index 0fdb3597719..9438e65f7d8 100644
--- a/graphics/tex-metapost/PLIST
+++ b/graphics/tex-metapost/PLIST
@@ -1,4 +1,47 @@
-@comment $NetBSD: PLIST,v 1.2 2011/07/28 08:54:58 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/12/15 22:34:40 minskim Exp $
+share/texmf-dist/fonts/afm/metapost/freeeuro.afm
+share/texmf-dist/fonts/afm/metapost/psyrgo.afm
+share/texmf-dist/fonts/afm/metapost/zpzdr-reversed.afm
+share/texmf-dist/fonts/enc/dvips/metapost/groff.enc
+share/texmf-dist/fonts/map/dvips/metapost/troff-updmap.map
+share/texmf-dist/fonts/map/dvips/metapost/troff.map
+share/texmf-dist/fonts/tfm/metapost/freeeuro.tfm
+share/texmf-dist/fonts/tfm/metapost/pagd8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pagdo8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pagk8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pagko8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pbkd8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pbkdi8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pbkl8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pbkli8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pcrb8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pcrbo8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pcrr8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pcrro8g.tfm
+share/texmf-dist/fonts/tfm/metapost/phvb8g.tfm
+share/texmf-dist/fonts/tfm/metapost/phvb8gn.tfm
+share/texmf-dist/fonts/tfm/metapost/phvbo8g.tfm
+share/texmf-dist/fonts/tfm/metapost/phvbo8gn.tfm
+share/texmf-dist/fonts/tfm/metapost/phvr8g.tfm
+share/texmf-dist/fonts/tfm/metapost/phvr8gn.tfm
+share/texmf-dist/fonts/tfm/metapost/phvro8g.tfm
+share/texmf-dist/fonts/tfm/metapost/phvro8gn.tfm
+share/texmf-dist/fonts/tfm/metapost/pncb8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pncbi8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pncr8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pncri8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pplb8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pplbi8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pplr8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pplri8g.tfm
+share/texmf-dist/fonts/tfm/metapost/psyrgo.tfm
+share/texmf-dist/fonts/tfm/metapost/ptmb8g.tfm
+share/texmf-dist/fonts/tfm/metapost/ptmbi8g.tfm
+share/texmf-dist/fonts/tfm/metapost/ptmr8g.tfm
+share/texmf-dist/fonts/tfm/metapost/ptmri8g.tfm
+share/texmf-dist/fonts/tfm/metapost/pzcmi8g.tfm
+share/texmf-dist/fonts/tfm/metapost/zpzdr-reversed.tfm
+share/texmf-dist/fonts/type1/metapost/freeeuro.pfa
 share/texmf-dist/metapost/base/TEX.mp
 share/texmf-dist/metapost/base/boxes.mp
 share/texmf-dist/metapost/base/format.mp
diff --git a/graphics/tex-metapost/distinfo b/graphics/tex-metapost/distinfo
index 25ba28fb581..3aa816a304f 100644
--- a/graphics/tex-metapost/distinfo
+++ b/graphics/tex-metapost/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/06/16 23:57:26 minskim Exp $
+$NetBSD: distinfo,v 1.2 2011/12/15 22:34:40 minskim Exp $
 
-SHA1 (tex-metapost-17650/metapost.tar.xz) = e161d2d2df6d24d38f813e9cd79c6664035891b1
-RMD160 (tex-metapost-17650/metapost.tar.xz) = d5e954c8b4bc1705e8f0c693cb785b258b1ddab6
-Size (tex-metapost-17650/metapost.tar.xz) = 32128 bytes
+SHA1 (tex-metapost-23089/metapost.tar.xz) = bdee8ad896bfcb2311d2fce551e52426d2e5e596
+RMD160 (tex-metapost-23089/metapost.tar.xz) = 906fd47d3451013e0d56d545a748841d73a5f741
+Size (tex-metapost-23089/metapost.tar.xz) = 73540 bytes