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 recently imp...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/42a1b27de1c3
branches:  trunk
changeset: 395424:42a1b27de1c3
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jul 07 23:20:12 2009 +0000

description:
Resolve conflicts with recently imported TeX Live packages.

Bump PKGREVISION.

diffstat:

 print/teTeX3-texmf/Makefile |   42 +-
 print/teTeX3-texmf/PLIST    |  630 +-------------------------------------------
 2 files changed, 28 insertions(+), 644 deletions(-)

diffs (truncated from 928 to 300 lines):

diff -r c4f9dd202d9b -r 42a1b27de1c3 print/teTeX3-texmf/Makefile
--- a/print/teTeX3-texmf/Makefile       Tue Jul 07 23:19:23 2009 +0000
+++ b/print/teTeX3-texmf/Makefile       Tue Jul 07 23:20:12 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2009/06/09 22:34:39 minskim Exp $
+# $NetBSD: Makefile,v 1.34 2009/07/07 23:20:12 minskim Exp $
 #
 
 DISTNAME=      tetex-texmf-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=   16
+PKGREVISION=   17
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -58,24 +58,26 @@
 DEPENDS+=      tex-hyphen-ukrainian-[0-9]*:../../print/tex-hyphen-ukrainian
 DEPENDS+=      tex-lambda-[0-9]*:../../print/tex-lambda
 DEPENDS+=      tex-latex-[0-9]*:../../print/tex-latex
+DEPENDS+=      tex-lm-[0-9]*:../../fonts/tex-lm
 DEPENDS+=      tex-ltxmisc-[0-9]*:../../print/tex-ltxmisc
 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-mflogo-[0-9]*:../../fonts/tex-mflogo
+DEPENDS+=      tex-multirow-[0-9]*:../../print/tex-multirow
 DEPENDS+=      tex-natbib-[0-9]*:../../print/tex-natbib
 DEPENDS+=      tex-oberdiek-[0-9]*:../../print/tex-oberdiek
 DEPENDS+=      tex-placeins-[0-9]*:../../print/tex-placeins
+DEPENDS+=      tex-preprint-[0-9]*:../../print/tex-preprint
 DEPENDS+=      tex-rotating-[0-9]*:../../print/tex-rotating
 DEPENDS+=      tex-rsfs-[0-9]*:../../fonts/tex-rsfs
 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-tools-[0-9]*:../../print/tex-tools
 DEPENDS+=      tex-wasy-[0-9]*:../../fonts/tex-wasy
 DEPENDS+=      tex-zapfding-[0-9]*:../../fonts/tex-zapfding
 
-EXTRACT_ELEMENTS+=     ChangeLog
-EXTRACT_ELEMENTS+=     LICENSE.texmf
 EXTRACT_ELEMENTS+=     aliases
 EXTRACT_ELEMENTS+=     bibtex
 EXTRACT_ELEMENTS+=     context
@@ -122,10 +124,6 @@
 TEX_MAP_FILES+=                qzc.map
 TEX_MAP_FILES+=                cmcyr.map
 TEX_MAP_FILES+=                contnav.map
-TEX_MAP_FILES+=                cork-lm.map
-TEX_MAP_FILES+=                qx-lm.map
-TEX_MAP_FILES+=                texnansi-lm.map
-TEX_MAP_FILES+=                ts1-lm.map
 TEX_MAP_FILES+=                mathpple.map
 TEX_MAP_FILES+=                omega.map
 TEX_MAP_FILES+=                pxfonts.map
@@ -145,8 +143,7 @@
 
 post-extract:
        rm -f ${WRKSRC}/ls-R
-       rm -rf ${WRKSRC}/bibtex/bib/ams
-       rm -f ${WRKSRC}/bibtex/bib/base/xampl.bib
+       rm -rf ${WRKSRC}/bibtex/bib/[A-Za-o]*
        rm -rf ${WRKSRC}/bibtex/bst/ams
        rm -rf ${WRKSRC}/bibtex/bst/base
        rm -rf ${WRKSRC}/bibtex/bst/misc
@@ -155,6 +152,7 @@
        rmdir ${WRKSRC}/doc/generic/pdfcrop
        rm -rf ${WRKSRC}/doc/etex
        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/latex/ams[f-z]*
