Resolve conflicts between teTeX-texmf and recent changes in TeX Live

packages.

2 files changed, 10 insertions, 15 deletions

diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 985fe71ab25..a5014718c94 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2011/10/27 19:30:07 minskim Exp $
+# $NetBSD: Makefile,v 1.53 2011/11/06 08:46:11 minskim Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	32
+PKGREVISION=	33
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/}
 
@@ -27,6 +27,7 @@ DEPENDS+=	tex-bibtex-[0-9]*:../../print/tex-bibtex
 DEPENDS+=	tex-bibtopic-[0-9]*:../../print/tex-bibtopic
 DEPENDS+=	tex-block-[0-9]*:../../print/tex-block
 DEPENDS+=	tex-bold-extra-[0-9]*:../../print/tex-bold-extra
+DEPENDS+=	tex-booktabs-[0-9]*:../../print/tex-booktabs
 DEPENDS+=	tex-boxedminipage-[0-9]*:../../print/tex-boxedminipage
 DEPENDS+=	tex-braket-[0-9]*:../../print/tex-braket
 DEPENDS+=	tex-breakcites-[0-9]*:../../print/tex-breakcites
@@ -169,6 +170,7 @@ DEPENDS+=	tex-soul-[0-9]*:../../print/tex-soul
 DEPENDS+=	tex-stmaryrd-[0-9]*:../../fonts/tex-stmaryrd
 DEPENDS+=	tex-subfigure-[0-9]*:../../print/tex-subfigure
 DEPENDS+=	tex-subfig-[0-9]*:../../print/tex-subfig
+DEPENDS+=	tex-supertabular-[0-9]*:../../print/tex-supertabular
 DEPENDS+=	tex-tabls-[0-9]*:../../print/tex-tabls
 DEPENDS+=	tex-t2-[0-9]*:../../print/tex-t2
 DEPENDS+=	tex-threeparttable-[0-9]*:../../print/tex-threeparttable
@@ -242,7 +244,7 @@ TEX_MIXEDMAP_FILES+=	ccpl.map
 TEX_MIXEDMAP_FILES+=	vnr.map
 
 .include "../../print/kpathsea/texmf.mk"
-.include "../../print/texlive-tetex/map.mk"
+.include "../../print/tex-tetex/map.mk"
 
 post-extract:
 	rm -f ${WRKSRC}/ls-R
@@ -277,6 +279,7 @@ post-extract:
 	rm -rf ${WRKSRC}/doc/latex/base
 	rm -rf ${WRKSRC}/doc/latex/be*
 	rm -rf ${WRKSRC}/doc/latex/bibtopic
+	rm -rf ${WRKSRC}/doc/latex/booktabs
 	rm -rf ${WRKSRC}/doc/latex/ca*
 	rm -rf ${WRKSRC}/doc/latex/changebar
 	rm -rf ${WRKSRC}/doc/latex/c[v-z]*
@@ -310,7 +313,7 @@ post-extract:
 	rm -rf ${WRKSRC}/doc/latex/se*
 	rm -rf ${WRKSRC}/doc/latex/soul
 	rm -rf ${WRKSRC}/doc/latex/stmaryrd
-	rm -rf ${WRKSRC}/doc/latex/sub*
+	rm -rf ${WRKSRC}/doc/latex/su*
 	rm -rf ${WRKSRC}/doc/latex/ti*
 	rm -rf ${WRKSRC}/doc/latex/toc*
 	rm -rf ${WRKSRC}/doc/latex/tools
@@ -449,7 +452,7 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/latex/base
 	rm -rf ${WRKSRC}/tex/latex/be*
 	rm -rf ${WRKSRC}/tex/latex/bibtopic
-	rm -rf ${WRKSRC}/tex/latex/bo[a-np-z]*
+	rm -rf ${WRKSRC}/tex/latex/bo*
 	rm -rf ${WRKSRC}/tex/latex/ca[m-z]*
 	rm -rf ${WRKSRC}/tex/latex/carlisle
 	rm -rf ${WRKSRC}/tex/latex/changebar
@@ -509,7 +512,7 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/latex/showtags
 	rm -rf ${WRKSRC}/tex/latex/soul
 	rm -rf ${WRKSRC}/tex/latex/stmaryrd
-	rm -rf ${WRKSRC}/tex/latex/sub*
+	rm -rf ${WRKSRC}/tex/latex/su*
 	rm -rf ${WRKSRC}/tex/latex/t2
 	rm -rf ${WRKSRC}/tex/latex/tabls
 	rm -rf ${WRKSRC}/tex/latex/threeparttable
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index 0c8ee323072..81e1c3dc395 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2011/10/27 19:30:07 minskim Exp $
+@comment $NetBSD: PLIST,v 1.30 2011/11/06 08:46:11 minskim Exp $
 share/texmf-dist/aliases
 share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
 share/texmf-dist/bibtex/bst/adrconv/adrfax.bst
@@ -2603,8 +2603,6 @@ share/texmf-dist/doc/latex/bbold/bbold.dvi
 share/texmf-dist/doc/latex/bibunits/00Readme
 share/texmf-dist/doc/latex/bibunits/bibtexall
 share/texmf-dist/doc/latex/bibunits/bibunits.dvi
-share/texmf-dist/doc/latex/booktabs/COPYING
-share/texmf-dist/doc/latex/booktabs/booktabs.dvi
 share/texmf-dist/doc/latex/ccaption/README
 share/texmf-dist/doc/latex/ccaption/ccaption.dvi
 share/texmf-dist/doc/latex/ccfonts/ccfonts.dvi
@@ -2819,10 +2817,6 @@ share/texmf-dist/doc/latex/sidecap/sidecap.dvi
 share/texmf-dist/doc/latex/slashbox/slashbox.dvi
 share/texmf-dist/doc/latex/slashbox/slashbox.tex
 share/texmf-dist/doc/latex/stdclsdv/stdclsdv.dvi
-share/texmf-dist/doc/latex/supertab/CATALOG
-share/texmf-dist/doc/latex/supertab/MANIFEST
-share/texmf-dist/doc/latex/supertab/README
-share/texmf-dist/doc/latex/supertab/supertabular.dvi
 share/texmf-dist/doc/latex/tex-refs/about.html
 share/texmf-dist/doc/latex/tex-refs/appendices.html
 share/texmf-dist/doc/latex/tex-refs/bibtex-bib-files.html
@@ -6334,7 +6328,6 @@ share/texmf-dist/tex/latex/bbm/ubbmtt.fd
 share/texmf-dist/tex/latex/bbold/Ubbold.fd
 share/texmf-dist/tex/latex/bbold/bbold.sty
 share/texmf-dist/tex/latex/bibunits/bibunits.sty
-share/texmf-dist/tex/latex/booktabs/booktabs.sty
 share/texmf-dist/tex/latex/calrsfs/calrsfs.sty
 share/texmf-dist/tex/latex/ccaption/ccaption.sty
 share/texmf-dist/tex/latex/ccfonts/ccfonts.sty
@@ -6657,7 +6650,6 @@ share/texmf-dist/tex/latex/showlabels/showlabels.sty
 share/texmf-dist/tex/latex/sidecap/sidecap.sty
 share/texmf-dist/tex/latex/slashbox/slashbox.sty
 share/texmf-dist/tex/latex/stdclsdv/stdclsdv.sty
-share/texmf-dist/tex/latex/supertabular/supertabular.sty
 share/texmf-dist/tex/latex/texmacs/TeXmacs.sty
 share/texmf-dist/tex/latex/textfit/textfit.sty
 share/texmf-dist/tex/latex/textmerg/textmerg.sty