Resolve conflicts between teTeX-texmf and recently imported TeX Live

packages.

2 files changed, 18 insertions, 111 deletions

diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 3e43050d70b..f68a6172e75 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2011/01/20 12:30:25 markd Exp $
+# $NetBSD: Makefile,v 1.49 2011/01/22 23:54:25 minskim Exp $
 #
 
 DISTNAME=	tetex-texmf-3.0
 PKGNAME=	${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=	28
+PKGREVISION=	29
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/}
 
@@ -33,6 +33,7 @@ DEPENDS+=	tex-capt-of-[0-9]*:../../print/tex-capt-of
 DEPENDS+=	tex-captdef-[0-9]*:../../print/tex-captdef
 DEPENDS+=	tex-caption-[0-9]*:../../print/tex-caption
 DEPENDS+=	tex-cases-[0-9]*:../../print/tex-cases
+DEPENDS+=	tex-changebar-[0-9]*:../../print/tex-changebar
 DEPENDS+=	tex-chbibref-[0-9]*:../../print/tex-chbibref
 DEPENDS+=	tex-chngcntr-[0-9]*:../../print/tex-chngcntr
 DEPENDS+=	tex-changepage-[0-9]*:../../print/tex-changepage
@@ -50,6 +51,7 @@ DEPENDS+=	tex-eepic>=1.1e:../../graphics/tex-eepic
 DEPENDS+=	tex-endfloat-[0-9]*:../../print/tex-endfloat
 DEPENDS+=	tex-endnotes-[0-9]*:../../print/tex-endnotes
 DEPENDS+=	tex-enumitem-[0-9]*:../../print/tex-enumitem
+DEPENDS+=	tex-epsf>=2.7.3:../../print/tex-epsf
 DEPENDS+=	tex-eurosym-[0-9]*:../../fonts/tex-eurosym
 DEPENDS+=	tex-exam-[0-9]*:../../print/tex-exam
 DEPENDS+=	tex-excludeonly-[0-9]*:../../print/tex-excludeonly
@@ -62,6 +64,7 @@ DEPENDS+=	tex-footmisc-[0-9]*:../../print/tex-footmisc
 DEPENDS+=	tex-framed-[0-9]*:../../print/tex-framed
 DEPENDS+=	tex-ftcap-[0-9]*:../../print/tex-ftcap
 DEPENDS+=	tex-fwlw-[0-9]*:../../print/tex-fwlw
+DEPENDS+=	tex-gustlib-[0-9]*:../../print/tex-gustlib
 DEPENDS+=	tex-helvetic-[0-9]*:../../fonts/tex-helvetic
 DEPENDS+=	tex-hypernat-[0-9]*:../../print/tex-hypernat
 DEPENDS+=	tex-hyphen-basque-[0-9]*:../../print/tex-hyphen-basque
@@ -212,12 +215,12 @@ TEX_MIXEDMAP_FILES+=	vnr.map
 
 post-extract:
 	rm -f ${WRKSRC}/ls-R
-	rm -rf ${WRKSRC}/bibtex/bib/[a-o]*
-	rm -rf ${WRKSRC}/bibtex/bib/README
+	rm -rf ${WRKSRC}/bibtex/bib
 	rm -rf ${WRKSRC}/bibtex/bst/ams
 	rm -rf ${WRKSRC}/bibtex/bst/[b-c]*
 	rm -rf ${WRKSRC}/bibtex/bst/misc
 	rm -rf ${WRKSRC}/bibtex/bst/natbib
+	rm -rf ${WRKSRC}/bibtex/bst/plbib
 	rm -rf ${WRKSRC}/doc/bibtex/base
 	rmdir ${WRKSRC}/doc/generic/pdfcrop
 	rm -rf ${WRKSRC}/doc/etex
@@ -234,10 +237,12 @@ post-extract:
 	rm -rf ${WRKSRC}/doc/generic/xk*
 	rm -rf ${WRKSRC}/doc/latex/a[f-m]*
 	rm -rf ${WRKSRC}/doc/latex/base
-	rm -rf ${WRKSRC}/doc/latex/beamer
+	rm -rf ${WRKSRC}/doc/latex/be[a-y]*
 	rm -rf ${WRKSRC}/doc/latex/ca*
