[pkgsrc/trunk]: pkgsrc/print/teTeX3-texmf Resolve conflicts between tex-ae, t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8dad042c9b80
branches:  trunk
changeset: 395763:8dad042c9b80
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Jul 12 04:02:59 2009 +0000

description:
Resolve conflicts between tex-ae, tex-amscls, tex-geometry,
tex-titlesec, and teTeX-texmf.  Patches for tex-titlesec was provided
by Mark Davies.

diffstat:

 print/teTeX3-texmf/Makefile |   20 ++++-
 print/teTeX3-texmf/PLIST    |  173 +-------------------------------------------
 2 files changed, 17 insertions(+), 176 deletions(-)

diffs (truncated from 357 to 300 lines):

diff -r 37b0a3c625a4 -r 8dad042c9b80 print/teTeX3-texmf/Makefile
--- a/print/teTeX3-texmf/Makefile       Sun Jul 12 03:34:13 2009 +0000
+++ b/print/teTeX3-texmf/Makefile       Sun Jul 12 04:02:59 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2009/07/10 23:41:07 minskim Exp $
+# $NetBSD: Makefile,v 1.36 2009/07/12 04:02:59 minskim Exp $
 #
 
 DISTNAME=      tetex-texmf-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=   18
+PKGREVISION=   19
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -15,6 +15,8 @@
 NOT_FOR_BULK_PLATFORM= HPUX-*-*
 
 CONFLICTS+=    teTeX-share-[0-9]*
+DEPENDS+=      tex-ae-[0-9]*:../../fonts/tex-ae
+DEPENDS+=      tex-amscls-[0-9]*:../../print/tex-amscls
 DEPENDS+=      tex-amsmath-[0-9]*:../../print/tex-amsmath
 DEPENDS+=      tex-babel-[0-9]*:../../print/tex-babel
 DEPENDS+=      tex-bibtex-[0-9]*:../../print/tex-bibtex
@@ -26,6 +28,7 @@
 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-geometry-[0-9]*:../../print/tex-geometry
 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
@@ -84,6 +87,7 @@
 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-titlesec-[0-9]*:../../print/tex-titlesec
 DEPENDS+=      tex-tools-[0-9]*:../../print/tex-tools
 DEPENDS+=      tex-type1cm-[0-9]*:../../print/tex-type1cm
 DEPENDS+=      tex-wasy-[0-9]*:../../fonts/tex-wasy
@@ -163,17 +167,19 @@
        rm -rf ${WRKSRC}/doc/bibtex/base
        rmdir ${WRKSRC}/doc/generic/pdfcrop
        rm -rf ${WRKSRC}/doc/etex
+       rm -rf ${WRKSRC}/doc/fonts/ae*
        rm -rf ${WRKSRC}/doc/fonts/am*
        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/am*
        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/geo*
        rm -rf ${WRKSRC}/doc/latex/hyperref
        rm -rf ${WRKSRC}/doc/latex/k*
        rm -rf ${WRKSRC}/doc/latex/memoir
@@ -189,6 +195,7 @@
        rm -rf ${WRKSRC}/doc/latex/rotating
        rm -rf ${WRKSRC}/doc/latex/sectsty
        rm -rf ${WRKSRC}/doc/latex/stmaryrd
+       rm -rf ${WRKSRC}/doc/latex/ti*
        rm -rf ${WRKSRC}/doc/latex/tools
        rm -rf ${WRKSRC}/doc/latex/ty*
        rm -rf ${WRKSRC}/doc/latex/wasysym/wasydoc.dvi
@@ -249,6 +256,7 @@
        rm -rf ${WRKSRC}/fonts/source/public/[r-s]*
        rm -rf ${WRKSRC}/fonts/source/public/w*
        rm -rf ${WRKSRC}/fonts/tfm/ams
+       rm -rf ${WRKSRC}/fonts/tfm/public/ae*
        rm -rf ${WRKSRC}/fonts/tfm/public/cm
        rm -rf ${WRKSRC}/fonts/tfm/public/latex
        rm -rf ${WRKSRC}/fonts/tfm/public/lm
@@ -263,6 +271,7 @@
        rm -rf ${WRKSRC}/fonts/type1/public/lm
        rm -rf ${WRKSRC}/fonts/type1/public/marvosym
        rm -rf ${WRKSRC}/fonts/vf/adobe/[q-y]*
+       rm -rf ${WRKSRC}/fonts/vf/public/ae*
        rm -rf ${WRKSRC}/fonts/vf/cg/times
        rm -rf ${WRKSRC}/fonts/vf/yandy/times
        rm -rf ${WRKSRC}/metafont/[a-l]*
