Update tex-ms{,-doc} to the version in TeX Live 2009.

Changes:
- norsk option added to prelim2e.
- License change in count1to.
- other fixes and improvements.

5 files changed, 17 insertions, 23 deletions

diff --git a/print/tex-ms-doc/Makefile b/print/tex-ms-doc/Makefile
index 485fe6d1cca..bddcc1757e2 100644
--- a/print/tex-ms-doc/Makefile
+++ b/print/tex-ms-doc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/07/10 00:15:28 minskim Exp $
-# TeX Live Revision 7340
+# $NetBSD: Makefile,v 1.2 2010/05/12 01:23:48 minskim Exp $
 
 DISTNAME=	ms.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-2009.7340
+PKGNAME=	tex-${DISTNAME:S/./-/}-2009.16596
+TEXLIVE_REV=	16596
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-ms
 
 CONFLICTS+=	teTeX-texmf<=3.0nb17
 
-.include "../../print/texlive/module.mk"
+.include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-ms-doc/PLIST b/print/tex-ms-doc/PLIST
index 502359a770b..92d6dffbf50 100644
--- a/print/tex-ms-doc/PLIST
+++ b/print/tex-ms-doc/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/07/10 00:15:28 minskim Exp $
-share/texmf-dist/doc/latex/ms/count1to.asc
-share/texmf-dist/doc/latex/ms/count1to.bug
+@comment $NetBSD: PLIST,v 1.2 2010/05/12 01:23:48 minskim Exp $
 share/texmf-dist/doc/latex/ms/count1to.pdf
-share/texmf-dist/doc/latex/ms/everysel.asc
-share/texmf-dist/doc/latex/ms/everysel.bug
 share/texmf-dist/doc/latex/ms/everysel.pdf
 share/texmf-dist/doc/latex/ms/everyshi.asc
 share/texmf-dist/doc/latex/ms/everyshi.bug
@@ -11,7 +7,5 @@ share/texmf-dist/doc/latex/ms/everyshi.pdf
 share/texmf-dist/doc/latex/ms/multitoc.asc
 share/texmf-dist/doc/latex/ms/multitoc.bug
 share/texmf-dist/doc/latex/ms/multitoc.pdf
-share/texmf-dist/doc/latex/ms/prelim2e.asc
-share/texmf-dist/doc/latex/ms/prelim2e.bug
 share/texmf-dist/doc/latex/ms/prelim2e.pdf
 share/texmf-dist/doc/latex/ms/ragged2e.pdf
diff --git a/print/tex-ms-doc/distinfo b/print/tex-ms-doc/distinfo
index 88b1bcbe648..2d9c8c64d78 100644
--- a/print/tex-ms-doc/distinfo
+++ b/print/tex-ms-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/10 00:15:28 minskim Exp $
+$NetBSD: distinfo,v 1.2 2010/05/12 01:23:48 minskim Exp $
 
-SHA1 (tex-ms-doc-2009.7340/ms.doc.tar.lzma) = 8be8b911fa25792888bdc761c529856283f8851d
-RMD160 (tex-ms-doc-2009.7340/ms.doc.tar.lzma) = 07f3cbacb3b7c66020ce46342bb804bfa888d3df
-Size (tex-ms-doc-2009.7340/ms.doc.tar.lzma) = 722874 bytes
+SHA1 (tex-ms-16596/ms.doc.tar.xz) = 18d75b45b6b40437b8b53e82ffc451e7ba7116a8
+RMD160 (tex-ms-16596/ms.doc.tar.xz) = 192fc665608d703c85b1040ccd229ec22fd0debc
+Size (tex-ms-16596/ms.doc.tar.xz) = 1970000 bytes
diff --git a/print/tex-ms/Makefile b/print/tex-ms/Makefile
index e2dc0ff4795..b84ebe0ab5a 100644
--- a/print/tex-ms/Makefile
+++ b/print/tex-ms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/07/10 00:15:02 minskim Exp $
-# TeX Live Revision 7340
+# $NetBSD: Makefile,v 1.2 2010/05/12 01:23:47 minskim Exp $
 
 DISTNAME=	ms
-PKGNAME=	tex-${DISTNAME}-2008.7340
+PKGNAME=	tex-${DISTNAME}-2009
+TEXLIVE_REV=	16596
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Various LaTeX packages by Martin Schroeder
@@ -13,5 +13,5 @@ DEPENDS+=	tex-koma-script-[0-9]*:../../print/tex-koma-script
 DEPENDS+=	tex-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=	tex-tools-[0-9]*:../../print/tex-tools
 
-.include "../../print/texlive/module.mk"
+.include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-ms/distinfo b/print/tex-ms/distinfo
index fba9eb83ab5..35d1bf21253 100644
--- a/print/tex-ms/distinfo
+++ b/print/tex-ms/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/10 00:15:02 minskim Exp $
+$NetBSD: distinfo,v 1.2 2010/05/12 01:23:47 minskim Exp $
 
-SHA1 (tex-ms-2008.7340/ms.tar.lzma) = e54492e134428323378e4c84c79aee8774335dca
-RMD160 (tex-ms-2008.7340/ms.tar.lzma) = f1acfc211dfcd6416dfc68243e208611dcff38e1
-Size (tex-ms-2008.7340/ms.tar.lzma) = 5590 bytes
+SHA1 (tex-ms-16596/ms.tar.xz) = 65b6d0be941ec0be874a5b4b692795068a0b0c84
+RMD160 (tex-ms-16596/ms.tar.xz) = ff3b0827651782ffa31b49b2e790752ab3205e83
+Size (tex-ms-16596/ms.tar.xz) = 5816 bytes