@@ -166,6 +164,7 @@
        rm -rf ${WRKSRC}/doc/latex/natbib
        rm -rf ${WRKSRC}/doc/latex/oberdiek
        rm -rf ${WRKSRC}/doc/latex/placeins
+       rm -rf ${WRKSRC}/doc/latex/preprint
        rm -rf ${WRKSRC}/doc/latex/rotating
        rm -rf ${WRKSRC}/doc/latex/stmaryrd
        rm -rf ${WRKSRC}/doc/latex/tools
@@ -175,15 +174,18 @@
        rm -rf ${WRKSRC}/dvips/[b-l]*
        rm -f ${WRKSRC}/dvips/misc/resolution400.ps
        rm -rf ${WRKSRC}/dvips/tetex
-       rm -rf ${WRKSRC}/fonts/afm/adobe/symbol
+       rm -rf ${WRKSRC}/fonts/afm/adobe/[q-y]*
        rm -rf ${WRKSRC}/fonts/afm/adobe/zapfding
+       rm -rf ${WRKSRC}/fonts/afm/public/lm
        rm -rf ${WRKSRC}/fonts/afm/public/marvosym
-       rm -rf ${WRKSRC}/fonts/afm/urw/symbol
+       rm -rf ${WRKSRC}/fonts/afm/urw/[q-y]*
        rm -rf ${WRKSRC}/fonts/afm/urw/zapfding
        rmdir ${WRKSRC}/fonts/cmap
        rm -rf ${WRKSRC}/fonts/enc/dvips/base
+       rm -rf ${WRKSRC}/fonts/enc/dvips/lm
        rmdir ${WRKSRC}/fonts/lig
        rmdir ${WRKSRC}/fonts/map/dvipdfm/updmap
+       rm -rf ${WRKSRC}/fonts/map/dvips/lm
        rm -f ${WRKSRC}/fonts/map/dvips/misc/marvosym.map
        rm -f ${WRKSRC}/fonts/map/dvips/tetex/bsr*
        rm -f ${WRKSRC}/fonts/map/dvips/tetex/tt*
@@ -193,12 +195,13 @@
        rmdir ${WRKSRC}/fonts/opentype
        rmdir ${WRKSRC}/fonts/pk
        rmdir ${WRKSRC}/fonts/sfd
-       rm -rf ${WRKSRC}/fonts/tfm/adobe/symbol
+       rm -rf ${WRKSRC}/fonts/tfm/adobe/[q-y]*
        rm -rf ${WRKSRC}/fonts/tfm/adobe/zapfding
-       rm -rf ${WRKSRC}/fonts/tfm/cg/symbol
+       rm -rf ${WRKSRC}/fonts/tfm/cg/[p-s]*
+       rm -rf ${WRKSRC}/fonts/tfm/cg/times
        rmdir ${WRKSRC}/fonts/truetype
        rm -rf ${WRKSRC}/fonts/type1/public/tt2001
-       rm -rf ${WRKSRC}/fonts/type1/urw/symbol
+       rm -rf ${WRKSRC}/fonts/type1/urw/[q-y]*
        rm -rf ${WRKSRC}/fonts/type1/urw/zapfding
        rmdir ${WRKSRC}/fonts/type3
        rmdir ${WRKSRC}/fonts/type42
@@ -225,14 +228,20 @@
        rm -rf ${WRKSRC}/fonts/tfm/ams
        rm -rf ${WRKSRC}/fonts/tfm/public/cm
        rm -rf ${WRKSRC}/fonts/tfm/public/latex
+       rm -rf ${WRKSRC}/fonts/tfm/public/lm
        rm -rf ${WRKSRC}/fonts/tfm/public/marvosym
        rm -rf ${WRKSRC}/fonts/tfm/public/mflogo
        rm -f ${WRKSRC}/fonts/tfm/public/misc/[b-q]*.tfm
        rm -rf ${WRKSRC}/fonts/tfm/public/[r-s]*
        rm -rf ${WRKSRC}/fonts/tfm/public/w*
