pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/print Replace teTeX's tex and pdftex formats with thos...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a46852827efa
branches:  trunk
changeset: 557299:a46852827efa
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Apr 13 07:48:24 2009 +0000

description:
Replace teTeX's tex and pdftex formats with those in print/tex-bin-tex
and print/tex-pdftex.

While here, remove a symbolic link pointing to nothing from teTeX-bin.

Bump PKGREVISION for teTeX-{texmf,bin}.

diffstat:

 print/teTeX3-bin/Makefile               |    6 +-
 print/teTeX3-bin/PLIST                  |    3 +-
 print/teTeX3-bin/distinfo               |    4 +-
 print/teTeX3-bin/files/format.tetex.cnf |    9 -
 print/teTeX3-bin/patches/patch-as       |   13 +-
 print/teTeX3-texmf/Makefile             |   36 ++-
 print/teTeX3-texmf/PLIST                |  332 +-------------------------------
 7 files changed, 46 insertions(+), 357 deletions(-)

diffs (truncated from 684 to 300 lines):

diff -r d254fc4e4441 -r a46852827efa print/teTeX3-bin/Makefile
--- a/print/teTeX3-bin/Makefile Mon Apr 13 07:37:14 2009 +0000
+++ b/print/teTeX3-bin/Makefile Mon Apr 13 07:48:24 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2009/04/12 07:33:35 minskim Exp $
+# $NetBSD: Makefile,v 1.44 2009/04/13 07:48:24 minskim Exp $
 
 DISTNAME=      tetex-src-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=   29
+PKGREVISION=   30
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -14,6 +14,8 @@
 
 DEPENDS+=      teTeX-texmf>=3.0nb10:../../print/teTeX3-texmf
 DEPENDS+=      tex-bin-kpathsea-[0-9]*:../../print/tex-bin-kpathsea
+DEPENDS+=      tex-bin-tex-[0-9]*:../../print/tex-bin-tex
+DEPENDS+=      tex-pdftex-[0-9]*:../../print/tex-pdftex
 DEPENDS+=      web2c>=7.5.7nb2:../../print/web2c
 
 # games/omega previously installed an omega executable too
diff -r d254fc4e4441 -r a46852827efa print/teTeX3-bin/PLIST
--- a/print/teTeX3-bin/PLIST    Mon Apr 13 07:37:14 2009 +0000
+++ b/print/teTeX3-bin/PLIST    Mon Apr 13 07:48:24 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2009/04/12 07:33:35 minskim Exp $
+@comment $NetBSD: PLIST,v 1.13 2009/04/13 07:48:24 minskim Exp $
 bin/a2ping
 bin/dvihp
 bin/dvilj
@@ -43,7 +43,6 @@
 man/man1/mag.1
 man/man1/makeindex.1
 man/man1/mkindex.1
-man/man1/pdflatex.1
 man/man1/pfb2pfa.1
 man/man1/pk2bm.1
 man/man1/ps2pk.1
diff -r d254fc4e4441 -r a46852827efa print/teTeX3-bin/distinfo
--- a/print/teTeX3-bin/distinfo Mon Apr 13 07:37:14 2009 +0000
+++ b/print/teTeX3-bin/distinfo Mon Apr 13 07:48:24 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2009/04/12 07:33:35 minskim Exp $
+$NetBSD: distinfo,v 1.19 2009/04/13 07:48:24 minskim Exp $
 
 SHA1 (teTeX/tetex-src-3.0.tar.gz) = 7637789f7f4929694aed1b89820f5bad4753e8fc
 RMD160 (teTeX/tetex-src-3.0.tar.gz) = 15a139f5f36993e4ed3583260e175cfb13ce7bcc
@@ -17,7 +17,7 @@
 SHA1 (patch-an) = a02db18a49f61f965e0277fbc5a3fa72a5060b47
 SHA1 (patch-aq) = d7a4dd4864e43cd27b1ca803f8ebfe82e65f84a7
 SHA1 (patch-ar) = 92f465143d278d7b081d70c3053194b70585571b
