pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/teTeX3-texmf - Resolve conflicts with tex-collec...
details: https://anonhg.NetBSD.org/pkgsrc/rev/44c146989f4e
branches: trunk
changeset: 574976:44c146989f4e
user: minskim <minskim%pkgsrc.org@localhost>
date: Fri Apr 30 18:55:00 2010 +0000
description:
- Resolve conflicts with tex-collection-basic.
- Depend on packages separated from tex-ltxmisc.
diffstat:
print/teTeX3-texmf/Makefile | 69 +++++++++++++++++++++++++++++-----
print/teTeX3-texmf/PLIST | 89 +--------------------------------------------
2 files changed, 59 insertions(+), 99 deletions(-)
diffs (truncated from 303 to 300 lines):
diff -r efa0fedd70cb -r 44c146989f4e print/teTeX3-texmf/Makefile
--- a/print/teTeX3-texmf/Makefile Fri Apr 30 18:54:00 2010 +0000
+++ b/print/teTeX3-texmf/Makefile Fri Apr 30 18:55:00 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2010/04/09 22:04:37 markd Exp $
+# $NetBSD: Makefile,v 1.42 2010/04/30 18:55:00 minskim Exp $
#
DISTNAME= tetex-texmf-3.0
PKGNAME= ${DISTNAME:C/tetex/teTeX/}
-PKGREVISION= 23
+PKGREVISION= 24
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
@@ -15,28 +15,54 @@
NOT_FOR_BULK_PLATFORM= HPUX-*-*
CONFLICTS+= teTeX-share-[0-9]*
+DEPENDS+= tex-a4wide-[0-9]*:../../print/tex-a4wide
+DEPENDS+= tex-a5comb-[0-9]*:../../print/tex-a5comb
+DEPENDS+= tex-acromake-[0-9]*:../../print/tex-acromake
+DEPENDS+= tex-advdate-[0-9]*:../../print/tex-advdate
DEPENDS+= tex-ae-[0-9]*:../../fonts/tex-ae
+DEPENDS+= tex-anonchap-[0-9]*:../../print/tex-anonchap
DEPENDS+= tex-algorithms-[0-9]*:../../print/tex-algorithms
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-beamer-[0-9]*:../../print/tex-beamer
DEPENDS+= tex-bibtex-[0-9]*:../../print/tex-bibtex
+DEPENDS+= tex-block-[0-9]*:../../print/tex-block
+DEPENDS+= tex-bold-extra-[0-9]*:../../print/tex-bold-extra
+DEPENDS+= tex-boxedminipage-[0-9]*:../../print/tex-boxedminipage
+DEPENDS+= tex-braket-[0-9]*:../../print/tex-braket
+DEPENDS+= tex-breakcites-[0-9]*:../../print/tex-breakcites
+DEPENDS+= tex-cancel-[0-9]*:../../print/tex-cancel
+DEPENDS+= tex-capt-of-[0-9]*:../../print/tex-capt-of
+DEPENDS+= tex-captdef-[0-9]*:../../print/tex-captdef
DEPENDS+= tex-caption-[0-9]*:../../print/tex-caption
DEPENDS+= tex-carlisle-[0-9]*:../../print/tex-carlisle
+DEPENDS+= tex-cases-[0-9]*:../../print/tex-cases
+DEPENDS+= tex-chbibref-[0-9]*:../../print/tex-chbibref
+DEPENDS+= tex-chngcntr-[0-9]*:../../print/tex-chngcntr
+DEPENDS+= tex-changepage-[0-9]*:../../print/tex-changepage
+DEPENDS+= tex-circle-[0-9]*:../../print/tex-circle
DEPENDS+= tex-cite-[0-9]*:../../print/tex-cite
+DEPENDS+= tex-collection-basic-[0-9]*:../../print/tex-collection-basic
DEPENDS+= tex-colortbl-[0-9]*:../../print/tex-colortbl
DEPENDS+= tex-courier-[0-9]*:../../fonts/tex-courier
-DEPENDS+= tex-dvips-[0-9]*:../../print/tex-dvips
-DEPENDS+= tex-enctex-[0-9]*:../../print/tex-enctex
+DEPENDS+= tex-dblfloatfix-[0-9]*:../../print/tex-dblfloatfix
+DEPENDS+= tex-endnotes-[0-9]*:../../print/tex-endnotes
DEPENDS+= tex-enumitem-[0-9]*:../../print/tex-enumitem
DEPENDS+= tex-exam-[0-9]*:../../print/tex-exam
+DEPENDS+= tex-excludeonly-[0-9]*:../../print/tex-excludeonly
DEPENDS+= tex-fancyhdr-[0-9]*:../../print/tex-fancyhdr
DEPENDS+= tex-fancyvrb-[0-9]*:../../print/tex-fancyvrb
DEPENDS+= tex-float-[0-9]*:../../print/tex-float
+DEPENDS+= tex-fncylab-[0-9]*:../../print/tex-fncylab
+DEPENDS+= tex-fnpara-[0-9]*:../../print/tex-fnpara
DEPENDS+= tex-footmisc-[0-9]*:../../print/tex-footmisc
+DEPENDS+= tex-framed-[0-9]*:../../print/tex-framed
+DEPENDS+= tex-ftcap-[0-9]*:../../print/tex-ftcap
+DEPENDS+= tex-fwlw-[0-9]*:../../print/tex-fwlw
DEPENDS+= tex-geometry-[0-9]*:../../print/tex-geometry
DEPENDS+= tex-helvetic-[0-9]*:../../fonts/tex-helvetic
+DEPENDS+= tex-hypernat-[0-9]*:../../print/tex-hypernat
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
@@ -69,41 +95,60 @@
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-ifmtarg-[0-9]*:../../print/tex-ifmtarg
+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-latex-[0-9]*:../../print/tex-latex
+DEPENDS+= tex-listing-[0-9]*:../../print/tex-listing
DEPENDS+= tex-listings-[0-9]*:../../print/tex-listings
DEPENDS+= tex-lm-[0-9]*:../../fonts/tex-lm
-DEPENDS+= tex-ltxmisc-[0-9]*:../../print/tex-ltxmisc
+DEPENDS+= tex-ltxmisc>=2009:../../print/tex-ltxmisc
+DEPENDS+= tex-magaz-[0-9]*:../../print/tex-magaz
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-midpage-[0-9]*:../../print/tex-midpage
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-needspace-[0-9]*:../../print/tex-needspace
+DEPENDS+= tex-nextpage-[0-9]*:../../print/tex-nextpage
DEPENDS+= tex-nomencl-[0-9]*:../../print/tex-nomencl
-DEPENDS+= tex-oberdiek-[0-9]*:../../print/tex-oberdiek
+DEPENDS+= tex-oberdiek>=2009:../../print/tex-oberdiek
+DEPENDS+= tex-oubraces-[0-9]*:../../print/tex-oubraces
DEPENDS+= tex-paralist-[0-9]*:../../print/tex-paralist
DEPENDS+= tex-placeins-[0-9]*:../../print/tex-placeins
DEPENDS+= tex-placeins-plain-[0-9]*:../../print/tex-placeins-plain
DEPENDS+= tex-preprint-[0-9]*:../../print/tex-preprint
+DEPENDS+= tex-printlen-[0-9]*:../../print/tex-printlen
+DEPENDS+= tex-relsize-[0-9]*:../../print/tex-relsize
DEPENDS+= tex-rotating-[0-9]*:../../print/tex-rotating
DEPENDS+= tex-rsfs-[0-9]*:../../fonts/tex-rsfs
+DEPENDS+= tex-sansmath-[0-9]*:../../print/tex-sansmath
DEPENDS+= tex-sectsty-[0-9]*:../../print/tex-sectsty
+DEPENDS+= tex-selectp-[0-9]*:../../print/tex-selectp
DEPENDS+= tex-setspace-[0-9]*:../../print/tex-setspace
DEPENDS+= tex-stmaryrd-[0-9]*:../../fonts/tex-stmaryrd
DEPENDS+= tex-subfigure-[0-9]*:../../print/tex-subfigure
DEPENDS+= tex-subfig-[0-9]*:../../print/tex-subfig
DEPENDS+= tex-symbol-[0-9]*:../../fonts/tex-symbol
+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-tools-[0-9]*:../../print/tex-tools
+DEPENDS+= tex-twoinone-[0-9]*:../../print/tex-twoinone
DEPENDS+= tex-txfonts-[0-9]*:../../fonts/tex-txfonts
DEPENDS+= tex-type1cm-[0-9]*:../../print/tex-type1cm
+DEPENDS+= tex-ulem-[0-9]*:../../print/tex-ulem
+DEPENDS+= tex-url-[0-9]*:../../print/tex-url
+DEPENDS+= tex-verbdef-[0-9]*:../../print/tex-verbdef
+DEPENDS+= tex-version-[0-9]*:../../print/tex-version
+DEPENDS+= tex-vertbars-[0-9]*:../../print/tex-vertbars
+DEPENDS+= tex-vruler-[0-9]*:../../print/tex-vruler
DEPENDS+= tex-wasy-[0-9]*:../../fonts/tex-wasy
DEPENDS+= tex-xcolor-[0-9]*:../../print/tex-xcolor
DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval
@@ -182,12 +227,15 @@
rm -rf ${WRKSRC}/doc/etex
rm -rf ${WRKSRC}/doc/fonts/ae*
rm -rf ${WRKSRC}/doc/fonts/am*
+ rm -rf ${WRKSRC}/doc/fonts/cm
rm -rf ${WRKSRC}/doc/fonts/lm
rm -rf ${WRKSRC}/doc/fonts/mar*
rm -rf ${WRKSRC}/doc/fonts/t*
rm -rf ${WRKSRC}/doc/generic/[a-f]*
+ rm -rf ${WRKSRC}/doc/generic/[a-g]*
rm -rf ${WRKSRC}/doc/generic/xk*
rm -rf ${WRKSRC}/doc/latex/a[f-m]*
+ rm -rf ${WRKSRC}/doc/latex/base
rm -rf ${WRKSRC}/doc/latex/beamer
rm -rf ${WRKSRC}/doc/latex/ca*
rm -rf ${WRKSRC}/doc/latex/enumitem
@@ -298,6 +346,7 @@
rm -rf ${WRKSRC}/fonts/vf/yandy/times
rm -rf ${WRKSRC}/metafont/[a-l]*
rm -f ${WRKSRC}/metafont/misc/[a-w]*
+ rm -rf ${WRKSRC}/mft
rm -rf ${WRKSRC}/omega/ocp/misc
rm -rf ${WRKSRC}/omega/otp/misc
rm -rf ${WRKSRC}/tex/generic/[a-b]*
@@ -378,9 +427,7 @@
rm -rf ${WRKSRC}/tex/plain/amsfonts
rm -f ${WRKSRC}/tex/plain/base/[gmp-z]*
rm -f ${WRKSRC}/tex/plain/base/letter*
- rm -rf ${WRKSRC}/tex/plain/[c-d]*
- rm -rf ${WRKSRC}/tex/plain/etex
- rm -rf ${WRKSRC}/tex/plain/fontchart
+ rm -rf ${WRKSRC}/tex/plain/[c-f]*
rm -rf ${WRKSRC}/tex/plain/[i-l]*
rm -rf ${WRKSRC}/tex/plain/mproof
rm -rf ${WRKSRC}/tex/plain/pdfcolor
diff -r efa0fedd70cb -r 44c146989f4e print/teTeX3-texmf/PLIST
--- a/print/teTeX3-texmf/PLIST Fri Apr 30 18:54:00 2010 +0000
+++ b/print/teTeX3-texmf/PLIST Fri Apr 30 18:55:00 2010 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2010/04/09 22:04:37 markd Exp $
+@comment $NetBSD: PLIST,v 1.21 2010/04/30 18:55:00 minskim Exp $
share/texmf-dist/aliases
share/texmf-dist/bibtex/bib/plbib/plbib.bib
share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
@@ -129,7 +129,6 @@
share/texmf-dist/doc/fonts/bluesky/README
share/texmf-dist/doc/fonts/cbgreek/cbgreek.txt
share/texmf-dist/doc/fonts/charter/readme.charter
-share/texmf-dist/doc/fonts/cm/README
share/texmf-dist/doc/fonts/cmbright/cmbright.dvi
share/texmf-dist/doc/fonts/cmbright/copyrite.txt
share/texmf-dist/doc/fonts/cmbright/manifest.txt
@@ -253,7 +252,6 @@
share/texmf-dist/doc/fonts/pxfonts/pxfontsdocA4.pdf
share/texmf-dist/doc/fonts/urw/base35/COPYING
share/texmf-dist/doc/fonts/urw/base35/README.base35
-share/texmf-dist/doc/generic/german/gerdoc.dvi
share/texmf-dist/doc/generic/hyphen/README.dkhyphen
share/texmf-dist/doc/generic/localloc/localloc.dvi
share/texmf-dist/doc/generic/localloc/localtst.tex
@@ -2902,73 +2900,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/base/00readme.txt
-share/texmf-dist/doc/latex/base/alltt.dvi
-share/texmf-dist/doc/latex/base/amiweb2c.txt
-share/texmf-dist/doc/latex/base/autoload.txt
-share/texmf-dist/doc/latex/base/begleit.err
-share/texmf-dist/doc/latex/base/bugs.txt
-share/texmf-dist/doc/latex/base/cfgguide.dvi
-share/texmf-dist/doc/latex/base/changes.txt
-share/texmf-dist/doc/latex/base/clsguide.dvi
-share/texmf-dist/doc/latex/base/compan.err
-share/texmf-dist/doc/latex/base/cstex.txt
-share/texmf-dist/doc/latex/base/cyrguide.dvi
-share/texmf-dist/doc/latex/base/decustex.txt
-share/texmf-dist/doc/latex/base/directex.txt
-share/texmf-dist/doc/latex/base/doc.dvi
-share/texmf-dist/doc/latex/base/docstrip.dvi
-share/texmf-dist/doc/latex/base/emtex.txt
-share/texmf-dist/doc/latex/base/emtextds.txt
-share/texmf-dist/doc/latex/base/fntguide.dvi
-share/texmf-dist/doc/latex/base/ifthen.dvi
-share/texmf-dist/doc/latex/base/inputenc.dvi
-share/texmf-dist/doc/latex/base/install.txt
-share/texmf-dist/doc/latex/base/legal.txt
-share/texmf-dist/doc/latex/base/lindner.txt
-share/texmf-dist/doc/latex/base/lppl-1-0.txt
-share/texmf-dist/doc/latex/base/lppl-1-1.txt
-share/texmf-dist/doc/latex/base/lppl-1-2.txt
-share/texmf-dist/doc/latex/base/lppl.txt
-share/texmf-dist/doc/latex/base/ltnews01.dvi
-share/texmf-dist/doc/latex/base/ltnews02.dvi
-share/texmf-dist/doc/latex/base/ltnews03.dvi
-share/texmf-dist/doc/latex/base/ltnews04.dvi
-share/texmf-dist/doc/latex/base/ltnews05.dvi
-share/texmf-dist/doc/latex/base/ltnews06.dvi
-share/texmf-dist/doc/latex/base/ltnews07.dvi
-share/texmf-dist/doc/latex/base/ltnews08.dvi
-share/texmf-dist/doc/latex/base/ltnews09.dvi
-share/texmf-dist/doc/latex/base/ltnews10.dvi
-share/texmf-dist/doc/latex/base/ltnews11.dvi
-share/texmf-dist/doc/latex/base/ltnews12.dvi
-share/texmf-dist/doc/latex/base/ltnews13.dvi
-share/texmf-dist/doc/latex/base/ltnews14.dvi
-share/texmf-dist/doc/latex/base/ltnews15.dvi
-share/texmf-dist/doc/latex/base/ltnews16.dvi
-share/texmf-dist/doc/latex/base/ltx3info.dvi
-share/texmf-dist/doc/latex/base/makeindx.dvi
-share/texmf-dist/doc/latex/base/manifest.txt
-share/texmf-dist/doc/latex/base/manual.err
-share/texmf-dist/doc/latex/base/microtex.txt
-share/texmf-dist/doc/latex/base/miktex.txt
-share/texmf-dist/doc/latex/base/modguide.dvi
-share/texmf-dist/doc/latex/base/multitex.txt
-share/texmf-dist/doc/latex/base/oztex.txt
-share/texmf-dist/doc/latex/base/pastex.txt
-share/texmf-dist/doc/latex/base/patches.txt
-share/texmf-dist/doc/latex/base/pctex.txt
-share/texmf-dist/doc/latex/base/template.txt
-share/texmf-dist/doc/latex/base/tex2.txt
-share/texmf-dist/doc/latex/base/texpert.txt
-share/texmf-dist/doc/latex/base/textures.txt
-share/texmf-dist/doc/latex/base/truetex.txt
-share/texmf-dist/doc/latex/base/usrguide.dvi
-share/texmf-dist/doc/latex/base/vtex.txt
-share/texmf-dist/doc/latex/base/vtexfree.txt
-share/texmf-dist/doc/latex/base/web2ctex.txt
-share/texmf-dist/doc/latex/base/webcomp.err
-share/texmf-dist/doc/latex/base/yandytex.txt
share/texmf-dist/doc/latex/bbm/bbm.dvi
share/texmf-dist/doc/latex/bbold/bbold.dvi
share/texmf-dist/doc/latex/beton/beton.dvi
@@ -8358,11 +8289,6 @@
share/texmf-dist/metapost/misc/x.mp
share/texmf-dist/metapost/support/trchars.adj
share/texmf-dist/metapost/support/trfonts.map
-share/texmf-dist/mft/cmbase.mft
-share/texmf-dist/mft/e.mft
-share/texmf-dist/mft/mplain.mft
-share/texmf-dist/mft/pl.mft
-share/texmf-dist/mft/plain.mft
share/texmf-dist/omega/ocp/char2uni/in646.ocp
share/texmf-dist/omega/ocp/char2uni/in88591.ocp
share/texmf-dist/omega/ocp/char2uni/in88592.ocp
@@ -10239,19 +10165,6 @@
share/texmf-dist/tex/plain/base/logmac.tex
share/texmf-dist/tex/plain/base/ordwebmac.tex
share/texmf-dist/tex/plain/btxmac/btxmac.tex
-share/texmf-dist/tex/plain/enctex/dcfonts.tex
-share/texmf-dist/tex/plain/enctex/ecfonts.tex
-share/texmf-dist/tex/plain/enctex/noprefnt.tex
-share/texmf-dist/tex/plain/enctex/plain-1250-cs.tex
-share/texmf-dist/tex/plain/enctex/plain-1250-dc.tex
-share/texmf-dist/tex/plain/enctex/plain-852-cs.tex
-share/texmf-dist/tex/plain/enctex/plain-852-dc.tex
-share/texmf-dist/tex/plain/enctex/plain-il2-cs.tex
-share/texmf-dist/tex/plain/enctex/plain-il2-dc.tex
-share/texmf-dist/tex/plain/enctex/plain-kam-cs.tex
-share/texmf-dist/tex/plain/enctex/plain-kam-dc.tex
-share/texmf-dist/tex/plain/enctex/plain-utf8-cs.tex
-share/texmf-dist/tex/plain/enctex/plain-utf8-ec.tex
Home |
Main Index |
Thread Index |
Old Index