+       rm -rf ${WRKSRC}/fonts/tfm/yandy/times
        rm -rf ${WRKSRC}/fonts/type1/bluesky
        rm -rf ${WRKSRC}/fonts/type1/hoekwater/[d-z]*
+       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/cg/times
+       rm -rf ${WRKSRC}/fonts/vf/yandy/times
        rm -rf ${WRKSRC}/metafont/[a-l]*
        rm -f ${WRKSRC}/metafont/misc/[a-w]*
        rm -rf ${WRKSRC}/omega/ocp/misc
@@ -269,13 +278,16 @@
        rm -f ${WRKSRC}/tex/latex/graphics/p[a-r]*
        rm -f ${WRKSRC}/tex/latex/graphics/t[cr]*
        rm -rf ${WRKSRC}/tex/latex/hyperref
+       rm -rf ${WRKSRC}/tex/latex/lm
        rm -rf ${WRKSRC}/tex/latex/marvosym
        rm -rf ${WRKSRC}/tex/latex/mflogo
+       rm -rf ${WRKSRC}/tex/latex/multirow
        rm -rf ${WRKSRC}/tex/latex/n[a-n]*
        rm -f ${WRKSRC}/tex/latex/oberdiek/[a-u]*
        rm -rf ${WRKSRC}/tex/latex/optional
        rm -rf ${WRKSRC}/tex/latex/parskip
        rm -rf ${WRKSRC}/tex/latex/placeins
+       rm -rf ${WRKSRC}/tex/latex/preprint
        rm -rf ${WRKSRC}/tex/latex/psnfss
        rm -rf ${WRKSRC}/tex/latex/relsize
        rm -rf ${WRKSRC}/tex/latex/rotating
diff -r c4f9dd202d9b -r 42a1b27de1c3 print/teTeX3-texmf/PLIST
--- a/print/teTeX3-texmf/PLIST  Tue Jul 07 23:19:23 2009 +0000
+++ b/print/teTeX3-texmf/PLIST  Tue Jul 07 23:20:12 2009 +0000
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/09 22:34:39 minskim Exp $
-share/texmf-dist/ChangeLog
-share/texmf-dist/LICENSE.texmf
+@comment $NetBSD: PLIST,v 1.15 2009/07/07 23:20:12 minskim Exp $
 share/texmf-dist/aliases
-share/texmf-dist/bibtex/bib/README
-share/texmf-dist/bibtex/bib/base/test.bib
 share/texmf-dist/bibtex/bib/plbib/plbib.bib
 share/texmf-dist/bibtex/bst/adrconv/adrconv.bst
 share/texmf-dist/bibtex/bst/adrconv/adrfax.bst
@@ -218,16 +214,6 @@
 share/texmf-dist/doc/fonts/lh/lhfonts/lhfont34.en
 share/texmf-dist/doc/fonts/lh/lhfonts/lhfont34.ru
 share/texmf-dist/doc/fonts/lh/lhfonts/lhfonts.hst
-share/texmf-dist/doc/fonts/lm/0info092.txt
-share/texmf-dist/doc/fonts/lm/tstlmqx.dvi
-share/texmf-dist/doc/fonts/lm/tstlmqx.pdf
-share/texmf-dist/doc/fonts/lm/tstlmqx.tex
-share/texmf-dist/doc/fonts/lm/tstlmt1.dvi
-share/texmf-dist/doc/fonts/lm/tstlmt1.pdf
-share/texmf-dist/doc/fonts/lm/tstlmt1.tex
-share/texmf-dist/doc/fonts/lm/tstlmts1.dvi
-share/texmf-dist/doc/fonts/lm/tstlmts1.pdf
-share/texmf-dist/doc/fonts/lm/tstlmts1.tex
 share/texmf-dist/doc/fonts/lucida/README.teTeX
 share/texmf-dist/doc/fonts/mathpazo/README.txt
 share/texmf-dist/doc/fonts/mathtime/README.teTeX
@@ -3356,12 +3342,6 @@
 share/texmf-dist/doc/latex/platex/r22.mps
 share/texmf-dist/doc/latex/platex/readme.txt
 share/texmf-dist/doc/latex/platex/tstlatex.tex
