[pkgsrc/trunk]: pkgsrc/print/teTeX3-texmf Resolve conflicts between teTeX-tex...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f05ad1f30ea
branches:  trunk
changeset: 395711:5f05ad1f30ea
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Jul 10 23:41:07 2009 +0000

description:
Resolve conflicts between teTeX-texmf and recently imported or updated
TeX Live packages.

Bump PKGREVISION.

diffstat:

 print/teTeX3-texmf/Makefile |  41 ++++++++++++++++++-
 print/teTeX3-texmf/PLIST    |  93 +--------------------------------------------
 2 files changed, 39 insertions(+), 95 deletions(-)

diffs (truncated from 409 to 300 lines):

diff -r bedd1016469e -r 5f05ad1f30ea print/teTeX3-texmf/Makefile
--- a/print/teTeX3-texmf/Makefile       Fri Jul 10 23:38:58 2009 +0000
+++ b/print/teTeX3-texmf/Makefile       Fri Jul 10 23:41:07 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2009/07/07 23:20:12 minskim Exp $
+# $NetBSD: Makefile,v 1.35 2009/07/10 23:41:07 minskim Exp $
 #
 
 DISTNAME=      tetex-texmf-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=   17
+PKGREVISION=   18
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -22,8 +22,10 @@
 DEPENDS+=      tex-colortbl-[0-9]*:../../print/tex-colortbl
 DEPENDS+=      tex-dvips-[0-9]*:../../print/tex-dvips
 DEPENDS+=      tex-enctex-[0-9]*:../../print/tex-enctex
+DEPENDS+=      tex-enumitem-[0-9]*:../../print/tex-enumitem
 DEPENDS+=      tex-exam-[0-9]*:../../print/tex-exam
 DEPENDS+=      tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
+DEPENDS+=      tex-footmisc-[0-9]*:../../print/tex-footmisc
 DEPENDS+=      tex-hyperref-[0-9]*:../../print/tex-hyperref
 DEPENDS+=      tex-hyphen-basque-[0-9]*:../../print/tex-hyphen-basque
 DEPENDS+=      tex-hyphen-bulgarian-[0-9]*:../../print/tex-hyphen-bulgarian
@@ -56,6 +58,7 @@
 DEPENDS+=      tex-hyphen-swedish-[0-9]*:../../print/tex-hyphen-swedish
 DEPENDS+=      tex-hyphen-turkish-[0-9]*:../../print/tex-hyphen-turkish
 DEPENDS+=      tex-hyphen-ukrainian-[0-9]*:../../print/tex-hyphen-ukrainian
+DEPENDS+=      tex-koma-script-[0-9]*:../../print/tex-koma-script
 DEPENDS+=      tex-lambda-[0-9]*:../../print/tex-lambda
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=      tex-lm-[0-9]*:../../fonts/tex-lm
@@ -63,19 +66,28 @@
 DEPENDS+=      tex-marvosym-[0-9]*:../../fonts/tex-marvosym
 DEPENDS+=      tex-makeindex-[0-9]*:../../textproc/tex-makeindex
 DEPENDS+=      tex-manfnt-[0-9]*:../../fonts/tex-manfnt
+DEPENDS+=      tex-memoir-[0-9]*:../../print/tex-memoir
 DEPENDS+=      tex-mflogo-[0-9]*:../../fonts/tex-mflogo
+DEPENDS+=      tex-microtype-[0-9]*:../../print/tex-microtype
+DEPENDS+=      tex-moreverb-[0-9]*:../../print/tex-moreverb
+DEPENDS+=      tex-ms-[0-9]*:../../print/tex-ms
 DEPENDS+=      tex-multirow-[0-9]*:../../print/tex-multirow
 DEPENDS+=      tex-natbib-[0-9]*:../../print/tex-natbib
 DEPENDS+=      tex-oberdiek-[0-9]*:../../print/tex-oberdiek
