From 7512a6e5479688e7c4678780ee42e8c0fadc661c Mon Sep 17 00:00:00 2001 From: minskim Date: Tue, 8 May 2012 18:43:46 +0000 Subject: Resolve conflicts between tex-bbold, tex-extsizes, and teTeX-texmf. --- print/teTeX3-texmf/Makefile | 17 ++++++++++++----- print/teTeX3-texmf/PLIST | 44 +------------------------------------------- 2 files changed, 13 insertions(+), 48 deletions(-) (limited to 'print/teTeX3-texmf') diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile index 3d9dc82e945..24c566f1fc1 100644 --- a/print/teTeX3-texmf/Makefile +++ b/print/teTeX3-texmf/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.55 2012/04/18 19:37:35 minskim Exp $ +# $NetBSD: Makefile,v 1.56 2012/05/08 18:43:46 minskim Exp $ # DISTNAME= tetex-texmf-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/} -PKGREVISION= 35 +PKGREVISION= 36 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/} @@ -21,6 +21,7 @@ DEPENDS+= tex-acromake-[0-9]*:../../print/tex-acromake DEPENDS+= tex-advdate-[0-9]*:../../print/tex-advdate DEPENDS+= tex-anonchap-[0-9]*:../../print/tex-anonchap DEPENDS+= tex-algorithms-[0-9]*:../../print/tex-algorithms +DEPENDS+= tex-bbold-[0-9]*:../../fonts/tex-bbold DEPENDS+= tex-beamer-[0-9]*:../../print/tex-beamer DEPENDS+= tex-bezos-[0-9]*:../../print/tex-bezos DEPENDS+= tex-bibtex-[0-9]*:../../print/tex-bibtex @@ -60,6 +61,7 @@ DEPENDS+= tex-esint-[0-9]*:../../fonts/tex-esint DEPENDS+= tex-eso-pic-[0-9]*:../../print/tex-eso-pic DEPENDS+= tex-exam-[0-9]*:../../print/tex-exam DEPENDS+= tex-excludeonly-[0-9]*:../../print/tex-excludeonly +DEPENDS+= tex-extsizes-[0-9]*:../../print/tex-extsizes DEPENDS+= tex-fancybox-[0-9]*:../../print/tex-fancybox DEPENDS+= tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb DEPENDS+= tex-float-[0-9]*:../../print/tex-float @@ -280,6 +282,7 @@ post-extract: rm -rf ${WRKSRC}/doc/generic/x* rm -rf ${WRKSRC}/doc/latex/a[f-m]* rm -rf ${WRKSRC}/doc/latex/base + rm -rf ${WRKSRC}/doc/latex/bbold rm -rf ${WRKSRC}/doc/latex/be* rm -rf ${WRKSRC}/doc/latex/bibtopic rm -rf ${WRKSRC}/doc/latex/booktabs @@ -289,7 +292,7 @@ post-extract: rm -rf ${WRKSRC}/doc/latex/e[d-n]* rm -rf ${WRKSRC}/doc/latex/eso-pic rm -rf ${WRKSRC}/doc/latex/euler - rm -rf ${WRKSRC}/doc/latex/exam + rm -rf ${WRKSRC}/doc/latex/ex* rm -rf ${WRKSRC}/doc/latex/fa* rm -rf ${WRKSRC}/doc/latex/float rm -rf ${WRKSRC}/doc/latex/footmisc @@ -370,6 +373,7 @@ post-extract: rm -rf ${WRKSRC}/fonts/source/ams rm -rf ${WRKSRC}/fonts/source/jknappen/[a-r]* rm -rf ${WRKSRC}/fonts/source/lh + rm -rf ${WRKSRC}/fonts/source/public/bbold rm -rf ${WRKSRC}/fonts/source/public/cm rm -rf ${WRKSRC}/fonts/source/public/cmextra rm -rf ${WRKSRC}/fonts/source/public/esint @@ -384,12 +388,13 @@ post-extract: rm -rf ${WRKSRC}/fonts/tfm/adobe/[a-ln-z]* rm -rf ${WRKSRC}/fonts/tfm/ams rm -rf ${WRKSRC}/fonts/tfm/bitstrea + rm -rf ${WRKSRC}/fonts/tfm/bitstrea rm -rf ${WRKSRC}/fonts/tfm/cg/cou* rm -rf ${WRKSRC}/fonts/tfm/cg/[h-kp-s]* rm -rf ${WRKSRC}/fonts/tfm/cg/times rm -rf ${WRKSRC}/fonts/tfm/[d-o]* - rm -rf ${WRKSRC}/fonts/tfm/public/t* rm -rf ${WRKSRC}/fonts/tfm/public/ae* + rm -rf ${WRKSRC}/fonts/tfm/public/bbold rm -rf ${WRKSRC}/fonts/tfm/public/cm rm -rf ${WRKSRC}/fonts/tfm/public/cm[c-z]* rm -rf ${WRKSRC}/fonts/tfm/public/eurosym @@ -400,7 +405,7 @@ post-extract: rm -f ${WRKSRC}/fonts/tfm/public/misc/[b-q]*.tfm rm -rf ${WRKSRC}/fonts/tfm/public/pazo rm -rf ${WRKSRC}/fonts/tfm/public/pxfonts - rm -rf ${WRKSRC}/fonts/tfm/public/[r-s]* + rm -rf ${WRKSRC}/fonts/tfm/public/[r-t]* rm -rf ${WRKSRC}/fonts/tfm/public/w* rm -rf ${WRKSRC}/fonts/tfm/public/xypic rm -rf ${WRKSRC}/fonts/tfm/yandy/times @@ -455,6 +460,7 @@ post-extract: rm -rf ${WRKSRC}/tex/latex/ae rm -rf ${WRKSRC}/tex/latex/a[f-m]* rm -rf ${WRKSRC}/tex/latex/base + rm -rf ${WRKSRC}/tex/latex/bbold rm -rf ${WRKSRC}/tex/latex/be* rm -rf ${WRKSRC}/tex/latex/bibtopic rm -rf ${WRKSRC}/tex/latex/bo* @@ -472,6 +478,7 @@ post-extract: rm -rf ${WRKSRC}/tex/latex/euler rm -rf ${WRKSRC}/tex/latex/eurosym rm -rf ${WRKSRC}/tex/latex/exam + rm -rf ${WRKSRC}/tex/latex/extsizes rm -rf ${WRKSRC}/tex/latex/fa* rm -rf ${WRKSRC}/tex/latex/float rm -rf ${WRKSRC}/tex/latex/fnpara diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST index 731b0aa2fc4..321418dd717 100644 --- a/print/teTeX3-texmf/PLIST +++ b/print/teTeX3-texmf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.32 2012/04/18 19:37:35 minskim Exp $ +@comment $NetBSD: PLIST,v 1.33 2012/05/08 18:43:46 minskim Exp $ share/texmf-dist/aliases share/texmf-dist/bibtex/bst/adrconv/adrconv.bst share/texmf-dist/bibtex/bst/adrconv/adrfax.bst @@ -2587,7 +2587,6 @@ share/texmf-dist/doc/latex/appendix/README 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/bibunits/00Readme share/texmf-dist/doc/latex/bibunits/bibtexall share/texmf-dist/doc/latex/bibunits/bibunits.dvi @@ -2653,7 +2652,6 @@ share/texmf-dist/doc/latex/esint/esint.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 -share/texmf-dist/doc/latex/extsizes/readme.extsizes share/texmf-dist/doc/latex/filecontents/filecontents.dvi share/texmf-dist/doc/latex/floatflt/floatexm.dvi share/texmf-dist/doc/latex/floatflt/floatexm.tex @@ -3488,24 +3486,6 @@ share/texmf-dist/fonts/source/public/bbm/blbord.mf share/texmf-dist/fonts/source/public/bbm/blbordl.mf share/texmf-dist/fonts/source/public/bbm/blbordsp.mf share/texmf-dist/fonts/source/public/bbm/blbordu.mf -share/texmf-dist/fonts/source/public/bbold/bbbase.mf -share/texmf-dist/fonts/source/public/bbold/bbgreekl.mf -share/texmf-dist/fonts/source/public/bbold/bbgreeku.mf -share/texmf-dist/fonts/source/public/bbold/bbligs.mf -share/texmf-dist/fonts/source/public/bbold/bblower.mf -share/texmf-dist/fonts/source/public/bbold/bbnum.mf -share/texmf-dist/fonts/source/public/bbold/bbold.mf -share/texmf-dist/fonts/source/public/bbold/bbold10.mf -share/texmf-dist/fonts/source/public/bbold/bbold12.mf -share/texmf-dist/fonts/source/public/bbold/bbold17.mf -share/texmf-dist/fonts/source/public/bbold/bbold5.mf -share/texmf-dist/fonts/source/public/bbold/bbold6.mf -share/texmf-dist/fonts/source/public/bbold/bbold7.mf -share/texmf-dist/fonts/source/public/bbold/bbold8.mf -share/texmf-dist/fonts/source/public/bbold/bbold9.mf -share/texmf-dist/fonts/source/public/bbold/bbparams.mf -share/texmf-dist/fonts/source/public/bbold/bbpunc.mf -share/texmf-dist/fonts/source/public/bbold/bbupper.mf share/texmf-dist/fonts/source/public/cbgreek/cbaccent.mf share/texmf-dist/fonts/source/public/cbgreek/cbbase.mf share/texmf-dist/fonts/source/public/cbgreek/cbdigits.mf @@ -4758,14 +4738,6 @@ share/texmf-dist/fonts/tfm/public/bbm/bbmtt12.tfm share/texmf-dist/fonts/tfm/public/bbm/bbmtt8.tfm share/texmf-dist/fonts/tfm/public/bbm/bbmtt9.tfm share/texmf-dist/fonts/tfm/public/bbm/bbmvtt10.tfm -share/texmf-dist/fonts/tfm/public/bbold/bbold10.tfm -share/texmf-dist/fonts/tfm/public/bbold/bbold12.tfm -share/texmf-dist/fonts/tfm/public/bbold/bbold17.tfm -share/texmf-dist/fonts/tfm/public/bbold/bbold5.tfm -share/texmf-dist/fonts/tfm/public/bbold/bbold6.tfm -share/texmf-dist/fonts/tfm/public/bbold/bbold7.tfm -share/texmf-dist/fonts/tfm/public/bbold/bbold8.tfm -share/texmf-dist/fonts/tfm/public/bbold/bbold9.tfm share/texmf-dist/fonts/tfm/public/cc-pl/pccsc10.tfm share/texmf-dist/fonts/tfm/public/cc-pl/pcmi10.tfm share/texmf-dist/fonts/tfm/public/cc-pl/pcr10.tfm @@ -6287,8 +6259,6 @@ share/texmf-dist/tex/latex/bbm/bbm.sty share/texmf-dist/tex/latex/bbm/ubbm.fd 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/bibunits/bibunits.sty share/texmf-dist/tex/latex/calrsfs/calrsfs.sty share/texmf-dist/tex/latex/ccaption/ccaption.sty @@ -6387,18 +6357,6 @@ 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/example/example.sty -share/texmf-dist/tex/latex/extsizes/autopagewidth.sty -share/texmf-dist/tex/latex/extsizes/extarticle.cls -share/texmf-dist/tex/latex/extsizes/extbook.cls -share/texmf-dist/tex/latex/extsizes/extletter.cls -share/texmf-dist/tex/latex/extsizes/extproc.cls -share/texmf-dist/tex/latex/extsizes/extreport.cls -share/texmf-dist/tex/latex/extsizes/extsizes.sty -share/texmf-dist/tex/latex/extsizes/size14.clo -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/fguill/fguill.sty share/texmf-dist/tex/latex/filecontents/filecontents.sty share/texmf-dist/tex/latex/floatflt/floatflt.sty -- cgit v1.2.3