-share/texmf-dist/doc/latex/preprint/00readme.unix
-share/texmf-dist/doc/latex/preprint/authblk.dvi
-share/texmf-dist/doc/latex/preprint/balance.dvi
-share/texmf-dist/doc/latex/preprint/figcaps.dvi
-share/texmf-dist/doc/latex/preprint/fullpage.dvi
-share/texmf-dist/doc/latex/preprint/sublabel.dvi
 share/texmf-dist/doc/latex/preview/README
 share/texmf-dist/doc/latex/preview/preview.dvi
 share/texmf-dist/doc/latex/program/program-demo.tex
@@ -3674,10 +3654,6 @@
 share/texmf-dist/fonts/afm/adobe/palatino/pplbi8a.afm
 share/texmf-dist/fonts/afm/adobe/palatino/pplr8a.afm
 share/texmf-dist/fonts/afm/adobe/palatino/pplri8a.afm
-share/texmf-dist/fonts/afm/adobe/times/ptmb8a.afm
-share/texmf-dist/fonts/afm/adobe/times/ptmbi8a.afm
-share/texmf-dist/fonts/afm/adobe/times/ptmr8a.afm
-share/texmf-dist/fonts/afm/adobe/times/ptmri8a.afm
 share/texmf-dist/fonts/afm/adobe/zapfchan/pzcmi8a.afm
 share/texmf-dist/fonts/afm/bitstrea/charter/bchb8a.afm
 share/texmf-dist/fonts/afm/bitstrea/charter/bchbi8a.afm
@@ -3707,63 +3683,6 @@
 share/texmf-dist/fonts/afm/public/fpl/fplbj8a.afm
 share/texmf-dist/fonts/afm/public/fpl/fplrc8a.afm
 share/texmf-dist/fonts/afm/public/fpl/fplrij8a.afm
-share/texmf-dist/fonts/afm/public/lm/lmb10.afm
-share/texmf-dist/fonts/afm/public/lm/lmbo10.afm
-share/texmf-dist/fonts/afm/public/lm/lmbx10.afm
-share/texmf-dist/fonts/afm/public/lm/lmbx12.afm
-share/texmf-dist/fonts/afm/public/lm/lmbx5.afm
-share/texmf-dist/fonts/afm/public/lm/lmbx6.afm
-share/texmf-dist/fonts/afm/public/lm/lmbx7.afm
-share/texmf-dist/fonts/afm/public/lm/lmbx8.afm
-share/texmf-dist/fonts/afm/public/lm/lmbx9.afm
-share/texmf-dist/fonts/afm/public/lm/lmbxi10.afm
-share/texmf-dist/fonts/afm/public/lm/lmbxo10.afm
-share/texmf-dist/fonts/afm/public/lm/lmcsc10.afm
-share/texmf-dist/fonts/afm/public/lm/lmcsco10.afm
-share/texmf-dist/fonts/afm/public/lm/lmr10.afm
-share/texmf-dist/fonts/afm/public/lm/lmr12.afm
-share/texmf-dist/fonts/afm/public/lm/lmr17.afm
-share/texmf-dist/fonts/afm/public/lm/lmr5.afm
-share/texmf-dist/fonts/afm/public/lm/lmr6.afm
-share/texmf-dist/fonts/afm/public/lm/lmr7.afm
-share/texmf-dist/fonts/afm/public/lm/lmr8.afm
-share/texmf-dist/fonts/afm/public/lm/lmr9.afm
-share/texmf-dist/fonts/afm/public/lm/lmri10.afm
-share/texmf-dist/fonts/afm/public/lm/lmri12.afm
-share/texmf-dist/fonts/afm/public/lm/lmri7.afm
-share/texmf-dist/fonts/afm/public/lm/lmri8.afm
-share/texmf-dist/fonts/afm/public/lm/lmri9.afm
-share/texmf-dist/fonts/afm/public/lm/lmro10.afm
-share/texmf-dist/fonts/afm/public/lm/lmro12.afm
-share/texmf-dist/fonts/afm/public/lm/lmro8.afm
-share/texmf-dist/fonts/afm/public/lm/lmro9.afm
-share/texmf-dist/fonts/afm/public/lm/lmss10.afm
-share/texmf-dist/fonts/afm/public/lm/lmss12.afm
-share/texmf-dist/fonts/afm/public/lm/lmss17.afm
-share/texmf-dist/fonts/afm/public/lm/lmss8.afm
-share/texmf-dist/fonts/afm/public/lm/lmss9.afm
-share/texmf-dist/fonts/afm/public/lm/lmssbo10.afm
-share/texmf-dist/fonts/afm/public/lm/lmssbx10.afm
-share/texmf-dist/fonts/afm/public/lm/lmssdc10.afm
-share/texmf-dist/fonts/afm/public/lm/lmssdo10.afm
-share/texmf-dist/fonts/afm/public/lm/lmsso10.afm
-share/texmf-dist/fonts/afm/public/lm/lmsso12.afm
-share/texmf-dist/fonts/afm/public/lm/lmsso17.afm
-share/texmf-dist/fonts/afm/public/lm/lmsso8.afm
-share/texmf-dist/fonts/afm/public/lm/lmsso9.afm
-share/texmf-dist/fonts/afm/public/lm/lmssq8.afm
-share/texmf-dist/fonts/afm/public/lm/lmssqbo8.afm
-share/texmf-dist/fonts/afm/public/lm/lmssqbx8.afm
-share/texmf-dist/fonts/afm/public/lm/lmssqo8.afm
-share/texmf-dist/fonts/afm/public/lm/lmtcsc10.afm
-share/texmf-dist/fonts/afm/public/lm/lmtt10.afm
-share/texmf-dist/fonts/afm/public/lm/lmtt12.afm
-share/texmf-dist/fonts/afm/public/lm/lmtt8.afm
-share/texmf-dist/fonts/afm/public/lm/lmtt9.afm
-share/texmf-dist/fonts/afm/public/lm/lmtti10.afm
-share/texmf-dist/fonts/afm/public/lm/lmtto10.afm
-share/texmf-dist/fonts/afm/public/lm/lmvtt10.afm
-share/texmf-dist/fonts/afm/public/lm/lmvtto10.afm
 share/texmf-dist/fonts/afm/public/mathpazo/fplmb.afm
 share/texmf-dist/fonts/afm/public/mathpazo/fplmbb.afm
 share/texmf-dist/fonts/afm/public/mathpazo/fplmbi.afm
