diff options
author | minskim <minskim> | 2012-04-02 18:07:35 +0000 |
---|---|---|
committer | minskim <minskim> | 2012-04-02 18:07:35 +0000 |
commit | 59f3aac21357608959d6df2e04a54dc93f535db3 (patch) | |
tree | c5c3d35fe4c6c3369a8647e0c5e6214dc597c595 /print | |
parent | 4731ee74875251c460babfb78ffb33960c2d5941 (diff) | |
download | pkgsrc-59f3aac21357608959d6df2e04a54dc93f535db3.tar.gz |
Resolve conflicts between teTeX-texmf and recent TeX Live packages.
This fixes PR 45902 and PR 46220.
Diffstat (limited to 'print')
-rw-r--r-- | print/teTeX3-texmf/Makefile | 14 | ||||
-rw-r--r-- | print/teTeX3-texmf/PLIST | 37 |
2 files changed, 11 insertions, 40 deletions
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile index a5014718c94..088dc9b4628 100644 --- a/print/teTeX3-texmf/Makefile +++ b/print/teTeX3-texmf/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.53 2011/11/06 08:46:11 minskim Exp $ +# $NetBSD: Makefile,v 1.54 2012/04/02 18:07:35 minskim Exp $ # DISTNAME= tetex-texmf-3.0 PKGNAME= ${DISTNAME:C/tetex/teTeX/} -PKGREVISION= 33 +PKGREVISION= 34 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=obsolete/systems/unix/teTeX/3.0/distrib/} @@ -48,6 +48,7 @@ DEPENDS+= tex-collection-genericrecommended>=2010:../../print/tex-collection-gen DEPENDS+= tex-collection-latex>=2010:../../print/tex-collection-latex DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl DEPENDS+= tex-context>=2009:../../print/tex-context +DEPENDS+= tex-cweb-[0-9]*:../../print/tex-cweb DEPENDS+= tex-cyrillic>=2009:../../print/tex-cyrillic DEPENDS+= tex-dblfloatfix-[0-9]*:../../print/tex-dblfloatfix DEPENDS+= tex-ec>=1.0:../../fonts/tex-ec @@ -108,6 +109,7 @@ DEPENDS+= tex-jurabib-[0-9]*:../../print/tex-jurabib DEPENDS+= tex-kix-[0-9]*:../../print/tex-kix DEPENDS+= tex-koma-script-[0-9]*:../../print/tex-koma-script DEPENDS+= tex-lambda-[0-9]*:../../print/tex-lambda +DEPENDS+= tex-lastpage-[0-9]*:../../print/tex-lastpage DEPENDS+= tex-listing-[0-9]*:../../print/tex-listing DEPENDS+= tex-listings-[0-9]*:../../print/tex-listings DEPENDS+= tex-lh>=3.5g:../../fonts/tex-lh @@ -201,7 +203,6 @@ EXTRACT_ELEMENTS+= omega EXTRACT_ELEMENTS+= release-tetex-texmf.txt EXTRACT_ELEMENTS+= scripts EXTRACT_ELEMENTS+= tex -EXTRACT_ELEMENTS+= texdoctk WRKSRC= ${WRKDIR}/tetex EXTRACT_DIR= ${WRKSRC} @@ -274,6 +275,7 @@ post-extract: rm -rf ${WRKSRC}/doc/generic/multido rm -rf ${WRKSRC}/doc/generic/pstricks rm -rf ${WRKSRC}/doc/generic/tex-ps + rm -rf ${WRKSRC}/doc/generic/u* rm -rf ${WRKSRC}/doc/generic/x* rm -rf ${WRKSRC}/doc/latex/a[f-m]* rm -rf ${WRKSRC}/doc/latex/base @@ -295,6 +297,7 @@ post-extract: rm -rf ${WRKSRC}/doc/latex/h* rm -rf ${WRKSRC}/doc/latex/jurabib rm -rf ${WRKSRC}/doc/latex/k* + rm -rf ${WRKSRC}/doc/latex/lastpage rm -rf ${WRKSRC}/doc/latex/lis* rm -rf ${WRKSRC}/doc/latex/m[e-g]* rm -rf ${WRKSRC}/doc/latex/mi* @@ -321,6 +324,7 @@ post-extract: rm -rf ${WRKSRC}/doc/latex/wasysym rm -rf ${WRKSRC}/doc/latex/wrapfig rm -rf ${WRKSRC}/doc/latex/xcolor + rm -rf ${WRKSRC}/doc/programs rm -rf ${WRKSRC}/doc/m[a-j]* rm -rf ${WRKSRC}/doc/pdftex rm -rf ${WRKSRC}/dvips/[b-n]* @@ -481,6 +485,7 @@ post-extract: rm -rf ${WRKSRC}/tex/latex/hyp* rm -rf ${WRKSRC}/tex/latex/jurabib rm -rf ${WRKSRC}/tex/latex/k* + rm -rf ${WRKSRC}/tex/latex/lastpage rm -rf ${WRKSRC}/tex/latex/lis* rm -rf ${WRKSRC}/tex/latex/lm rm -rf ${WRKSRC}/tex/latex/marvosym @@ -528,7 +533,7 @@ post-extract: rm -rf ${WRKSRC}/tex/latex/xcolor 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/[c-gmp-z]* rm -f ${WRKSRC}/tex/plain/base/letter* rm -rf ${WRKSRC}/tex/plain/[c-f]* rm -rf ${WRKSRC}/tex/plain/[i-l]* @@ -536,6 +541,7 @@ post-extract: rm -rf ${WRKSRC}/tex/plain/pdfcolor rm -rf ${WRKSRC}/tex/plain/[r-u]* rm -rf ${WRKSRC}/tex/plain/[w-z]* + rm -rf ${WRKSRC}/tex/platex do-install: cd ${WRKSRC} && pax -wr -s ',.*\.orig$$,,' * ${DESTDIR}${PREFIX}/share/texmf-dist diff --git a/print/teTeX3-texmf/PLIST b/print/teTeX3-texmf/PLIST index 81e1c3dc395..7724762b1a2 100644 --- a/print/teTeX3-texmf/PLIST +++ b/print/teTeX3-texmf/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.30 2011/11/06 08:46:11 minskim Exp $ +@comment $NetBSD: PLIST,v 1.31 2012/04/02 18:07:35 minskim Exp $ share/texmf-dist/aliases share/texmf-dist/bibtex/bst/adrconv/adrconv.bst share/texmf-dist/bibtex/bst/adrconv/adrfax.bst @@ -165,18 +165,6 @@ share/texmf-dist/doc/generic/texdraw/ChangeLog share/texmf-dist/doc/generic/texdraw/texdraw.ps share/texmf-dist/doc/generic/texdraw/txdexamp.latex share/texmf-dist/doc/generic/thumbpdf/readme.txt -share/texmf-dist/doc/generic/ukrhyph/README -share/texmf-dist/doc/generic/ukrhyph/rules.ps -share/texmf-dist/doc/generic/ukrhyph/rules.tex -share/texmf-dist/doc/generic/ukrhyph/rules60.pdf -share/texmf-dist/doc/generic/ukrhyph/rules60.ps -share/texmf-dist/doc/generic/ukrhyph/rules60.tex -share/texmf-dist/doc/generic/ukrhyph/rules90.pdf -share/texmf-dist/doc/generic/ukrhyph/rules90.ps -share/texmf-dist/doc/generic/ukrhyph/rules90.tex -share/texmf-dist/doc/generic/ukrhyph/rules_ph.pdf -share/texmf-dist/doc/generic/ukrhyph/rules_ph.ps -share/texmf-dist/doc/generic/ukrhyph/rules_ph.tex share/texmf-dist/doc/generic/vntex/README share/texmf-dist/doc/generic/vntex/TODO share/texmf-dist/doc/generic/vntex/testbookmarks.tex @@ -2701,7 +2689,6 @@ share/texmf-dist/doc/latex/index/sample.tex share/texmf-dist/doc/latex/jknappen/mathbbol.rme share/texmf-dist/doc/latex/jknappen/mathrsfs.rme share/texmf-dist/doc/latex/labels/labels.dvi -share/texmf-dist/doc/latex/lastpage/lastpage.dvi share/texmf-dist/doc/latex/layouts/layman.dvi share/texmf-dist/doc/latex/leftidx/leftidx.dvi share/texmf-dist/doc/latex/lettrine/00README @@ -2902,20 +2889,6 @@ share/texmf-dist/doc/polish/mex/utf8mex/test-math.utf8.tex share/texmf-dist/doc/polish/mex/utf8mex/test.utf8.tex share/texmf-dist/doc/polish/mex/utf8mex/utf8math.el share/texmf-dist/doc/polish/web2c.html -share/texmf-dist/doc/programs/cwebman.dvi -share/texmf-dist/doc/programs/dvipdfm.dvi -share/texmf-dist/doc/programs/dvipdfm.pdf -share/texmf-dist/doc/programs/dvipng.dvi -share/texmf-dist/doc/programs/dvipng.pdf -share/texmf-dist/doc/programs/dvips.dvi -share/texmf-dist/doc/programs/dvips.pdf -share/texmf-dist/doc/programs/kpathsea.dvi -share/texmf-dist/doc/programs/kpathsea.pdf -share/texmf-dist/doc/programs/pdfcrop.txt -share/texmf-dist/doc/programs/texinfo.dvi -share/texmf-dist/doc/programs/texinfo.pdf -share/texmf-dist/doc/programs/web2c.dvi -share/texmf-dist/doc/programs/web2c.pdf share/texmf-dist/doc/tdphp/INSTALL share/texmf-dist/doc/tdphp/config.php share/texmf-dist/doc/tdphp/css.php @@ -6466,7 +6439,6 @@ share/texmf-dist/tex/latex/jknappen/ubbold.fd share/texmf-dist/tex/latex/jknappen/ursfs.fd share/texmf-dist/tex/latex/labels/labels.sty share/texmf-dist/tex/latex/labels/olabels.sty -share/texmf-dist/tex/latex/lastpage/lastpage.sty share/texmf-dist/tex/latex/layouts/layouts.sty share/texmf-dist/tex/latex/leftidx/leftidx.sty share/texmf-dist/tex/latex/lettrine/lettrine.cfg @@ -6719,7 +6691,6 @@ share/texmf-dist/tex/mex/utf8mex/utf8plsq.tex share/texmf-dist/tex/plain/antt/ofs-8x.tex share/texmf-dist/tex/plain/antt/pantyk.tex share/texmf-dist/tex/plain/arrow/arrow.tex -share/texmf-dist/tex/plain/base/cwebmac.tex share/texmf-dist/tex/plain/base/logmac.tex share/texmf-dist/tex/plain/base/ordwebmac.tex share/texmf-dist/tex/plain/btxmac/btxmac.tex @@ -6746,10 +6717,6 @@ share/texmf-dist/tex/plain/vietnam/plainenc.tex share/texmf-dist/tex/plain/vietnam/plnfss.tex share/texmf-dist/tex/plain/vietnam/t5cmr.pfd share/texmf-dist/tex/plain/vietnam/t5code.tex -share/texmf-dist/tex/platex/config/hyphen.cfg -share/texmf-dist/tex/platex/config/language.dat -share/texmf-dist/tex/platex/config/pdfplatex.ini -share/texmf-dist/tex/platex/config/platex.ini share/texmf-dist/tex/texinfo/texinfo.ini share/texmf-dist/tex/texinfo/texinfo.tex share/texmf-dist/tex/texinfo/txi-cs.tex @@ -6764,5 +6731,3 @@ share/texmf-dist/tex/texinfo/txi-pl.tex share/texmf-dist/tex/texinfo/txi-pt.tex share/texmf-dist/tex/texinfo/txi-tr.tex share/texmf-dist/tex/texinfo/vntexinfo.tex -share/texmf-dist/texdoctk/texdocrc.defaults -share/texmf-dist/texdoctk/texdoctk.dat |