-SHA1 (patch-as) = 3e1b2f14995c1bb7f566f76714138039f8714f75
+SHA1 (patch-as) = e8ec2a26580f3be4b8dde85ad5e69fc6ddaeb023
 SHA1 (patch-at) = aaeddf2240f1b0e394ab78122352c111f3aa9718
 SHA1 (patch-au) = e8f556ac27ba9a22731b8e7c37356a64eb115860
 SHA1 (patch-av) = 53c963ac1b5f1963f707228badeaf0d57b159344
diff -r d254fc4e4441 -r a46852827efa print/teTeX3-bin/files/format.tetex.cnf
--- a/print/teTeX3-bin/files/format.tetex.cnf   Mon Apr 13 07:37:14 2009 +0000
+++ b/print/teTeX3-bin/files/format.tetex.cnf   Mon Apr 13 07:48:24 2009 +0000
@@ -35,17 +35,8 @@
 metafun                mpost           -               -translate-file=cp227.tcx metafun.mp
 
 # Standard formats (plain, latex) with all engines:
-
-# Change "tex.ini -> bplain.ini" and "- -> language.dat"
-# if you want babel support in tex:
-tex            tex             -               -translate-file=cp227.tcx tex.ini
 latex          pdftex          language.dat    -translate-file=cp227.tcx *latex.ini
-etex           pdftex          language.def    -translate-file=cp227.tcx *etex.ini
-pdftex         pdftex          -       -translate-file=cp227.tcx *pdftex.ini
 pdflatex       pdftex          language.dat    -translate-file=cp227.tcx *pdflatex.ini
-pdfetex                pdftex          language.def    -translate-file=cp227.tcx *pdfetex.ini
-#! pdfxlatex   pdfxtex         language.dat    -translate-file=cp227.tcx *pdfxlatex.ini
-#! pdfxtex             pdfxtex         -               -translate-file=cp227.tcx *pdfxtex.ini
 omega          omega           -       omega.ini
 lambda         omega           language.dat    lambda.ini
 aleph          aleph           -               *aleph.ini
diff -r d254fc4e4441 -r a46852827efa print/teTeX3-bin/patches/patch-as
--- a/print/teTeX3-bin/patches/patch-as Mon Apr 13 07:37:14 2009 +0000
+++ b/print/teTeX3-bin/patches/patch-as Mon Apr 13 07:48:24 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.4 2009/04/12 07:33:35 minskim Exp $
+$NetBSD: patch-as,v 1.5 2009/04/13 07:48:24 minskim Exp $
 
 --- texk/tetex/Makefile.in.orig        2005-02-04 14:20:54.000000000 -0800
 +++ texk/tetex/Makefile.in
@@ -29,7 +29,7 @@
  
  INFOFILES= latex.info
  POOLFILES = pdfetex-pl.pool
-@@ -39,30 +34,13 @@ install-data:: $(INFOFILES)
+@@ -39,30 +34,12 @@ install-data:: $(INFOFILES)
        for p in $(manpgs); do \
          $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
        done
@@ -40,7 +40,7 @@
 -        lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \
 -        kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \
 +      cd $(man1dir); rm -f \
-+        lambda.$(manext) pdflatex.$(manext) \
++        lambda.$(manext) \
 +        mf-nowin.$(manext) ctangle.$(manext) \
          cweave.$(manext) odvicopy.$(manext) \
 -        odvitype.$(manext) texconfig-sys.$(manext) \
@@ -49,7 +49,7 @@
 -      ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext)
 +        odvitype.$(manext)
        ln -s omega.$(manext) $(man1dir)/lambda.$(manext)
-       ln -s pdfetex.$(manext) $(man1dir)/pdflatex.$(manext)
+-      ln -s pdfetex.$(manext) $(man1dir)/pdflatex.$(manext)
 -      ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext)
 -      ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext)
 -      ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext)