@@ -4000,10 +3919,6 @@
 share/texmf-dist/fonts/afm/urw/palatino/uplbi8a.afm
 share/texmf-dist/fonts/afm/urw/palatino/uplr8a.afm
 share/texmf-dist/fonts/afm/urw/palatino/uplri8a.afm
-share/texmf-dist/fonts/afm/urw/times/utmb8a.afm
-share/texmf-dist/fonts/afm/urw/times/utmbi8a.afm
-share/texmf-dist/fonts/afm/urw/times/utmr8a.afm
-share/texmf-dist/fonts/afm/urw/times/utmri8a.afm
 share/texmf-dist/fonts/afm/urw/zapfchan/uzcmi8a.afm
 share/texmf-dist/fonts/afm/yandy/lubright/lbd.afm
 share/texmf-dist/fonts/afm/yandy/lubright/lbdi.afm
@@ -4101,11 +4016,6 @@
 share/texmf-dist/fonts/enc/dvips/context/cork-var-lm.enc
 share/texmf-dist/fonts/enc/dvips/context/ec-var-lm.enc
 share/texmf-dist/fonts/enc/dvips/context/texnansi-var-lm.enc
-share/texmf-dist/fonts/enc/dvips/lm/cork-lm.enc
-share/texmf-dist/fonts/enc/dvips/lm/qx-lm.enc
-share/texmf-dist/fonts/enc/dvips/lm/qx-lmtt.enc
-share/texmf-dist/fonts/enc/dvips/lm/texnansi-lm.enc
-share/texmf-dist/fonts/enc/dvips/lm/ts1-lm.enc
 share/texmf-dist/fonts/enc/dvips/pl/plin.enc
 share/texmf-dist/fonts/enc/dvips/pl/plit.enc
 share/texmf-dist/fonts/enc/dvips/pl/plitt.enc
@@ -4171,11 +4081,6 @@



Home | Main Index | Thread Index | Old Index