From 5d7f9bacdaeb91bf5cc8b726ada8c231a65da45e Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Wed, 18 Apr 2012 19:37:35 +0000
Subject: Resolve conflicts between teTeX-texmf and tex-mdwtools{,-doc}.

---
 print/teTeX3-texmf/Makefile |  9 +++++----
 print/teTeX3-texmf/PLIST    | 26 +-------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

(limited to 'print')

diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 088dc9b4628..3d9dc82e945 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2012/04/02 18:07:35 minskim Exp $
+# $NetBSD: Makefile,v 1.55 2012/04/18 19:37:35 minskim Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	34
+PKGREVISION=	35
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/}
 
@@ -116,6 +116,7 @@ DEPENDS+=	tex-lh>=3.5g:../../fonts/tex-lh
 DEPENDS+=	tex-ly1-[0-9]*:../../fonts/tex-ly1
 DEPENDS+=	tex-magaz-[0-9]*:../../print/tex-magaz
 DEPENDS+=	tex-manfnt-[0-9]*:../../fonts/tex-manfnt
+DEPENDS+=	tex-mdwtools-[0-9]*:../../print/tex-mdwtools
 DEPENDS+=	tex-memoir-[0-9]*:../../print/tex-memoir
 DEPENDS+=	tex-metapost-[0-9]*:../../graphics/tex-metapost
 DEPENDS+=	tex-microtype-[0-9]*:../../print/tex-microtype
@@ -299,7 +300,7 @@ post-extract:
 	rm -rf ${WRKSRC}/doc/latex/k*
 	rm -rf ${WRKSRC}/doc/latex/lastpage
 	rm -rf ${WRKSRC}/doc/latex/lis*
-	rm -rf ${WRKSRC}/doc/latex/m[e-g]*
+	rm -rf ${WRKSRC}/doc/latex/m[b-g]*
 	rm -rf ${WRKSRC}/doc/latex/mi*
 	rm -rf ${WRKSRC}/doc/latex/moreverb
 	rm -rf ${WRKSRC}/doc/latex/ms
@@ -489,7 +490,7 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/latex/lis*
 	rm -rf ${WRKSRC}/tex/latex/lm
 	rm -rf ${WRKSRC}/tex/latex/marvosym
-	rm -rf ${WRKSRC}/tex/latex/m[e-g]*
+	rm -rf ${WRKSRC}/tex/latex/m[b-g]*
 	rm -rf ${WRKSRC}/tex/latex/mi*
 	rm -rf ${WRKSRC}/tex/latex/moreverb
 	rm -rf ${WRKSRC}/tex/latex/ms
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index 7724762b1a2..731b0aa2fc4 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2012/04/02 18:07:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.32 2012/04/18 19:37:35 minskim Exp $
 share/texmf-dist/aliases
 share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
 share/texmf-dist/bibtex/bst/adrconv/adrfax.bst
@@ -2703,17 +2703,6 @@ share/texmf-dist/doc/latex/ltabptch/README
 share/texmf-dist/doc/latex/mathcomp/mathcomp.dvi
 share/texmf-dist/doc/latex/mathtime/0readme
 share/texmf-dist/doc/latex/mathtime/mathtime.dvi
-share/texmf-dist/doc/latex/mdwtools/COPYING
-share/texmf-dist/doc/latex/mdwtools/README
-share/texmf-dist/doc/latex/mdwtools/at.dvi
-share/texmf-dist/doc/latex/mdwtools/cmtt.dvi
-share/texmf-dist/doc/latex/mdwtools/doafter.dvi
-share/texmf-dist/doc/latex/mdwtools/footnote.dvi
-share/texmf-dist/doc/latex/mdwtools/mdwlist.dvi
-share/texmf-dist/doc/latex/mdwtools/mdwmath.dvi
-share/texmf-dist/doc/latex/mdwtools/mdwtab.dvi
-share/texmf-dist/doc/latex/mdwtools/sverb.dvi
-share/texmf-dist/doc/latex/mdwtools/syntax.dvi
 share/texmf-dist/doc/latex/mh/README
 share/texmf-dist/doc/latex/mh/empheq.dvi
 share/texmf-dist/doc/latex/mh/empheq07.dvi
@@ -6502,19 +6491,6 @@ share/texmf-dist/tex/latex/mathtime/umh2.fd
 share/texmf-dist/tex/latex/mathtime/umh2scr.fd
 share/texmf-dist/tex/latex/mathtime/umh6.fd
 share/texmf-dist/tex/latex/mathtime/umtms.fd
-share/texmf-dist/tex/latex/mdwtools/at.sty
-share/texmf-dist/tex/latex/mdwtools/cmtt.sty
-share/texmf-dist/tex/latex/mdwtools/doafter.sty
-share/texmf-dist/tex/latex/mdwtools/doafter.tex
-share/texmf-dist/tex/latex/mdwtools/footnote.sty
-share/texmf-dist/tex/latex/mdwtools/mTTcmtt.fd
-share/texmf-dist/tex/latex/mdwtools/mTTenc.def
-share/texmf-dist/tex/latex/mdwtools/mathenv.sty
-share/texmf-dist/tex/latex/mdwtools/mdwlist.sty
-share/texmf-dist/tex/latex/mdwtools/mdwmath.sty
-share/texmf-dist/tex/latex/mdwtools/mdwtab.sty
-share/texmf-dist/tex/latex/mdwtools/sverb.sty
-share/texmf-dist/tex/latex/mdwtools/syntax.sty
 share/texmf-dist/tex/latex/mh/empheq.sty
 share/texmf-dist/tex/latex/mh/empheq07.sty
 share/texmf-dist/tex/latex/mh/mathtools.sty
-- 
cgit v1.2.3