@@ -64,7 +64,7 @@
        test -r ./latex.info || cd $(srcdir) && for i in latex.info*; do \
          $(INSTALL_DATA) $$i $(infodir)/$$i; done
        if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-@@ -74,14 +52,6 @@ install-data:: $(INFOFILES)
+@@ -74,14 +51,6 @@ install-data:: $(INFOFILES)
        for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
          $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
        done
@@ -79,7 +79,7 @@
  
  install-exec:
        -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
-@@ -96,16 +66,10 @@ install-exec:
+@@ -96,16 +65,10 @@ install-exec:
        else \
          true; \
        fi
@@ -96,3 +96,4 @@
  
  ac_include ../make/clean.mk
  
+-
diff -r d254fc4e4441 -r a46852827efa print/teTeX3-texmf/Makefile
--- a/print/teTeX3-texmf/Makefile       Mon Apr 13 07:37:14 2009 +0000
+++ b/print/teTeX3-texmf/Makefile       Mon Apr 13 07:48:24 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2009/04/12 02:44:07 minskim Exp $
+# $NetBSD: Makefile,v 1.27 2009/04/13 07:48:24 minskim Exp $
 #
 
 DISTNAME=      tetex-texmf-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=   11
+PKGREVISION=   12
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -16,6 +16,10 @@
 
 CONFLICTS+=    teTeX-share-[0-9]*
 DEPENDS+=      tex-bin-kpathsea-[0-9]*:../../print/tex-bin-kpathsea
+DEPENDS+=      tex-cm-[0-9]*:../../fonts/tex-cm
+DEPENDS+=      tex-etex-[0-9]*:../../print/tex-etex
+DEPENDS+=      tex-misc-[0-9]*:../../print/tex-misc
+DEPENDS+=      tex-plain-[0-9]*:../../print/tex-plain
 
 EXTRACT_ELEMENTS+=     ChangeLog
 EXTRACT_ELEMENTS+=     LICENSE.texmf
@@ -118,8 +122,6 @@
 TEX_MAP_FILES+=                dstroke.map
 TEX_MAP_FILES+=                fpls.map
 TEX_MIXEDMAP_FILES+=   ttcmex.map
-TEX_MIXEDMAP_FILES+=   bsr.map
-TEX_MIXEDMAP_FILES+=   bsr-interpolated.map
 TEX_MIXEDMAP_FILES+=   cs.map
 TEX_MIXEDMAP_FILES+=   hoekwater.map
 TEX_MIXEDMAP_FILES+=   pl.map
@@ -134,11 +136,13 @@
 post-extract:
        rm -f ${WRKSRC}/ls-R
        rmdir ${WRKSRC}/doc/generic/pdfcrop
+       rm -f ${WRKSRC}/dvips/bluesky/config.cm*
        rm -rf ${WRKSRC}/dvips/config
        rm -rf ${WRKSRC}/dvips/tetex
        rmdir ${WRKSRC}/fonts/cmap
        rmdir ${WRKSRC}/fonts/lig
        rmdir ${WRKSRC}/fonts/map/dvipdfm/updmap
+       rm -f ${WRKSRC}/fonts/map/dvips/tetex/bsr*
        rmdir ${WRKSRC}/fonts/map/dvips/updmap
        rmdir ${WRKSRC}/fonts/map/pdftex/updmap
        rmdir ${WRKSRC}/fonts/misc
@@ -159,13 +163,35 @@
        rm -f ${WRKSRC}/fonts/map/dvips/tetex/mt-yy.map
        rm -f ${WRKSRC}/fonts/map/dvips/tetex/pdftex35.map
        rm -f ${WRKSRC}/fonts/map/dvips/tetex/ps2pk35.map