+DEPENDS+=      tex-paralist-[0-9]*:../../print/tex-paralist
 DEPENDS+=      tex-placeins-[0-9]*:../../print/tex-placeins
 DEPENDS+=      tex-preprint-[0-9]*:../../print/tex-preprint
 DEPENDS+=      tex-rotating-[0-9]*:../../print/tex-rotating
 DEPENDS+=      tex-rsfs-[0-9]*:../../fonts/tex-rsfs
+DEPENDS+=      tex-sectsty-[0-9]*:../../print/tex-sectsty
+DEPENDS+=      tex-setspace-[0-9]*:../../print/tex-setspace
 DEPENDS+=      tex-stmaryrd-[0-9]*:../../fonts/tex-stmaryrd
 DEPENDS+=      tex-symbol-[0-9]*:../../fonts/tex-symbol
 DEPENDS+=      tex-times-[0-9]*:../../fonts/tex-times
 DEPENDS+=      tex-tools-[0-9]*:../../print/tex-tools
+DEPENDS+=      tex-type1cm-[0-9]*:../../print/tex-type1cm
 DEPENDS+=      tex-wasy-[0-9]*:../../fonts/tex-wasy
+DEPENDS+=      tex-xkeyval-[0-9]*:../../print/tex-xkeyval
 DEPENDS+=      tex-zapfding-[0-9]*:../../fonts/tex-zapfding
 
 EXTRACT_ELEMENTS+=     aliases
@@ -155,19 +167,30 @@
        rm -rf ${WRKSRC}/doc/fonts/lm
        rm -rf ${WRKSRC}/doc/fonts/mar*
        rm -rf ${WRKSRC}/doc/generic/[a-f]*
+       rm -rf ${WRKSRC}/doc/generic/xk*
        rm -rf ${WRKSRC}/doc/latex/ams[f-z]*
        rm -rf ${WRKSRC}/doc/latex/carlisle
+       rm -rf ${WRKSRC}/doc/latex/enumitem
        rm -rf ${WRKSRC}/doc/latex/exam
        rm -rf ${WRKSRC}/doc/latex/fancyh*
+       rm -rf ${WRKSRC}/doc/latex/footmisc
        rm -rf ${WRKSRC}/doc/latex/hyperref
+       rm -rf ${WRKSRC}/doc/latex/k*
+       rm -rf ${WRKSRC}/doc/latex/memoir
        rm -rf ${WRKSRC}/doc/latex/mflogo
+       rm -rf ${WRKSRC}/doc/latex/microtype
+       rm -rf ${WRKSRC}/doc/latex/moreverb
+       rm -rf ${WRKSRC}/doc/latex/ms
        rm -rf ${WRKSRC}/doc/latex/natbib
        rm -rf ${WRKSRC}/doc/latex/oberdiek
+       rm -rf ${WRKSRC}/doc/latex/paralist
        rm -rf ${WRKSRC}/doc/latex/placeins
        rm -rf ${WRKSRC}/doc/latex/preprint
        rm -rf ${WRKSRC}/doc/latex/rotating
+       rm -rf ${WRKSRC}/doc/latex/sectsty
        rm -rf ${WRKSRC}/doc/latex/stmaryrd
        rm -rf ${WRKSRC}/doc/latex/tools
+       rm -rf ${WRKSRC}/doc/latex/ty*
        rm -rf ${WRKSRC}/doc/latex/wasysym/wasydoc.dvi
        rm -rf ${WRKSRC}/doc/makeindex
        rm -rf ${WRKSRC}/doc/pdftex
@@ -256,6 +279,7 @@
        rm -rf ${WRKSRC}/tex/generic/ruhyphen
        rm -rf ${WRKSRC}/tex/generic/texnames
        rm -rf ${WRKSRC}/tex/generic/ukrhyph
+       rm -rf ${WRKSRC}/tex/generic/xk*
        rm -rf ${WRKSRC}/tex/lambda
        rm -rf ${WRKSRC}/tex/latex/a4wide
        rm -rf ${WRKSRC}/tex/latex/ams[d-z]*
@@ -269,38 +293,49 @@
        rm -rf ${WRKSRC}/tex/latex/config
        rm -f ${WRKSRC}/tex/latex/dvipdfm/dvipdfm.def
        rm -rf ${WRKSRC}/tex/latex/endnotes
