Update tex-memoir{,-doc} to 1.618033988c.6.0f.

- Added makeindex files: memman.gst and memman.ist.

6 files changed, 22 insertions, 20 deletions

diff --git a/print/tex-memoir-doc/Makefile b/print/tex-memoir-doc/Makefile
index 4354bfa5616..9d0a437f3e6 100644
--- a/print/tex-memoir-doc/Makefile
+++ b/print/tex-memoir-doc/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/07/10 23:23:50 minskim Exp $
-# TeX Live Revision 12115
+# $NetBSD: Makefile,v 1.2 2010/05/26 05:11:25 minskim Exp $
 
 DISTNAME=	memoir.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-1.6180339e.6.0c
+PKGNAME=	tex-${DISTNAME:S/./-/}-1.618033988c.6.0f
+TEXLIVE_REV=	17927
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-memoir
 
 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-memoir-doc/PLIST b/print/tex-memoir-doc/PLIST
index 383848892c0..6e35845998e 100644
--- a/print/tex-memoir-doc/PLIST
+++ b/print/tex-memoir-doc/PLIST
@@ -1,10 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/07/10 23:23:50 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/05/26 05:11:25 minskim Exp $
+share/texmf-dist/doc/latex/memoir/Makeidxglo
 share/texmf-dist/doc/latex/memoir/README
 share/texmf-dist/doc/latex/memoir/anvil2.mps
 share/texmf-dist/doc/latex/memoir/memfonts.sty
 share/texmf-dist/doc/latex/memoir/memlays.sty
+share/texmf-dist/doc/latex/memoir/memman.gst
+share/texmf-dist/doc/latex/memoir/memman.ist
 share/texmf-dist/doc/latex/memoir/memman.pdf
 share/texmf-dist/doc/latex/memoir/memman.tex
 share/texmf-dist/doc/latex/memoir/memnoidxnum.tex
 share/texmf-dist/doc/latex/memoir/memsty.sty
 share/texmf-dist/doc/latex/memoir/titlepages.sty
+share/texmf-dist/doc/latex/memoir/trims-example.tex
diff --git a/print/tex-memoir-doc/distinfo b/print/tex-memoir-doc/distinfo
index 15a70de8195..19451956d89 100644
--- a/print/tex-memoir-doc/distinfo
+++ b/print/tex-memoir-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/07/10 23:23:50 minskim Exp $
+$NetBSD: distinfo,v 1.2 2010/05/26 05:11:25 minskim Exp $
 
-SHA1 (tex-memoir-doc-1.6180339e.6.0c/memoir.doc.tar.lzma) = 2ea2d5a3f8847a1253c1137cd373a2d9c700bad3
-RMD160 (tex-memoir-doc-1.6180339e.6.0c/memoir.doc.tar.lzma) = 68ef27abe937b38222aa4347e2e901f1540dc6a4
-Size (tex-memoir-doc-1.6180339e.6.0c/memoir.doc.tar.lzma) = 2424920 bytes
+SHA1 (tex-memoir-17927/memoir.doc.tar.xz) = 65980a590f83412e0a6e04532ba2354ac78dbb09
+RMD160 (tex-memoir-17927/memoir.doc.tar.xz) = dc8a0da497cacb61d25b3732f1968576c52639af
+Size (tex-memoir-17927/memoir.doc.tar.xz) = 2778120 bytes
diff --git a/print/tex-memoir/Makefile b/print/tex-memoir/Makefile
index 21869f9ac1f..0dade682d3f 100644
--- a/print/tex-memoir/Makefile
+++ b/print/tex-memoir/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/07/10 23:38:31 minskim Exp $
-# TeX Live Revision 12115
+# $NetBSD: Makefile,v 1.3 2010/05/26 05:11:25 minskim Exp $
 
 DISTNAME=	memoir
-PKGNAME=	tex-${DISTNAME}-1.6180339e.6.0c
+PKGNAME=	tex-${DISTNAME}-1.618033988c.6.0f
+TEXLIVE_REV=	17927
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Typeset fiction, non-fiction and mathematical books
@@ -11,5 +11,5 @@ CONFLICTS+=	teTeX-texmf<=3.0nb17
 DEPENDS+=	tex-ifxetex-[0-9]*:../../print/tex-ifxetex
 DEPENDS+=	tex-oberdiek-[0-9]*:../../print/tex-oberdiek
 
-.include "../../print/texlive/module.mk"
+.include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-memoir/PLIST b/print/tex-memoir/PLIST
index 83c0995370c..cbe8d4b7ee7 100644
--- a/print/tex-memoir/PLIST
+++ b/print/tex-memoir/PLIST
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2009/07/10 23:38:31 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/05/26 05:11:25 minskim Exp $
 share/texmf-dist/makeindex/memoir/basic.gst
-share/texmf-dist/makeindex/memoir/memman.gst
-share/texmf-dist/makeindex/memoir/memman.ist
 share/texmf-dist/tex/latex/memoir/mem10.clo
 share/texmf-dist/tex/latex/memoir/mem11.clo
 share/texmf-dist/tex/latex/memoir/mem12.clo
diff --git a/print/tex-memoir/distinfo b/print/tex-memoir/distinfo
index 367d8a15715..44b9af60b39 100644
--- a/print/tex-memoir/distinfo
+++ b/print/tex-memoir/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2009/07/10 23:38:31 minskim Exp $
+$NetBSD: distinfo,v 1.3 2010/05/26 05:11:25 minskim Exp $
 
-SHA1 (tex-memoir-1.6180339e.6.0c/memoir.tar.lzma) = 0940980f9fcfbf33da3b616dce2a7f3168d89489
-RMD160 (tex-memoir-1.6180339e.6.0c/memoir.tar.lzma) = 1edd6c914e452f87b29ee673d1b554827bb72c27
-Size (tex-memoir-1.6180339e.6.0c/memoir.tar.lzma) = 66188 bytes
+SHA1 (tex-memoir-17927/memoir.tar.xz) = b3f8579de1c02e6db693fd26b5c81b16ba01b5e7
+RMD160 (tex-memoir-17927/memoir.tar.xz) = 6146ccfc79db609b906741671a15235c2941d9e6
+Size (tex-memoir-17927/memoir.tar.xz) = 68872 bytes