Update tex-cm{,-doc} to 2012.

Changes:
- Added black.pk and gray.pk.

6 files changed, 19 insertions, 19 deletions

diff --git a/fonts/tex-cm-doc/Makefile b/fonts/tex-cm-doc/Makefile
index 20c6bb3dd89..8d011a36831 100644
--- a/fonts/tex-cm-doc/Makefile
+++ b/fonts/tex-cm-doc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/09/13 05:07:55 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2012/10/10 19:31:58 minskim Exp $
 
 DISTNAME=	cm.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-2009.15878
-TEXLIVE_REV=	15878
+PKGNAME=	tex-${DISTNAME:S/./-/}-2012
+TEXLIVE_REV=	24956
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-cm
diff --git a/fonts/tex-cm-doc/distinfo b/fonts/tex-cm-doc/distinfo
index eca7d13656d..449e844988a 100644
--- a/fonts/tex-cm-doc/distinfo
+++ b/fonts/tex-cm-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2010/09/13 05:07:55 minskim Exp $
+$NetBSD: distinfo,v 1.3 2012/10/10 19:31:58 minskim Exp $
 
-SHA1 (tex-cm-15878/cm.doc.tar.xz) = 37faf08fdb6f989da4f743627b10eb4566e56167
-RMD160 (tex-cm-15878/cm.doc.tar.xz) = c8d8e2c9bdfb7d14931edd377b773ea5e14217a3
-Size (tex-cm-15878/cm.doc.tar.xz) = 2496 bytes
+SHA1 (tex-cm-24956/cm.doc.tar.xz) = 2aaa945b41618481590666a9f00c02dca6bb2eb5
+RMD160 (tex-cm-24956/cm.doc.tar.xz) = 23ca6a6d5abcb69bc8c328b95dd40791d03bad03
+Size (tex-cm-24956/cm.doc.tar.xz) = 2496 bytes
diff --git a/fonts/tex-cm/DESCR b/fonts/tex-cm/DESCR
index 25c9a2c6e28..e4495b04cfe 100644
--- a/fonts/tex-cm/DESCR
+++ b/fonts/tex-cm/DESCR
@@ -2,9 +2,9 @@ Knuth's final iteration of his re-interpretation of a c.19
 Modern-style font from Monotype.  The family is comprehensive,
 offering both sans and roman styles, and a monospaced font, together
 with mathematics fonts closely integrated with the mathematical
-facilities of TeX itself.  The base fonts are distributed as MetaFont
+facilities of TeX itself.  The base fonts are distributed as Metafont
 source, but autotraced PostScript Type 1 versions are available (one
 version in the AMS fonts distribution, and also the BaKoMa
-distribution). The Computer Modern fonts have inspired many later
+distribution).  The Computer Modern fonts have inspired many later
 families, notably the European Computer Modern and the Latin Modern
 families.
diff --git a/fonts/tex-cm/Makefile b/fonts/tex-cm/Makefile
index 78936945919..47a00eda2af 100644
--- a/fonts/tex-cm/Makefile
+++ b/fonts/tex-cm/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2011/11/06 08:43:31 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2012/10/10 19:31:58 minskim Exp $
 
 DISTNAME=	cm
-PKGNAME=	tex-${DISTNAME}-2009.15878
-PKGREVISION=	1
+PKGNAME=	tex-${DISTNAME}-2012
 CATEGORIES=	fonts
-TEXLIVE_REV=	15878
+TEXLIVE_REV=	24956
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Computer Modern fonts
diff --git a/fonts/tex-cm/PLIST b/fonts/tex-cm/PLIST
index f405aa4ba5c..a2cbbb71e97 100644
--- a/fonts/tex-cm/PLIST
+++ b/fonts/tex-cm/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2010/01/29 01:52:59 minskim Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/10/10 19:31:58 minskim Exp $
 share/texmf-dist/fonts/map/dvips/cm/cmtext-bsr-interpolated.map
+share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/black.pk
 share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/cmbx10.pk
 share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/cmex10.pk
 share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/cmmi10.pk
@@ -14,7 +15,7 @@ share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/cmsl10.pk
 share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/cmsy10.pk
 share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/cmsy7.pk
 share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/cmti10.pk
-share/texmf-dist/fonts/pk/ljfour/public/cm/dpi720/cmbx12.pk
+share/texmf-dist/fonts/pk/ljfour/public/cm/dpi600/gray.pk
 share/texmf-dist/fonts/source/public/cm/accent.mf
 share/texmf-dist/fonts/source/public/cm/bigacc.mf
 share/texmf-dist/fonts/source/public/cm/bigdel.mf
diff --git a/fonts/tex-cm/distinfo b/fonts/tex-cm/distinfo
index 30ef0f17867..89fbaed76c8 100644
--- a/fonts/tex-cm/distinfo
+++ b/fonts/tex-cm/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/09/13 05:07:54 minskim Exp $
+$NetBSD: distinfo,v 1.4 2012/10/10 19:31:58 minskim Exp $
 
-SHA1 (tex-cm-15878/cm.tar.xz) = d9f0e97f34e938454a36007d10f601d7624a8e1a
-RMD160 (tex-cm-15878/cm.tar.xz) = a05831b5c3ffea6689cf2533bf13236681153550
-Size (tex-cm-15878/cm.tar.xz) = 254316 bytes
+SHA1 (tex-cm-24956/cm.tar.xz) = 6c43240fb6bac195b00566ca128a4b7516e25bec
+RMD160 (tex-cm-24956/cm.tar.xz) = fe48fc586e637af3088d4e53b49d951bb9695b0e
+Size (tex-cm-24956/cm.tar.xz) = 240740 bytes