+       rm -rf ${WRKSRC}/tex/latex/enumitem
        rm -rf ${WRKSRC}/tex/latex/etex
        rm -rf ${WRKSRC}/tex/latex/exam
        rm -rf ${WRKSRC}/tex/latex/fancyh*
        rm -rf ${WRKSRC}/tex/latex/fnpara
+       rm -rf ${WRKSRC}/tex/latex/footmisc
        rm -rf ${WRKSRC}/tex/latex/framed
        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/hyperref
+       rm -rf ${WRKSRC}/tex/latex/k*
        rm -rf ${WRKSRC}/tex/latex/lm
        rm -rf ${WRKSRC}/tex/latex/marvosym
+       rm -rf ${WRKSRC}/tex/latex/memoir
        rm -rf ${WRKSRC}/tex/latex/mflogo
+       rm -rf ${WRKSRC}/tex/latex/microtype
+       rm -rf ${WRKSRC}/tex/latex/moreverb
+       rm -rf ${WRKSRC}/tex/latex/ms
        rm -rf ${WRKSRC}/tex/latex/multirow
        rm -rf ${WRKSRC}/tex/latex/n[a-n]*
        rm -f ${WRKSRC}/tex/latex/oberdiek/[a-u]*
        rm -rf ${WRKSRC}/tex/latex/optional
-       rm -rf ${WRKSRC}/tex/latex/parskip
+       rm -rf ${WRKSRC}/tex/latex/par*
        rm -rf ${WRKSRC}/tex/latex/placeins
        rm -rf ${WRKSRC}/tex/latex/preprint
        rm -rf ${WRKSRC}/tex/latex/psnfss
        rm -rf ${WRKSRC}/tex/latex/relsize
        rm -rf ${WRKSRC}/tex/latex/rotating
        rm -rf ${WRKSRC}/tex/latex/selectp
+       rm -rf ${WRKSRC}/tex/latex/sec*
+       rm -rf ${WRKSRC}/tex/latex/set*
        rm -rf ${WRKSRC}/tex/latex/shadow
        rm -rf ${WRKSRC}/tex/latex/showtags
        rm -rf ${WRKSRC}/tex/latex/stmaryrd
        rm -rf ${WRKSRC}/tex/latex/tabls
        rm -rf ${WRKSRC}/tex/latex/threeparttable
        rm -rf ${WRKSRC}/tex/latex/tools
+       rm -rf ${WRKSRC}/tex/latex/ty*
        rm -rf ${WRKSRC}/tex/latex/ulem
        rm -rf ${WRKSRC}/tex/latex/url
        rm -rf ${WRKSRC}/tex/latex/version
+       rm -rf ${WRKSRC}/tex/latex/xk*
        rm -rf ${WRKSRC}/tex/plain/amsfonts
        rm -f ${WRKSRC}/tex/plain/base/[gmp-z]*
        rm -f ${WRKSRC}/tex/plain/base/letter*
diff -r bedd1016469e -r 5f05ad1f30ea print/teTeX3-texmf/PLIST
--- a/print/teTeX3-texmf/PLIST  Fri Jul 10 23:38:58 2009 +0000
+++ b/print/teTeX3-texmf/PLIST  Fri Jul 10 23:41:07 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2009/07/07 23:20:12 minskim Exp $
+@comment $NetBSD: PLIST,v 1.16 2009/07/10 23:41:07 minskim Exp $
 share/texmf-dist/aliases
 share/texmf-dist/bibtex/bib/plbib/plbib.bib
 share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
@@ -490,8 +490,6 @@
 share/texmf-dist/doc/generic/vntex/vntest3.tex
 share/texmf-dist/doc/generic/vntex/vntest4.tex
 share/texmf-dist/doc/generic/vntex/vntest5.tex
-share/texmf-dist/doc/generic/xkeyval/pst-xkey.dvi
-share/texmf-dist/doc/generic/xkeyval/xkeyval.dvi
 share/texmf-dist/doc/generic/xypic/CATALOG
 share/texmf-dist/doc/generic/xypic/COPYING
 share/texmf-dist/doc/generic/xypic/MANIFEST
