diff options
author | minskim <minskim> | 2010-09-10 22:27:11 +0000 |
---|---|---|
committer | minskim <minskim> | 2010-09-10 22:27:11 +0000 |
commit | b4d1e3aaa891c8ec63e7192a1889eea1ff17efa3 (patch) | |
tree | 4a792e4cb3d483a82260a7c302e452071f83ec54 | |
parent | 1bd7462fc83915ac03df60b94c7b456c268c9481 (diff) | |
download | pkgsrc-b4d1e3aaa891c8ec63e7192a1889eea1ff17efa3.tar.gz |
Resolve conflicts between teTeX-texmf and recently imported TeX Live packages.
-rw-r--r-- | print/teTeX3-texmf/Makefile | 28 | ||||
-rw-r--r-- | print/teTeX3-texmf/PLIST | 42 |
2 files changed, 19 insertions, 51 deletions
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile index af138d236e4..0b7e8c0720f 100644 --- a/print/teTeX3-texmf/Makefile +++ b/print/teTeX3-texmf/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.46 2010/08/22 20:54:08 markd Exp $ +# $NetBSD: Makefile,v 1.47 2010/09/10 22:27:11 minskim Exp $ # DISTNAME= tetex-texmf-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/} -PKGREVISION= 27 +PKGREVISION= 28 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/} @@ -47,10 +47,13 @@ DEPENDS+= tex-cyrillic>=2009:../../print/tex-cyrillic DEPENDS+= tex-dblfloatfix-[0-9]*:../../print/tex-dblfloatfix DEPENDS+= tex-ec>=1.0:../../fonts/tex-ec 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-eurosym-[0-9]*:../../fonts/tex-eurosym DEPENDS+= tex-exam-[0-9]*:../../print/tex-exam DEPENDS+= tex-excludeonly-[0-9]*:../../print/tex-excludeonly +DEPENDS+= tex-fancybox-[0-9]*:../../print/tex-fancybox DEPENDS+= tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb DEPENDS+= tex-float-[0-9]*:../../print/tex-float DEPENDS+= tex-fncylab-[0-9]*:../../print/tex-fncylab @@ -134,6 +137,7 @@ DEPENDS+= tex-tabls-[0-9]*:../../print/tex-tabls DEPENDS+= tex-threeparttable-[0-9]*:../../print/tex-threeparttable DEPENDS+= tex-times-[0-9]*:../../fonts/tex-times DEPENDS+= tex-titlesec-[0-9]*:../../print/tex-titlesec +DEPENDS+= tex-tocbibind-[0-9]*:../../print/tex-tocbibind DEPENDS+= tex-twoinone-[0-9]*:../../print/tex-twoinone DEPENDS+= tex-txfonts-[0-9]*:../../fonts/tex-txfonts DEPENDS+= tex-type1cm-[0-9]*:../../print/tex-type1cm @@ -201,7 +205,6 @@ TEX_MAP_FILES+= dstroke.map TEX_MIXEDMAP_FILES+= cs.map TEX_MIXEDMAP_FILES+= pl.map TEX_MIXEDMAP_FILES+= ccpl.map -TEX_MIXEDMAP_FILES+= eurosym.map TEX_MIXEDMAP_FILES+= vnr.map .include "../../print/kpathsea/texmf.mk" @@ -221,6 +224,7 @@ post-extract: rm -rf ${WRKSRC}/doc/fonts/am* rm -rf ${WRKSRC}/doc/fonts/cm rm -rf ${WRKSRC}/doc/fonts/ec + rm -rf ${WRKSRC}/doc/fonts/eu* rm -rf ${WRKSRC}/doc/fonts/l[a-t]* rm -rf ${WRKSRC}/doc/fonts/mar* rm -rf ${WRKSRC}/doc/fonts/t* @@ -232,10 +236,9 @@ post-extract: rm -rf ${WRKSRC}/doc/latex/beamer rm -rf ${WRKSRC}/doc/latex/ca* rm -rf ${WRKSRC}/doc/latex/c[v-z]* - rm -rf ${WRKSRC}/doc/latex/eepic - rm -rf ${WRKSRC}/doc/latex/enumitem + rm -rf ${WRKSRC}/doc/latex/e[d-n]* rm -rf ${WRKSRC}/doc/latex/exam - rm -rf ${WRKSRC}/doc/latex/fancy[c-z]* + rm -rf ${WRKSRC}/doc/latex/fa* rm -rf ${WRKSRC}/doc/latex/float rm -rf ${WRKSRC}/doc/latex/footmisc rm -rf ${WRKSRC}/doc/latex/geo* @@ -258,6 +261,7 @@ post-extract: rm -rf ${WRKSRC}/doc/latex/stmaryrd rm -rf ${WRKSRC}/doc/latex/sub* rm -rf ${WRKSRC}/doc/latex/ti* + rm -rf ${WRKSRC}/doc/latex/tocbibind rm -rf ${WRKSRC}/doc/latex/tools rm -rf ${WRKSRC}/doc/latex/ty* rm -rf ${WRKSRC}/doc/latex/wasysym/wasydoc.dvi @@ -285,6 +289,7 @@ post-extract: rmdir ${WRKSRC}/fonts/map/dvipdfm/updmap rm -rf ${WRKSRC}/fonts/map/dvips/context rm -rf ${WRKSRC}/fonts/map/dvips/lm + rm -f ${WRKSRC}/fonts/map/dvips/misc/eurosym.map rm -f ${WRKSRC}/fonts/map/dvips/misc/marvosym.map rmdir ${WRKSRC}/fonts/map/dvips/updmap rmdir ${WRKSRC}/fonts/map/pdftex/updmap @@ -305,6 +310,7 @@ post-extract: rm -rf ${WRKSRC}/fonts/source/jknappen/[a-r]* rm -rf ${WRKSRC}/fonts/source/lh rm -rf ${WRKSRC}/fonts/source/public/cm + rm -rf ${WRKSRC}/fonts/source/public/eurosym rm -rf ${WRKSRC}/fonts/source/public/latex rm -rf ${WRKSRC}/fonts/source/public/mflogo rm -f ${WRKSRC}/fonts/source/public/misc/[0-9b-w]*.mf @@ -323,6 +329,7 @@ post-extract: rm -rf ${WRKSRC}/fonts/tfm/public/ae* rm -rf ${WRKSRC}/fonts/tfm/public/cm rm -rf ${WRKSRC}/fonts/tfm/public/cmcyr + rm -rf ${WRKSRC}/fonts/tfm/public/eurosym rm -rf ${WRKSRC}/fonts/tfm/public/latex rm -rf ${WRKSRC}/fonts/tfm/public/lm rm -rf ${WRKSRC}/fonts/tfm/public/marvosym @@ -335,6 +342,7 @@ post-extract: rm -rf ${WRKSRC}/fonts/type1/bluesky rm -rf ${WRKSRC}/fonts/type1/hoekwater rm -rf ${WRKSRC}/fonts/type1/public/cmcyr + rm -rf ${WRKSRC}/fonts/type1/public/eurosym rm -rf ${WRKSRC}/fonts/type1/public/lm rm -rf ${WRKSRC}/fonts/type1/public/marvosym rm -rf ${WRKSRC}/fonts/type1/public/t* @@ -387,12 +395,11 @@ post-extract: rm -rf ${WRKSRC}/tex/latex/con[f-z]* rm -rf ${WRKSRC}/tex/latex/c[v-z]* rm -f ${WRKSRC}/tex/latex/dvipdfm/dvipdfm.def - rm -rf ${WRKSRC}/tex/latex/eepic - rm -rf ${WRKSRC}/tex/latex/endnotes - rm -rf ${WRKSRC}/tex/latex/enumitem + rm -rf ${WRKSRC}/tex/latex/e[d-n]* rm -rf ${WRKSRC}/tex/latex/etex + rm -rf ${WRKSRC}/tex/latex/eurosym rm -rf ${WRKSRC}/tex/latex/exam - rm -rf ${WRKSRC}/tex/latex/fancy[c-z]* + rm -rf ${WRKSRC}/tex/latex/fa* rm -rf ${WRKSRC}/tex/latex/float rm -rf ${WRKSRC}/tex/latex/fnpara rm -rf ${WRKSRC}/tex/latex/footmisc @@ -432,6 +439,7 @@ post-extract: rm -rf ${WRKSRC}/tex/latex/tabls rm -rf ${WRKSRC}/tex/latex/threeparttable rm -rf ${WRKSRC}/tex/latex/ti* + rm -rf ${WRKSRC}/tex/latex/tocbibind rm -rf ${WRKSRC}/tex/latex/tools rm -rf ${WRKSRC}/tex/latex/t[s-z]* rm -rf ${WRKSRC}/tex/latex/ulem diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST index 952d843fa1d..83be8a16842 100644 --- a/print/teTeX3-texmf/PLIST +++ b/print/teTeX3-texmf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.24 2010/08/22 20:54:08 markd Exp $ +@comment $NetBSD: PLIST,v 1.25 2010/09/10 22:27:11 minskim Exp $ share/texmf-dist/aliases share/texmf-dist/bibtex/bib/plbib/plbib.bib share/texmf-dist/bibtex/bst/adrconv/adrconv.bst @@ -108,11 +108,6 @@ share/texmf-dist/doc/fonts/dstroke/readme share/texmf-dist/doc/fonts/ecc/copyrite share/texmf-dist/doc/fonts/ecc/liesmich share/texmf-dist/doc/fonts/ecc/readme -share/texmf-dist/doc/fonts/eurosym/COPYING -share/texmf-dist/doc/fonts/eurosym/Changes -share/texmf-dist/doc/fonts/eurosym/README -share/texmf-dist/doc/fonts/eurosym/testeuro.dvi -share/texmf-dist/doc/fonts/eurosym/testeuro.tex share/texmf-dist/doc/fonts/fontname/ChangeLog share/texmf-dist/doc/fonts/fontname/README share/texmf-dist/doc/fonts/fontname/fontname.dvi @@ -2886,7 +2881,6 @@ share/texmf-dist/doc/latex/draftcopy/draftcopy-test-8.tex share/texmf-dist/doc/latex/draftcopy/draftcopy-test-9.tex share/texmf-dist/doc/latex/draftcopy/draftcopy.dvi share/texmf-dist/doc/latex/eclbip/ecltreesample.dvi -share/texmf-dist/doc/latex/endfloat/endfloat.dvi share/texmf-dist/doc/latex/eo/README share/texmf-dist/doc/latex/eo/readme.dvi share/texmf-dist/doc/latex/eo/readme.ltx @@ -2905,7 +2899,6 @@ share/texmf-dist/doc/latex/eulervm/README.eulervm share/texmf-dist/doc/latex/eulervm/eulervm.pdf share/texmf-dist/doc/latex/eulervm/manifest.txt share/texmf-dist/doc/latex/extsizes/readme.extsizes -share/texmf-dist/doc/latex/fancybox/fancybox.dvi share/texmf-dist/doc/latex/filecontents/filecontents.dvi share/texmf-dist/doc/latex/floatflt/floatexm.dvi share/texmf-dist/doc/latex/floatflt/floatexm.tex @@ -3141,8 +3134,6 @@ share/texmf-dist/doc/latex/textmerg/tmexamp2.tex 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/tocbibind/README -share/texmf-dist/doc/latex/tocbibind/tocbibind.dvi share/texmf-dist/doc/latex/tocloft/tocloft.dvi share/texmf-dist/doc/latex/totpages/readme.txt share/texmf-dist/doc/latex/totpages/totpages.dvi @@ -3609,7 +3600,6 @@ share/texmf-dist/fonts/map/dvips/lucida/lumath-k.map share/texmf-dist/fonts/map/dvips/lucida/lumath.map share/texmf-dist/fonts/map/dvips/misc/cs.map share/texmf-dist/fonts/map/dvips/misc/dstroke.map -share/texmf-dist/fonts/map/dvips/misc/eurosym.map share/texmf-dist/fonts/map/dvips/misc/pcrr8rn.map share/texmf-dist/fonts/map/dvips/omega/omega.map share/texmf-dist/fonts/map/dvips/pl/pl.map @@ -4290,13 +4280,6 @@ share/texmf-dist/fonts/source/public/ecc/toti10.mf share/texmf-dist/fonts/source/public/esint/bigint.mf share/texmf-dist/fonts/source/public/esint/esint10.mf share/texmf-dist/fonts/source/public/esint/mathint.mf -share/texmf-dist/fonts/source/public/eurosym/fey.mf -share/texmf-dist/fonts/source/public/eurosym/feybl10.mf -share/texmf-dist/fonts/source/public/eurosym/feybo10.mf -share/texmf-dist/fonts/source/public/eurosym/feybr10.mf -share/texmf-dist/fonts/source/public/eurosym/feyml10.mf -share/texmf-dist/fonts/source/public/eurosym/feymo10.mf -share/texmf-dist/fonts/source/public/eurosym/feymr10.mf share/texmf-dist/fonts/source/public/euxm/euxm10.mf share/texmf-dist/fonts/source/public/euxm/euxm5.mf share/texmf-dist/fonts/source/public/euxm/euxm7.mf @@ -5824,12 +5807,6 @@ share/texmf-dist/fonts/tfm/public/eulervm/zeusb7.tfm share/texmf-dist/fonts/tfm/public/eulervm/zeusm10.tfm share/texmf-dist/fonts/tfm/public/eulervm/zeusm5.tfm share/texmf-dist/fonts/tfm/public/eulervm/zeusm7.tfm -share/texmf-dist/fonts/tfm/public/eurosym/feybl10.tfm -share/texmf-dist/fonts/tfm/public/eurosym/feybo10.tfm -share/texmf-dist/fonts/tfm/public/eurosym/feybr10.tfm -share/texmf-dist/fonts/tfm/public/eurosym/feyml10.tfm -share/texmf-dist/fonts/tfm/public/eurosym/feymo10.tfm -share/texmf-dist/fonts/tfm/public/eurosym/feymr10.tfm share/texmf-dist/fonts/tfm/public/euxm/euxm10.tfm share/texmf-dist/fonts/tfm/public/euxm/euxm5.tfm share/texmf-dist/fonts/tfm/public/euxm/euxm7.tfm @@ -6310,18 +6287,6 @@ share/texmf-dist/fonts/type1/public/dstroke/dsrom8.pfb share/texmf-dist/fonts/type1/public/dstroke/dsss10.pfb share/texmf-dist/fonts/type1/public/dstroke/dsss12.pfb share/texmf-dist/fonts/type1/public/dstroke/dsss8.pfb -share/texmf-dist/fonts/type1/public/eurosym/feybl10.pfb -share/texmf-dist/fonts/type1/public/eurosym/feybo10.pfb -share/texmf-dist/fonts/type1/public/eurosym/feybr10.pfb -share/texmf-dist/fonts/type1/public/eurosym/feyml10.pfb -share/texmf-dist/fonts/type1/public/eurosym/feymo10.pfb -share/texmf-dist/fonts/type1/public/eurosym/feymr10.pfb -share/texmf-dist/fonts/type1/public/eurosym/geybl10.pfb -share/texmf-dist/fonts/type1/public/eurosym/geybo10.pfb -share/texmf-dist/fonts/type1/public/eurosym/geybr10.pfb -share/texmf-dist/fonts/type1/public/eurosym/geyml10.pfb -share/texmf-dist/fonts/type1/public/eurosym/geymo10.pfb -share/texmf-dist/fonts/type1/public/eurosym/geymr10.pfb share/texmf-dist/fonts/type1/public/fpl/fplbij8a.pfb share/texmf-dist/fonts/type1/public/fpl/fplbj8a.pfb share/texmf-dist/fonts/type1/public/fpl/fplrc8a.pfb @@ -7669,8 +7634,6 @@ share/texmf-dist/tex/latex/dvilj/graybox.sty share/texmf-dist/tex/latex/dvilj/hpfonts.sty share/texmf-dist/tex/latex/eclbip/eclbip.sty share/texmf-dist/tex/latex/eclbip/ecltree.sty -share/texmf-dist/tex/latex/endfloat/efxmpl.cfg -share/texmf-dist/tex/latex/endfloat/endfloat.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 @@ -7682,7 +7645,6 @@ share/texmf-dist/tex/latex/eulervm/eulervm.sty share/texmf-dist/tex/latex/eulervm/uzeuex.fd share/texmf-dist/tex/latex/eulervm/uzeur.fd share/texmf-dist/tex/latex/eulervm/uzeus.fd -share/texmf-dist/tex/latex/eurosym/eurosym.sty share/texmf-dist/tex/latex/example/example.sty share/texmf-dist/tex/latex/extsizes/autopagewidth.sty share/texmf-dist/tex/latex/extsizes/extarticle.cls @@ -7696,7 +7658,6 @@ share/texmf-dist/tex/latex/extsizes/size17.clo share/texmf-dist/tex/latex/extsizes/size20.clo share/texmf-dist/tex/latex/extsizes/size8.clo share/texmf-dist/tex/latex/extsizes/size9.clo -share/texmf-dist/tex/latex/fancybox/fancybox.sty share/texmf-dist/tex/latex/fguill/fguill.sty share/texmf-dist/tex/latex/filecontents/filecontents.sty share/texmf-dist/tex/latex/floatflt/floatflt.sty @@ -8135,7 +8096,6 @@ share/texmf-dist/tex/latex/textfit/textfit.sty share/texmf-dist/tex/latex/textmerg/textmerg.sty share/texmf-dist/tex/latex/textmerg/textmerg.tex share/texmf-dist/tex/latex/textpos/textpos.sty -share/texmf-dist/tex/latex/tocbibind/tocbibind.sty share/texmf-dist/tex/latex/tocloft/tocloft.sty share/texmf-dist/tex/latex/totpages/totpages.sty share/texmf-dist/tex/latex/treesvr/trees.sty |