Update tex-memoir to 1.6180339e.6.0c.

Many bug fixes since 1.618.  See README in tex-memoir-doc for the
complete list.

4 files changed, 40 insertions, 42 deletions

diff --git a/print/tex-memoir/DESCR b/print/tex-memoir/DESCR
index 5b16cba50be..f2caa7cbab5 100644
--- a/print/tex-memoir/DESCR
+++ b/print/tex-memoir/DESCR
@@ -1,5 +1,9 @@
-Memoir is a flexible class for typesetting general fiction,
-non-fiction and mathematical works as books, reports, articles or
-manuscripts.  Documents can use 9pt, 10pt, 11pt, 12pt, 14pt or 17pt as
-the normal font size.  Many methods are provided to let you create
-your particular design.
+The memoir class is for typesetting poetry, fiction, non-fiction, and
+mathematical works.  The normal font sizes range from 9 to 60pt.  There is
+a range of page-styles and well over a dozen chapter-styles to choose
+from and methods for specifying your own layouts and designs.  The class
+encompasses over thirty of the more popular packages.  The class has an
+associated patch file mempatch, which is automatically loaded by the
+class itself, and which is updated from time to time, between releases
+of the class itself.  (The patch file still exists if there are no extant
+patches.)
diff --git a/print/tex-memoir/Makefile b/print/tex-memoir/Makefile
index 11871c24cf2..21869f9ac1f 100644
--- a/print/tex-memoir/Makefile
+++ b/print/tex-memoir/Makefile
@@ -1,28 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/09 21:45:51 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2009/07/10 23:38:31 minskim Exp $
+# TeX Live Revision 12115
 
 DISTNAME=	memoir
-PKGNAME=	tex-${DISTNAME}-1.618
-CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=macros/latex/contrib/}
-EXTRACT_SUFX=	.zip
+PKGNAME=	tex-${DISTNAME}-1.6180339e.6.0c
 
 MAINTAINER=	minskim@NetBSD.org
-HOMEPAGE=	http://tug.ctan.org/tex-archive/macros/latex/contrib/memoir/
-COMMENT=	Typeset fiction, non-fiction, and mathematical books
+COMMENT=	Typeset fiction, non-fiction and mathematical books
 
-USE_DIRS+=	texmf-1.0
-
-.include "../../print/teTeX/module.mk"
-
-do-build:
-	cd ${WRKSRC} && latex memoir.ins
-
-do-install:
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/doc/latex/memoir
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/memman.pdf \
-		${PKG_LOCALTEXMFPREFIX}/doc/latex/memoir
-	${INSTALL_DATA_DIR} ${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir
-	${INSTALL_DATA} ${WRKSRC}/*.cl? ${WRKSRC}/*.sty \
-		${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir
+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 "../../mk/bsd.pkg.mk"
diff --git a/print/tex-memoir/PLIST b/print/tex-memoir/PLIST
index e5260c4d1a0..83c0995370c 100644
--- a/print/tex-memoir/PLIST
+++ b/print/tex-memoir/PLIST
@@ -1,12 +1,19 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:12:02 joerg Exp $
-${PKG_LOCALTEXMFPREFIX}/doc/latex/memoir/README
-${PKG_LOCALTEXMFPREFIX}/doc/latex/memoir/memman.pdf
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/mem10.clo
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/mem11.clo
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/mem12.clo
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/mem14.clo
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/mem17.clo
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/mem9.clo
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/memhfixc.sty
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/memoir.cls
-${PKG_LOCALTEXMFPREFIX}/tex/latex/memoir/mempatch.sty
+@comment $NetBSD: PLIST,v 1.3 2009/07/10 23:38:31 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
+share/texmf-dist/tex/latex/memoir/mem14.clo
+share/texmf-dist/tex/latex/memoir/mem17.clo
+share/texmf-dist/tex/latex/memoir/mem20.clo
+share/texmf-dist/tex/latex/memoir/mem25.clo
+share/texmf-dist/tex/latex/memoir/mem30.clo
+share/texmf-dist/tex/latex/memoir/mem36.clo
+share/texmf-dist/tex/latex/memoir/mem48.clo
+share/texmf-dist/tex/latex/memoir/mem60.clo
+share/texmf-dist/tex/latex/memoir/mem9.clo
+share/texmf-dist/tex/latex/memoir/memhfixc.sty
+share/texmf-dist/tex/latex/memoir/memoir.cls
+share/texmf-dist/tex/latex/memoir/mempatch.sty
diff --git a/print/tex-memoir/distinfo b/print/tex-memoir/distinfo
index 1695a63c221..367d8a15715 100644
--- a/print/tex-memoir/distinfo
+++ b/print/tex-memoir/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/04/09 21:45:51 minskim Exp $
+$NetBSD: distinfo,v 1.2 2009/07/10 23:38:31 minskim Exp $
 
-SHA1 (memoir.zip) = d921076767d47f39ea3e35a5fc8279ff63d3f1b7
-RMD160 (memoir.zip) = 86d8d1053c5c29bf07b8f14d2c4169e36a78df29
-Size (memoir.zip) = 1752455 bytes
+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