@@ -282,7 +291,8 @@
        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]*
+       rm -rf ${WRKSRC}/tex/latex/ae
+       rm -rf ${WRKSRC}/tex/latex/am*
        rm -rf ${WRKSRC}/tex/latex/base
        rm -rf ${WRKSRC}/tex/latex/bo[a-np-z]*
        rm -rf ${WRKSRC}/tex/latex/can*
@@ -300,6 +310,7 @@
        rm -rf ${WRKSRC}/tex/latex/fnpara
        rm -rf ${WRKSRC}/tex/latex/footmisc
        rm -rf ${WRKSRC}/tex/latex/framed
+       rm -rf ${WRKSRC}/tex/latex/geo*
        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]*
@@ -330,6 +341,7 @@
        rm -rf ${WRKSRC}/tex/latex/stmaryrd
        rm -rf ${WRKSRC}/tex/latex/tabls
        rm -rf ${WRKSRC}/tex/latex/threeparttable
+       rm -rf ${WRKSRC}/tex/latex/ti*
        rm -rf ${WRKSRC}/tex/latex/tools
        rm -rf ${WRKSRC}/tex/latex/ty*
        rm -rf ${WRKSRC}/tex/latex/ulem
diff -r 37b0a3c625a4 -r 8dad042c9b80 print/teTeX3-texmf/PLIST
--- a/print/teTeX3-texmf/PLIST  Sun Jul 12 03:34:13 2009 +0000
+++ b/print/teTeX3-texmf/PLIST  Sun Jul 12 04:02:59 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2009/07/10 23:41:07 minskim Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/07/12 04:02:59 minskim Exp $
 share/texmf-dist/aliases
 share/texmf-dist/bibtex/bib/plbib/plbib.bib
 share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
@@ -110,9 +110,6 @@
 share/texmf-dist/doc/fontinst/manual/roadmap.eps
 share/texmf-dist/doc/fontinst/talks/et99-font-tables.pdf
 share/texmf-dist/doc/fontinst/talks/et99-font-tutorial.pdf
-share/texmf-dist/doc/fonts/ae/COPYING
-share/texmf-dist/doc/fonts/ae/README
-share/texmf-dist/doc/fonts/ae/README2
 share/texmf-dist/doc/fonts/antt/AntykwaTorunska-doc-en-2_01.pdf
 share/texmf-dist/doc/fonts/antt/AntykwaTorunska-doc-pl-2_01.pdf
 share/texmf-dist/doc/fonts/antt/README
@@ -2905,26 +2902,6 @@
 share/texmf-dist/doc/latex/aeguill/license.txt
 share/texmf-dist/doc/latex/algorithms/README
 share/texmf-dist/doc/latex/algorithms/algorithms.dvi
-share/texmf-dist/doc/latex/amscls/amsart.template
-share/texmf-dist/doc/latex/amscls/amsbook.template
-share/texmf-dist/doc/latex/amscls/amsproc.template
-share/texmf-dist/doc/latex/amscls/amsrdoc.pdf
-share/texmf-dist/doc/latex/amscls/amsrefs.faq
-share/texmf-dist/doc/latex/amscls/amsrefs.pdf
-share/texmf-dist/doc/latex/amscls/amsthdoc.pdf
-share/texmf-dist/doc/latex/amscls/changes.pdf
-share/texmf-dist/doc/latex/amscls/cite-xa.tex
-share/texmf-dist/doc/latex/amscls/cite-xb.tex
-share/texmf-dist/doc/latex/amscls/cite-xh.tex
-share/texmf-dist/doc/latex/amscls/cite-xs.tex
-share/texmf-dist/doc/latex/amscls/diffs-c.txt
-share/texmf-dist/doc/latex/amscls/gktest.ltb
-share/texmf-dist/doc/latex/amscls/instr-l.pdf
-share/texmf-dist/doc/latex/amscls/jr.bib
-share/texmf-dist/doc/latex/amscls/mathscinet.pdf
-share/texmf-dist/doc/latex/amscls/textcmds.pdf
-share/texmf-dist/doc/latex/amscls/thmtest.pdf
-share/texmf-dist/doc/latex/amscls/thmtest.tex
 share/texmf-dist/doc/latex/anysize/README
 share/texmf-dist/doc/latex/anysize/anysize.dvi
 share/texmf-dist/doc/latex/appendix/README
@@ -3177,10 +3154,6 @@
 share/texmf-dist/doc/latex/general/latex2e.dvi
 share/texmf-dist/doc/latex/general/lshort.pdf
 share/texmf-dist/doc/latex/general/symbols.dvi