+	rm -rf ${WRKSRC}/doc/latex/changebar
 	rm -rf ${WRKSRC}/doc/latex/c[v-z]*
 	rm -rf ${WRKSRC}/doc/latex/e[d-n]*
+	rm -rf ${WRKSRC}/doc/latex/euler
 	rm -rf ${WRKSRC}/doc/latex/exam
 	rm -rf ${WRKSRC}/doc/latex/fa*
 	rm -rf ${WRKSRC}/doc/latex/float
@@ -247,7 +252,7 @@ post-extract:
 	rm -rf ${WRKSRC}/doc/latex/k*
 	rm -rf ${WRKSRC}/doc/latex/lis*
 	rm -rf ${WRKSRC}/doc/latex/m[e-g]*
-	rm -rf ${WRKSRC}/doc/latex/microtype
+	rm -rf ${WRKSRC}/doc/latex/mi*
 	rm -rf ${WRKSRC}/doc/latex/moreverb
 	rm -rf ${WRKSRC}/doc/latex/ms
 	rm -rf ${WRKSRC}/doc/latex/n[a-s]*
@@ -373,6 +378,7 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/generic/[a-b]*
 	rm -rf ${WRKSRC}/tex/generic/con*
 	rm -rf ${WRKSRC}/tex/generic/enctex
+	rm -rf ${WRKSRC}/tex/generic/epsf
 	rm -rf ${WRKSRC}/tex/generic/german
 	rm -rf ${WRKSRC}/tex/generic/hyphen
 	rm -rf ${WRKSRC}/tex/generic/null
@@ -387,9 +393,11 @@ post-extract:
 	rm -rf ${WRKSRC}/tex/latex/a[f-m]*
 	rm -rf ${WRKSRC}/tex/latex/base
 	rm -rf ${WRKSRC}/tex/latex/beamer
+	rm -rf ${WRKSRC}/tex/latex/beton
 	rm -rf ${WRKSRC}/tex/latex/bo[a-np-z]*
 	rm -rf ${WRKSRC}/tex/latex/ca[m-z]*
 	rm -rf ${WRKSRC}/tex/latex/carlisle
+	rm -rf ${WRKSRC}/tex/latex/changebar
 	rm -rf ${WRKSRC}/tex/latex/chngpage
 	rm -rf ${WRKSRC}/tex/latex/cite
 	rm -rf ${WRKSRC}/tex/latex/concrete
@@ -398,6 +406,7 @@ post-extract:
 	rm -f ${WRKSRC}/tex/latex/dvipdfm/dvipdfm.def
 	rm -rf ${WRKSRC}/tex/latex/e[d-n]*
 	rm -rf ${WRKSRC}/tex/latex/etex
+	rm -rf ${WRKSRC}/tex/latex/euler
 	rm -rf ${WRKSRC}/tex/latex/eurosym
 	rm -rf ${WRKSRC}/tex/latex/exam
 	rm -rf ${WRKSRC}/tex/latex/fa*
@@ -409,13 +418,14 @@ post-extract:
 	rm -f ${WRKSRC}/tex/latex/graphics/[a-l]*
 	rm -f ${WRKSRC}/tex/latex/graphics/p[a-r]*
 	rm -f ${WRKSRC}/tex/latex/graphics/t[cr]*
+	rm -rf ${WRKSRC}/tex/latex/here
 	rm -rf ${WRKSRC}/tex/latex/hyperref
 	rm -rf ${WRKSRC}/tex/latex/k*
 	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/microtype
+	rm -rf ${WRKSRC}/tex/latex/mi*
 	rm -rf ${WRKSRC}/tex/latex/moreverb
 	rm -rf ${WRKSRC}/tex/latex/ms
 	rm -rf ${WRKSRC}/tex/latex/multirow
diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST
index 83be8a16842..27dcc5e759e 100644
--- a/print/teTeX3-texmf/PLIST
+++ b/print/teTeX3-texmf/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.25 2010/09/10 22:27:11 minskim Exp $
+@comment $NetBSD: PLIST,v 1.26 2011/01/22 23:54:25 minskim Exp $
 share/texmf-dist/aliases
-share/texmf-dist/bibtex/bib/plbib/plbib.bib
 share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
 share/texmf-dist/bibtex/bst/adrconv/adrfax.bst
 share/texmf-dist/bibtex/bst/adrconv/birthday.bst
