From 4c28b9e74a77e7a5d8b0fd2271db1c6f78ef9097 Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Wed, 11 Jul 2012 12:59:59 +0000
Subject: Resolve conflicts between teTeX-texmf and tex-xtab{,-doc}.

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

(limited to 'print')

diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 53132a16add..d67d1814d48 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.57 2012/07/06 16:22:55 joerg Exp $
+# $NetBSD: Makefile,v 1.58 2012/07/11 12:59:59 minskim Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	36
+PKGREVISION=	37
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/}
 
@@ -192,6 +192,7 @@ DEPENDS+=	tex-vruler-[0-9]*:../../print/tex-vruler
 DEPENDS+=	tex-wrapfig-[0-9]*:../../print/tex-wrapfig
 DEPENDS+=	tex-xcolor-[0-9]*:../../print/tex-xcolor
 DEPENDS+=	tex-xkeyval-[0-9]*:../../print/tex-xkeyval
+DEPENDS+=	tex-xtab-[0-9]*:../../print/tex-xtab
 DEPENDS+=	tex-xypic-[0-9]*:../../graphics/tex-xypic
 
 EXTRACT_ELEMENTS+=	aliases
@@ -329,7 +330,7 @@ post-extract:
 	rm -rf ${WRKSRC}/doc/latex/ty*
 	rm -rf ${WRKSRC}/doc/latex/wasysym
 	rm -rf ${WRKSRC}/doc/latex/wrapfig
-	rm -rf ${WRKSRC}/doc/latex/xcolor
+	rm -rf ${WRKSRC}/doc/latex/x*
 	rm -rf ${WRKSRC}/doc/programs
 	rm -rf ${WRKSRC}/doc/m[a-j]*
 	rm -rf ${WRKSRC}/doc/pdftex
@@ -541,7 +542,7 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/latex/wasysym
 	rm -rf ${WRKSRC}/tex/latex/wrapfig
 	rm -rf ${WRKSRC}/tex/latex/xcolor
-	rm -rf ${WRKSRC}/tex/latex/xk*
+	rm -rf ${WRKSRC}/tex/latex/x*
 	rm -rf ${WRKSRC}/tex/plain/amsfonts
 	rm -f ${WRKSRC}/tex/plain/base/[c-gmp-z]*
 	rm -f ${WRKSRC}/tex/plain/base/letter*
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index 321418dd717..319d0189867 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.33 2012/05/08 18:43:46 minskim Exp $
+@comment $NetBSD: PLIST,v 1.34 2012/07/11 12:59:59 minskim Exp $
 share/texmf-dist/aliases
 share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
 share/texmf-dist/bibtex/bst/adrconv/adrfax.bst
@@ -2842,8 +2842,6 @@ share/texmf-dist/doc/latex/was/gensymb.dvi
 share/texmf-dist/doc/latex/was/icomma.dvi
 share/texmf-dist/doc/latex/was/readme.1st
 share/texmf-dist/doc/latex/was/upgreek.dvi
-share/texmf-dist/doc/latex/xtab/README
-share/texmf-dist/doc/latex/xtab/xtab.dvi
 share/texmf-dist/doc/latex/yfonts/frktest.tex
 share/texmf-dist/doc/latex/yfonts/liesmich
 share/texmf-dist/doc/latex/yfonts/readme
@@ -6611,7 +6609,6 @@ share/texmf-dist/tex/latex/was/fixmath.sty
 share/texmf-dist/tex/latex/was/gensymb.sty
 share/texmf-dist/tex/latex/was/icomma.sty
 share/texmf-dist/tex/latex/was/upgreek.sty
-share/texmf-dist/tex/latex/xtab/xtab.sty
 share/texmf-dist/tex/latex/yfonts/yfonts.sty
 share/texmf-dist/tex/mex/base/mex.tex
 share/texmf-dist/tex/mex/base/mex1.tex
-- 
cgit v1.2.3