+       rm -rf ${WRKSRC}/fonts/source/public/cm
+       rm -f ${WRKSRC}/fonts/source/public/misc/[b-q]*.mf
+       rm -f ${WRKSRC}/fonts/source/public/misc/random.mf
+       rm -f ${WRKSRC}/fonts/source/public/misc/s*.mf
+       rm -rf ${WRKSRC}/fonts/tfm/public/cm
+       rm -f ${WRKSRC}/fonts/tfm/public/misc/[b-q]*.tfm
+       rm -rf ${WRKSRC}/fonts/type1/bluesky/cm
+       rm -rf ${WRKSRC}/omega/ocp/misc
+       rm -rf ${WRKSRC}/omega/otp/misc
        rm -f ${WRKSRC}/tex/generic/config/language.dat
+       rm -f ${WRKSRC}/tex/generic/config/pdftexconfig.tex
        rm -f ${WRKSRC}/tex/generic/hyphen/dumyhyph.tex
        rm -f ${WRKSRC}/tex/generic/hyphen/hyphen.tex
        rm -f ${WRKSRC}/tex/generic/hyphen/hypht1.tex
        rm -f ${WRKSRC}/tex/generic/hyphen/zerohyph.tex
+       rm -rf ${WRKSRC}/tex/generic/null
+       rm -rf ${WRKSRC}/tex/generic/texnames
        rm -f ${WRKSRC}/tex/latex/dvipdfm/dvipdfm.def
-       rm -f ${WRKSRC}/tex/plain/config/language.def
+       rm -f ${WRKSRC}/tex/plain/base/[gmp-z]*
+       rm -f ${WRKSRC}/tex/plain/base/letter*
+       rm -rf ${WRKSRC}/tex/plain/config
+       rm -rf ${WRKSRC}/tex/plain/etex
+       rm -rf ${WRKSRC}/tex/plain/fontchart
+       rm -rf ${WRKSRC}/tex/plain/[i-l]*
+       rm -rf ${WRKSRC}/tex/plain/mproof
+       rm -rf ${WRKSRC}/tex/plain/pdfcolor
+       rm -rf ${WRKSRC}/tex/plain/tetex
+       rm -rf ${WRKSRC}/tex/plain/wlist
+       rm -rf ${WRKSRC}/tex/plain/xepsf
 
 do-install:
        cd ${WRKSRC} && pax -wr -s ',.*\.orig$$,,' * ${DESTDIR}${PREFIX}/share/texmf-dist
diff -r d254fc4e4441 -r a46852827efa print/teTeX3-texmf/PLIST
--- a/print/teTeX3-texmf/PLIST  Mon Apr 13 07:37:14 2009 +0000
+++ b/print/teTeX3-texmf/PLIST  Mon Apr 13 07:48:24 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/04/12 02:44:07 minskim Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/04/13 07:48:24 minskim Exp $
 share/texmf-dist/ChangeLog
 share/texmf-dist/LICENSE.texmf
 share/texmf-dist/aliases
@@ -3782,8 +3782,6 @@
 share/texmf-dist/dvips/antt/config.antt
 share/texmf-dist/dvips/bluesky/config.ams
 share/texmf-dist/dvips/bluesky/config.amz
-share/texmf-dist/dvips/bluesky/config.cm
-share/texmf-dist/dvips/bluesky/config.cmz
 share/texmf-dist/dvips/misc/alt-rule.pro
 share/texmf-dist/dvips/misc/config.mirr
 share/texmf-dist/dvips/misc/crops.pro
@@ -4400,8 +4398,6 @@
 share/texmf-dist/fonts/map/dvips/qfonts/qpl.map
 share/texmf-dist/fonts/map/dvips/qfonts/qtm.map
 share/texmf-dist/fonts/map/dvips/qfonts/qzc.map
-share/texmf-dist/fonts/map/dvips/tetex/bsr-interpolated.map
-share/texmf-dist/fonts/map/dvips/tetex/bsr.map
 share/texmf-dist/fonts/map/dvips/tetex/contnav.map
 share/texmf-dist/fonts/map/dvips/tetex/hoekwater.map
 share/texmf-dist/fonts/map/dvips/tetex/lucidabr-o.map