@@ -22,10 +21,6 @@ share/texmf-dist/bibtex/bst/norbib/norabbrv.bst
 share/texmf-dist/bibtex/bst/norbib/noralpha.bst
 share/texmf-dist/bibtex/bst/norbib/norplain.bst
 share/texmf-dist/bibtex/bst/norbib/norunsrt.bst
-share/texmf-dist/bibtex/bst/plbib/plabbrv.bst
-share/texmf-dist/bibtex/bst/plbib/plalpha.bst
-share/texmf-dist/bibtex/bst/plbib/plplain.bst
-share/texmf-dist/bibtex/bst/plbib/plunsrt.bst
 share/texmf-dist/bibtex/bst/revtex4/apsrev.bst
 share/texmf-dist/bibtex/bst/revtex4/apsrmp.bst
 share/texmf-dist/doc/Makefile
@@ -2806,7 +2801,6 @@ share/texmf-dist/doc/latex/appendix/appendix.dvi
 share/texmf-dist/doc/latex/bar/README.package
 share/texmf-dist/doc/latex/bbm/bbm.dvi
 share/texmf-dist/doc/latex/bbold/bbold.dvi
-share/texmf-dist/doc/latex/beton/beton.dvi
 share/texmf-dist/doc/latex/bezos/accents.dvi
 share/texmf-dist/doc/latex/bezos/esindex.dvi
 share/texmf-dist/doc/latex/bezos/readme
@@ -2827,11 +2821,6 @@ share/texmf-dist/doc/latex/ccaption/README
 share/texmf-dist/doc/latex/ccaption/ccaption.dvi
 share/texmf-dist/doc/latex/ccfonts/ccfonts.dvi
 share/texmf-dist/doc/latex/ccfonts/readme
-share/texmf-dist/doc/latex/changebar/catalog.txt
-share/texmf-dist/doc/latex/changebar/changebar.bug
-share/texmf-dist/doc/latex/changebar/changebar.dvi
-share/texmf-dist/doc/latex/changebar/chbar.1
-share/texmf-dist/doc/latex/changebar/chbar.sh
 share/texmf-dist/doc/latex/chappg/chappg.txt
 share/texmf-dist/doc/latex/comment/README
 share/texmf-dist/doc/latex/comment/comm_latest.tex
@@ -2894,7 +2883,6 @@ share/texmf-dist/doc/latex/eso-pic/eso-ex3.tex
 share/texmf-dist/doc/latex/eso-pic/eso-ex4.tex
 share/texmf-dist/doc/latex/eso-pic/eso-ex5.tex
 share/texmf-dist/doc/latex/eso-pic/eso-pic.dvi
-share/texmf-dist/doc/latex/euler/euler.dvi
 share/texmf-dist/doc/latex/eulervm/README.eulervm
 share/texmf-dist/doc/latex/eulervm/eulervm.pdf
 share/texmf-dist/doc/latex/eulervm/manifest.txt
@@ -2973,13 +2961,6 @@ share/texmf-dist/doc/latex/mh/empheq.dvi
 share/texmf-dist/doc/latex/mh/empheq07.dvi
 share/texmf-dist/doc/latex/mh/mathtools.dvi
 share/texmf-dist/doc/latex/mh/mhsetup.dvi
-share/texmf-dist/doc/latex/minitoc/README
-share/texmf-dist/doc/latex/minitoc/add.tex
-share/texmf-dist/doc/latex/minitoc/catalog
-share/texmf-dist/doc/latex/minitoc/mini-art.tex
-share/texmf-dist/doc/latex/minitoc/minitoc-ex.tex
-share/texmf-dist/doc/latex/minitoc/minitoc.bug
-share/texmf-dist/doc/latex/minitoc/minitoc.dvi
 share/texmf-dist/doc/latex/mltex/README
 share/texmf-dist/doc/latex/mltex/mltex.txt
 share/texmf-dist/doc/latex/mparhack/mparhack.dvi
@@ -7334,7 +7315,6 @@ share/texmf-dist/tex/generic/encodings/eusb.onm
 share/texmf-dist/tex/generic/encodings/eusm.onm
 share/texmf-dist/tex/generic/encodings/msam.onm
 share/texmf-dist/tex/generic/encodings/msbm.onm