-share/texmf-dist/doc/latex/geometry/ChangeLog
-share/texmf-dist/doc/latex/geometry/README
-share/texmf-dist/doc/latex/geometry/geometry.pdf
-share/texmf-dist/doc/latex/geometry/sample.tex
 share/texmf-dist/doc/latex/germbib/README.apalike
 share/texmf-dist/doc/latex/graphics/a.ps
 share/texmf-dist/doc/latex/graphics/epslatex.ps
@@ -3440,7 +3413,6 @@
 share/texmf-dist/doc/latex/textmerg/tmexampp.tex
 share/texmf-dist/doc/latex/textpos/README
 share/texmf-dist/doc/latex/textpos/textpos.dvi
-share/texmf-dist/doc/latex/titlesec/titlesec.dvi
 share/texmf-dist/doc/latex/tocbibind/README
 share/texmf-dist/doc/latex/tocbibind/tocbibind.dvi
 share/texmf-dist/doc/latex/tocloft/tocloft.dvi
@@ -6314,56 +6286,6 @@
 share/texmf-dist/fonts/tfm/jknappen/tc/tcti0900.tfm
 share/texmf-dist/fonts/tfm/jknappen/tc/tctt0900.tfm
 share/texmf-dist/fonts/tfm/jknappen/tc/tctt1000.tfm
-share/texmf-dist/fonts/tfm/public/ae/aeb10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebx10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebx12.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebx5.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebx6.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebx7.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebx8.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebx9.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebxsl10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aebxti10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aecsc10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aeitt10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aer10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aer12.tfm
-share/texmf-dist/fonts/tfm/public/ae/aer17.tfm
-share/texmf-dist/fonts/tfm/public/ae/aer5.tfm
-share/texmf-dist/fonts/tfm/public/ae/aer6.tfm
-share/texmf-dist/fonts/tfm/public/ae/aer7.tfm
-share/texmf-dist/fonts/tfm/public/ae/aer8.tfm
-share/texmf-dist/fonts/tfm/public/ae/aer9.tfm
-share/texmf-dist/fonts/tfm/public/ae/aesl10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aesl12.tfm
-share/texmf-dist/fonts/tfm/public/ae/aesl8.tfm
-share/texmf-dist/fonts/tfm/public/ae/aesl9.tfm
-share/texmf-dist/fonts/tfm/public/ae/aesltt10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aess10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aess12.tfm
-share/texmf-dist/fonts/tfm/public/ae/aess17.tfm
-share/texmf-dist/fonts/tfm/public/ae/aess8.tfm
-share/texmf-dist/fonts/tfm/public/ae/aess9.tfm
-share/texmf-dist/fonts/tfm/public/ae/aessbx10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aessdc10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aessi10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aessi12.tfm
-share/texmf-dist/fonts/tfm/public/ae/aessi17.tfm
-share/texmf-dist/fonts/tfm/public/ae/aessi8.tfm
-share/texmf-dist/fonts/tfm/public/ae/aessi9.tfm
-share/texmf-dist/fonts/tfm/public/ae/aetcsc10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aeti10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aeti12.tfm
-share/texmf-dist/fonts/tfm/public/ae/aeti7.tfm
-share/texmf-dist/fonts/tfm/public/ae/aeti8.tfm
-share/texmf-dist/fonts/tfm/public/ae/aeti9.tfm
-share/texmf-dist/fonts/tfm/public/ae/aett10.tfm
-share/texmf-dist/fonts/tfm/public/ae/aett12.tfm
-share/texmf-dist/fonts/tfm/public/ae/aett8.tfm
-share/texmf-dist/fonts/tfm/public/ae/aett9.tfm
-share/texmf-dist/fonts/tfm/public/ae/laess8.tfm
-share/texmf-dist/fonts/tfm/public/ae/laessb8.tfm
-share/texmf-dist/fonts/tfm/public/ae/laessi8.tfm
 share/texmf-dist/fonts/tfm/public/antp/antpb.tfm
 share/texmf-dist/fonts/tfm/public/antp/antpbi.tfm
 share/texmf-dist/fonts/tfm/public/antp/antpr.tfm
@@ -8689,56 +8611,6 @@
 share/texmf-dist/fonts/vf/cg/univers/cunmq.vf
 share/texmf-dist/fonts/vf/cg/univers/cunmqc.vf
 share/texmf-dist/fonts/vf/cg/univers/cunmrc.vf