@@ -5416,121 +5412,6 @@
 share/texmf-dist/fonts/source/public/cm-bold/cmbtt9.mf
 share/texmf-dist/fonts/source/public/cm-bold/cmexb10.mf
 share/texmf-dist/fonts/source/public/cm-bold/cmttb10.mf
-share/texmf-dist/fonts/source/public/cm/accent.mf
-share/texmf-dist/fonts/source/public/cm/bigacc.mf
-share/texmf-dist/fonts/source/public/cm/bigdel.mf
-share/texmf-dist/fonts/source/public/cm/bigop.mf
-share/texmf-dist/fonts/source/public/cm/calu.mf
-share/texmf-dist/fonts/source/public/cm/cmb10.mf
-share/texmf-dist/fonts/source/public/cm/cmbase.mf
-share/texmf-dist/fonts/source/public/cm/cmbsy10.mf
-share/texmf-dist/fonts/source/public/cm/cmbx10.mf
-share/texmf-dist/fonts/source/public/cm/cmbx12.mf
-share/texmf-dist/fonts/source/public/cm/cmbx5.mf
-share/texmf-dist/fonts/source/public/cm/cmbx6.mf
-share/texmf-dist/fonts/source/public/cm/cmbx7.mf
-share/texmf-dist/fonts/source/public/cm/cmbx8.mf
-share/texmf-dist/fonts/source/public/cm/cmbx9.mf
-share/texmf-dist/fonts/source/public/cm/cmbxsl10.mf
-share/texmf-dist/fonts/source/public/cm/cmbxti10.mf
-share/texmf-dist/fonts/source/public/cm/cmcsc10.mf
-share/texmf-dist/fonts/source/public/cm/cmdunh10.mf
-share/texmf-dist/fonts/source/public/cm/cmex10.mf
-share/texmf-dist/fonts/source/public/cm/cmex9.mf
-share/texmf-dist/fonts/source/public/cm/cmff10.mf
-share/texmf-dist/fonts/source/public/cm/cmfi10.mf
-share/texmf-dist/fonts/source/public/cm/cmfib8.mf
-share/texmf-dist/fonts/source/public/cm/cminch.mf
-share/texmf-dist/fonts/source/public/cm/cmitt10.mf
-share/texmf-dist/fonts/source/public/cm/cmmi10.mf
-share/texmf-dist/fonts/source/public/cm/cmmi12.mf
-share/texmf-dist/fonts/source/public/cm/cmmi5.mf
-share/texmf-dist/fonts/source/public/cm/cmmi6.mf
-share/texmf-dist/fonts/source/public/cm/cmmi7.mf
-share/texmf-dist/fonts/source/public/cm/cmmi8.mf
-share/texmf-dist/fonts/source/public/cm/cmmi9.mf
-share/texmf-dist/fonts/source/public/cm/cmmib10.mf
-share/texmf-dist/fonts/source/public/cm/cmr10.mf
-share/texmf-dist/fonts/source/public/cm/cmr12.mf
-share/texmf-dist/fonts/source/public/cm/cmr17.mf
-share/texmf-dist/fonts/source/public/cm/cmr5.mf
-share/texmf-dist/fonts/source/public/cm/cmr6.mf
-share/texmf-dist/fonts/source/public/cm/cmr7.mf
-share/texmf-dist/fonts/source/public/cm/cmr8.mf
-share/texmf-dist/fonts/source/public/cm/cmr9.mf
-share/texmf-dist/fonts/source/public/cm/cmsl10.mf
-share/texmf-dist/fonts/source/public/cm/cmsl12.mf
-share/texmf-dist/fonts/source/public/cm/cmsl8.mf



Home | Main Index | Thread Index | Old Index