-share/texmf-dist/tex/generic/epsf/epsf.tex
 share/texmf-dist/tex/generic/localloc/localloc.sty
 share/texmf-dist/tex/generic/mfpic/dvipsnam.mp
 share/texmf-dist/tex/generic/mfpic/grafbase.mp
@@ -7535,7 +7515,6 @@ share/texmf-dist/tex/latex/bbm/ubbmss.fd
 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/beton/beton.sty
 share/texmf-dist/tex/latex/bezos/accents.sty
 share/texmf-dist/tex/latex/bezos/checkend.sty
 share/texmf-dist/tex/latex/bezos/dotlessi.sty
@@ -7552,7 +7531,6 @@ share/texmf-dist/tex/latex/ccfonts/omsxcsy.fd
 share/texmf-dist/tex/latex/ccfonts/omxxcex.fd
 share/texmf-dist/tex/latex/ccfonts/t1ccr.fd
 share/texmf-dist/tex/latex/ccfonts/ts1ccr.fd
-share/texmf-dist/tex/latex/changebar/changebar.sty
 share/texmf-dist/tex/latex/chappg/chappg.sty
 share/texmf-dist/tex/latex/citesort/citesort.sty
 share/texmf-dist/tex/latex/cmap/cmap.sty
@@ -7640,7 +7618,6 @@ share/texmf-dist/tex/latex/eo/latin3eo.def
 share/texmf-dist/tex/latex/esint/esint.sty
 share/texmf-dist/tex/latex/esint/uesint.fd
 share/texmf-dist/tex/latex/eso-pic/eso-pic.sty
-share/texmf-dist/tex/latex/euler/euler.sty
 share/texmf-dist/tex/latex/eulervm/eulervm.sty
 share/texmf-dist/tex/latex/eulervm/uzeuex.fd
 share/texmf-dist/tex/latex/eulervm/uzeur.fd
@@ -7690,7 +7667,6 @@ share/texmf-dist/tex/latex/graphics/textures.def
 share/texmf-dist/tex/latex/graphics/vtex.def
 share/texmf-dist/tex/latex/greek/iso-8859-7.def
 share/texmf-dist/tex/latex/hangcaption/hangcaption.sty
-share/texmf-dist/tex/latex/here/here.sty
 share/texmf-dist/tex/latex/hyphenat/hyphenat.sty
 share/texmf-dist/tex/latex/import/import.sty
 share/texmf-dist/tex/latex/index/index.sty
@@ -7799,85 +7775,6 @@ share/texmf-dist/tex/latex/mh/empheq07.sty
 share/texmf-dist/tex/latex/mh/mathtools.sty
 share/texmf-dist/tex/latex/mh/mhsetup.sty
 share/texmf-dist/tex/latex/mh/ntheorem.fix