-share/texmf-dist/fonts/vf/public/ae/aeb10.vf
-share/texmf-dist/fonts/vf/public/ae/aebx10.vf
-share/texmf-dist/fonts/vf/public/ae/aebx12.vf
-share/texmf-dist/fonts/vf/public/ae/aebx5.vf
-share/texmf-dist/fonts/vf/public/ae/aebx6.vf
-share/texmf-dist/fonts/vf/public/ae/aebx7.vf
-share/texmf-dist/fonts/vf/public/ae/aebx8.vf
-share/texmf-dist/fonts/vf/public/ae/aebx9.vf
-share/texmf-dist/fonts/vf/public/ae/aebxsl10.vf
-share/texmf-dist/fonts/vf/public/ae/aebxti10.vf
-share/texmf-dist/fonts/vf/public/ae/aecsc10.vf
-share/texmf-dist/fonts/vf/public/ae/aeitt10.vf
-share/texmf-dist/fonts/vf/public/ae/aer10.vf
-share/texmf-dist/fonts/vf/public/ae/aer12.vf
-share/texmf-dist/fonts/vf/public/ae/aer17.vf
-share/texmf-dist/fonts/vf/public/ae/aer5.vf
-share/texmf-dist/fonts/vf/public/ae/aer6.vf
-share/texmf-dist/fonts/vf/public/ae/aer7.vf
-share/texmf-dist/fonts/vf/public/ae/aer8.vf
-share/texmf-dist/fonts/vf/public/ae/aer9.vf
-share/texmf-dist/fonts/vf/public/ae/aesl10.vf
-share/texmf-dist/fonts/vf/public/ae/aesl12.vf
-share/texmf-dist/fonts/vf/public/ae/aesl8.vf
-share/texmf-dist/fonts/vf/public/ae/aesl9.vf
-share/texmf-dist/fonts/vf/public/ae/aesltt10.vf
-share/texmf-dist/fonts/vf/public/ae/aess10.vf
-share/texmf-dist/fonts/vf/public/ae/aess12.vf
-share/texmf-dist/fonts/vf/public/ae/aess17.vf
-share/texmf-dist/fonts/vf/public/ae/aess8.vf
-share/texmf-dist/fonts/vf/public/ae/aess9.vf
-share/texmf-dist/fonts/vf/public/ae/aessbx10.vf
-share/texmf-dist/fonts/vf/public/ae/aessdc10.vf
-share/texmf-dist/fonts/vf/public/ae/aessi10.vf
-share/texmf-dist/fonts/vf/public/ae/aessi12.vf
-share/texmf-dist/fonts/vf/public/ae/aessi17.vf
-share/texmf-dist/fonts/vf/public/ae/aessi8.vf
-share/texmf-dist/fonts/vf/public/ae/aessi9.vf
-share/texmf-dist/fonts/vf/public/ae/aetcsc10.vf
-share/texmf-dist/fonts/vf/public/ae/aeti10.vf
-share/texmf-dist/fonts/vf/public/ae/aeti12.vf
-share/texmf-dist/fonts/vf/public/ae/aeti7.vf
-share/texmf-dist/fonts/vf/public/ae/aeti8.vf
-share/texmf-dist/fonts/vf/public/ae/aeti9.vf
-share/texmf-dist/fonts/vf/public/ae/aett10.vf
-share/texmf-dist/fonts/vf/public/ae/aett12.vf
-share/texmf-dist/fonts/vf/public/ae/aett8.vf
-share/texmf-dist/fonts/vf/public/ae/aett9.vf
-share/texmf-dist/fonts/vf/public/ae/laess8.vf
-share/texmf-dist/fonts/vf/public/ae/laessb8.vf
-share/texmf-dist/fonts/vf/public/ae/laessi8.vf
 share/texmf-dist/fonts/vf/public/cmcyr/kcmb10.vf
 share/texmf-dist/fonts/vf/public/cmcyr/kcmbx10.vf
 share/texmf-dist/fonts/vf/public/cmcyr/kcmbx12.vf
@@ -10215,38 +10087,9 @@
 share/texmf-dist/tex/latex/adrconv/adrsmall.cfg
 share/texmf-dist/tex/latex/adrconv/birthday.tex
 share/texmf-dist/tex/latex/adrconv/email.tex
-share/texmf-dist/tex/latex/ae/ae.sty
-share/texmf-dist/tex/latex/ae/aecompl.sty
-share/texmf-dist/tex/latex/ae/omlaer.fd
-share/texmf-dist/tex/latex/ae/omsaer.fd
-share/texmf-dist/tex/latex/ae/ot1aer.fd
-share/texmf-dist/tex/latex/ae/ot1aess.fd