@@ -3137,8 +3135,6 @@
 share/texmf-dist/doc/latex/eepic/epic-eg4.tex
 share/texmf-dist/doc/latex/eepic/readme
 share/texmf-dist/doc/latex/endfloat/endfloat.dvi
-share/texmf-dist/doc/latex/enumitem/README
-share/texmf-dist/doc/latex/enumitem/enumitem.dvi
 share/texmf-dist/doc/latex/eo/README
 share/texmf-dist/doc/latex/eo/readme.dvi
 share/texmf-dist/doc/latex/eo/readme.ltx
@@ -3167,8 +3163,6 @@
 share/texmf-dist/doc/latex/floatflt/floatfge.dvi
 share/texmf-dist/doc/latex/floatflt/floatflt.dvi
 share/texmf-dist/doc/latex/footbib/footbib.dvi
-share/texmf-dist/doc/latex/footmisc/README
-share/texmf-dist/doc/latex/footmisc/footmisc.dvi
 share/texmf-dist/doc/latex/footnpag/footnpag-user.dvi
 share/texmf-dist/doc/latex/fp/readme.fp
 share/texmf-dist/doc/latex/g-brief/beispiel.tex
@@ -3209,16 +3203,6 @@
 share/texmf-dist/doc/latex/jurabib/jbendoc.dvi
 share/texmf-dist/doc/latex/jurabib/jbgerdoc.dvi
 share/texmf-dist/doc/latex/jurabib/jurabib-faq.dvi
-share/texmf-dist/doc/latex/koma-script/INSTALL.TXT
-share/texmf-dist/doc/latex/koma-script/INSTALLD.TXT
-share/texmf-dist/doc/latex/koma-script/LEGAL.TXT
-share/texmf-dist/doc/latex/koma-script/LEGALDE.TXT
-share/texmf-dist/doc/latex/koma-script/koma-script.pdf
-share/texmf-dist/doc/latex/koma-script/komabug.tex
-share/texmf-dist/doc/latex/koma-script/liesmich.txt
-share/texmf-dist/doc/latex/koma-script/readme.txt
-share/texmf-dist/doc/latex/koma-script/scrguide.pdf
-share/texmf-dist/doc/latex/koma-script/scrguien.pdf
 share/texmf-dist/doc/latex/labels/labels.dvi
 share/texmf-dist/doc/latex/lastpage/lastpage.dvi
 share/texmf-dist/doc/latex/layouts/layman.dvi
@@ -3248,8 +3232,6 @@
 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/memoir/README
-share/texmf-dist/doc/latex/memoir/memman.pdf
 share/texmf-dist/doc/latex/mfnfss/manifest.txt
 share/texmf-dist/doc/latex/mfnfss/oldgerm.dvi
 share/texmf-dist/doc/latex/mfnfss/readme.txt
@@ -3258,9 +3240,6 @@
 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/microtype/README
-share/texmf-dist/doc/latex/microtype/microtype.dvi
-share/texmf-dist/doc/latex/microtype/test-microtype.tex
 share/texmf-dist/doc/latex/minitoc/README
 share/texmf-dist/doc/latex/minitoc/add.tex
 share/texmf-dist/doc/latex/minitoc/catalog
@@ -3270,20 +3249,7 @@
 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/moreverb/moreverb.dvi
 share/texmf-dist/doc/latex/mparhack/mparhack.dvi
-share/texmf-dist/doc/latex/ms/count1to.bug
-share/texmf-dist/doc/latex/ms/count1to.dvi
-share/texmf-dist/doc/latex/ms/eso-p-t.tex
-share/texmf-dist/doc/latex/ms/everysel.bug
-share/texmf-dist/doc/latex/ms/everysel.dvi
-share/texmf-dist/doc/latex/ms/everyshi.bug
-share/texmf-dist/doc/latex/ms/everyshi.dvi
-share/texmf-dist/doc/latex/ms/multitoc.bug
-share/texmf-dist/doc/latex/ms/multitoc.dvi
-share/texmf-dist/doc/latex/ms/prelim2e.bug
-share/texmf-dist/doc/latex/ms/prelim2e.dvi
-share/texmf-dist/doc/latex/ms/ragged2e.dvi
 share/texmf-dist/doc/latex/mt11p/0readme
 share/texmf-dist/doc/latex/mt11p/mt11p.dvi
 share/texmf-dist/doc/latex/mt11p/test11p.tex