-share/texmf-dist/tex/latex/minitoc/acadian.mld
-share/texmf-dist/tex/latex/minitoc/acadien.mld
-share/texmf-dist/tex/latex/minitoc/afrikaan.mld
-share/texmf-dist/tex/latex/minitoc/afrikaans.mld
-share/texmf-dist/tex/latex/minitoc/american.mld
-share/texmf-dist/tex/latex/minitoc/arab.mld
-share/texmf-dist/tex/latex/minitoc/arabic.mld
-share/texmf-dist/tex/latex/minitoc/armenian.mld
-share/texmf-dist/tex/latex/minitoc/austrian.mld
-share/texmf-dist/tex/latex/minitoc/bahasa.mld
-share/texmf-dist/tex/latex/minitoc/bangla.mld
-share/texmf-dist/tex/latex/minitoc/basque.mld
-share/texmf-dist/tex/latex/minitoc/bicig.mld
-share/texmf-dist/tex/latex/minitoc/brazil.mld
-share/texmf-dist/tex/latex/minitoc/breton.mld
-share/texmf-dist/tex/latex/minitoc/bulgarian.mld
-share/texmf-dist/tex/latex/minitoc/buryat.mld
-share/texmf-dist/tex/latex/minitoc/canadian.mld
-share/texmf-dist/tex/latex/minitoc/canadien.mld
-share/texmf-dist/tex/latex/minitoc/castillan.mld
-share/texmf-dist/tex/latex/minitoc/catalan.mld
-share/texmf-dist/tex/latex/minitoc/croatian.mld
-share/texmf-dist/tex/latex/minitoc/czech.mld
-share/texmf-dist/tex/latex/minitoc/danish.mld
-share/texmf-dist/tex/latex/minitoc/dutch.mld
-share/texmf-dist/tex/latex/minitoc/english.mld
-share/texmf-dist/tex/latex/minitoc/esperant.mld
-share/texmf-dist/tex/latex/minitoc/esperanto.mld
-share/texmf-dist/tex/latex/minitoc/estonian.mld
-share/texmf-dist/tex/latex/minitoc/ethiopia.mld
-share/texmf-dist/tex/latex/minitoc/ethiopian.mld
-share/texmf-dist/tex/latex/minitoc/finnish.mld
-share/texmf-dist/tex/latex/minitoc/francais.mld
-share/texmf-dist/tex/latex/minitoc/french.mld
-share/texmf-dist/tex/latex/minitoc/frenchb.mld
-share/texmf-dist/tex/latex/minitoc/frenchle.mld
-share/texmf-dist/tex/latex/minitoc/frenchpro.mld
-share/texmf-dist/tex/latex/minitoc/galician.mld
-share/texmf-dist/tex/latex/minitoc/german.mld
-share/texmf-dist/tex/latex/minitoc/germanb.mld
-share/texmf-dist/tex/latex/minitoc/greek.mld
-share/texmf-dist/tex/latex/minitoc/hebrew.mld
-share/texmf-dist/tex/latex/minitoc/hungarian.mld
-share/texmf-dist/tex/latex/minitoc/icelandic.mld
-share/texmf-dist/tex/latex/minitoc/interlingua.mld
-share/texmf-dist/tex/latex/minitoc/irish.mld
-share/texmf-dist/tex/latex/minitoc/italian.mld
-share/texmf-dist/tex/latex/minitoc/japanese.mld
-share/texmf-dist/tex/latex/minitoc/latin.mld
-share/texmf-dist/tex/latex/minitoc/lithuanian.mld
-share/texmf-dist/tex/latex/minitoc/lsorbian.mld
-share/texmf-dist/tex/latex/minitoc/magyar.mld
-share/texmf-dist/tex/latex/minitoc/minitoc.sty
-share/texmf-dist/tex/latex/minitoc/mongol.mld
-share/texmf-dist/tex/latex/minitoc/mtcoff.sty
-share/texmf-dist/tex/latex/minitoc/naustrian.mld
-share/texmf-dist/tex/latex/minitoc/ngerman.mld
-share/texmf-dist/tex/latex/minitoc/ngermanb.mld
-share/texmf-dist/tex/latex/minitoc/norsk.mld
-share/texmf-dist/tex/latex/minitoc/nynorsk.mld
-share/texmf-dist/tex/latex/minitoc/polish.mld
-share/texmf-dist/tex/latex/minitoc/portuges.mld
-share/texmf-dist/tex/latex/minitoc/romanian.mld
-share/texmf-dist/tex/latex/minitoc/russian.mld
-share/texmf-dist/tex/latex/minitoc/russianb.mld
-share/texmf-dist/tex/latex/minitoc/russianc.mld
-share/texmf-dist/tex/latex/minitoc/samin.mld
-share/texmf-dist/tex/latex/minitoc/scottish.mld
-share/texmf-dist/tex/latex/minitoc/serbian.mld
-share/texmf-dist/tex/latex/minitoc/slovak.mld
-share/texmf-dist/tex/latex/minitoc/slovene.mld
-share/texmf-dist/tex/latex/minitoc/spanish.mld
-share/texmf-dist/tex/latex/minitoc/swedish.mld
-share/texmf-dist/tex/latex/minitoc/turkish.mld
-share/texmf-dist/tex/latex/minitoc/ukraineb.mld
-share/texmf-dist/tex/latex/minitoc/usorbian.mld
-share/texmf-dist/tex/latex/minitoc/vietnam.mld
-share/texmf-dist/tex/latex/minitoc/vietnamese.mld
-share/texmf-dist/tex/latex/minitoc/welsh.mld
 share/texmf-dist/tex/latex/mltex/lo1enc.def
 share/texmf-dist/tex/latex/mltex/mlltxchg.def
 share/texmf-dist/tex/latex/mltex/mltex.sty