@@ -3312,7 +3278,6 @@
 share/texmf-dist/doc/latex/overpic/README
 share/texmf-dist/doc/latex/overpic/opic-abs.tex
 share/texmf-dist/doc/latex/overpic/opic-rel.tex
-share/texmf-dist/doc/latex/paralist/paralist.dvi
 share/texmf-dist/doc/latex/pb-diagram/COPYING
 share/texmf-dist/doc/latex/pb-diagram/README
 share/texmf-dist/doc/latex/pb-diagram/pb-examples.tex
@@ -3386,7 +3351,6 @@
 share/texmf-dist/doc/latex/rotfloat/rotfloat.dvi
 share/texmf-dist/doc/latex/scale/README
 share/texmf-dist/doc/latex/scale/scale.dvi
-share/texmf-dist/doc/latex/sectsty/sectsty.dvi
 share/texmf-dist/doc/latex/seminar/Seminar-Bugs.html
 share/texmf-dist/doc/latex/seminar/Seminar-FAQ.css
 share/texmf-dist/doc/latex/seminar/Seminar-FAQ.html
@@ -3484,7 +3448,6 @@
 share/texmf-dist/doc/latex/totpages/totpages.dvi
 share/texmf-dist/doc/latex/treesvr/legal.txt
 share/texmf-dist/doc/latex/treesvr/treedoc.dvi
-share/texmf-dist/doc/latex/type1cm/type1cm.txt
 share/texmf-dist/doc/latex/units/README
 share/texmf-dist/doc/latex/units/units.dvi
 share/texmf-dist/doc/latex/vmargin/vmargin.dvi
@@ -10181,10 +10144,6 @@
 share/texmf-dist/tex/generic/texdraw/txdtools.tex
 share/texmf-dist/tex/generic/thumbpdf/thumbpdf.sty
 share/texmf-dist/tex/generic/thumbpdf/thumbpdf.tex
-share/texmf-dist/tex/generic/xkeyval/keyval.tex
-share/texmf-dist/tex/generic/xkeyval/pst-xkey.tex
-share/texmf-dist/tex/generic/xkeyval/xkeyval.tex
-share/texmf-dist/tex/generic/xkeyval/xkvtxhdr.tex
 share/texmf-dist/tex/generic/xypic/movie.cls
 share/texmf-dist/tex/generic/xypic/xy.sty
 share/texmf-dist/tex/generic/xypic/xy.tex
@@ -10681,7 +10640,6 @@
 share/texmf-dist/tex/latex/eepic/epic.sty
 share/texmf-dist/tex/latex/endfloat/efxmpl.cfg
 share/texmf-dist/tex/latex/endfloat/endfloat.sty
-share/texmf-dist/tex/latex/enumitem/enumitem.sty
 share/texmf-dist/tex/latex/eo/eo.ldf
 share/texmf-dist/tex/latex/eo/eo.sty
 share/texmf-dist/tex/latex/eo/latin3eo.def
@@ -10718,7 +10676,6 @@
 share/texmf-dist/tex/latex/floatflt/floatflt.sty
 share/texmf-dist/tex/latex/fontinst/fontdoc.sty
 share/texmf-dist/tex/latex/footbib/footbib.sty
-share/texmf-dist/tex/latex/footmisc/footmisc.sty
 share/texmf-dist/tex/latex/footnpag/footnpag.sty
 share/texmf-dist/tex/latex/fp/defpattern.sty
 share/texmf-dist/tex/latex/fp/fp-addons.sty
@@ -10773,23 +10730,6 @@
 share/texmf-dist/tex/latex/jurabib/nojbbib.ldf
 share/texmf-dist/tex/latex/jurabib/ptjbbib.ldf