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 LaTeX macro with TeX Live's ve...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/536dc236cbf0
branches:  trunk
changeset: 557471:536dc236cbf0
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Wed Apr 15 09:19:44 2009 +0000

description:
- Replace teTeX's LaTeX macro with TeX Live's version.
- Use UTF-8 hyphenation patterns, which can be used with luatex.
- Create symlinks for TeX formats explicitly.

Bump PKGREVISION for teTeX-texmf and teTeX-bin.

diffstat:

 print/teTeX3-bin/DEINSTALL              |    7 -
 print/teTeX3-bin/INSTALL                |   62 ------
 print/teTeX3-bin/Makefile               |   10 +-
 print/teTeX3-bin/PLIST                  |    5 +-
 print/teTeX3-bin/files/format.tetex.cnf |    2 -
 print/teTeX3-texmf/Makefile             |   88 ++++----
 print/teTeX3-texmf/PLIST                |  305 +-------------------------------
 7 files changed, 58 insertions(+), 421 deletions(-)

diffs (truncated from 679 to 300 lines):

diff -r c99f5ffc9991 -r 536dc236cbf0 print/teTeX3-bin/DEINSTALL
--- a/print/teTeX3-bin/DEINSTALL        Wed Apr 15 09:08:15 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2006/04/06 14:39:11 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
-       ${TEST} ! -x ./+TETEX || ./+TETEX REMOVE
-       ;;
-esac
diff -r c99f5ffc9991 -r 536dc236cbf0 print/teTeX3-bin/INSTALL
--- a/print/teTeX3-bin/INSTALL  Wed Apr 15 09:08:15 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-# $NetBSD: INSTALL,v 1.12 2009/02/23 20:12:19 minskim Exp $
-
-PATH="@PREFIX@"/bin:"${PATH}"
-export PATH
-
-case "${STAGE}" in
-POST-INSTALL)
-       ${TEST} ! -x ./+TETEX || ./+TETEX ADD
-       ;;
-esac
-
-#
-# Generate a +TETEX script that updates the teTeX installation
-# based on user-modifiable configuration files.
-#
-case "${STAGE},$1" in
-UNPACK,|UNPACK,+TETEX)
-       ${CAT} > ./+TETEX << 'EOF'
-#!@SH@
-#
-# +TETEX - teTeX installation update script
-#
-# Usage: ./+TETEX ADD|REMOVE
-
-CAT="@CAT@"
-ECHO="@ECHO@"
-GREP="@GREP@"
-RM="@RM@"
-RMDIR="@RMDIR@"
-TEST="@TEST@"
-TRUE="@TRUE@"
-
-SELF=$0
-ACTION=$1
-: ${PKG_PREFIX=@PREFIX@}
-
-TEXMF_DISTDATADIR="${PKG_PREFIX}/share/texmf-dist"
-TEXMF_DATADIR="${PKG_PREFIX}/share/texmf"
-TEXMF_LOCALDATADIR="${PKG_PREFIX}/share/texmf-local"
-TEXMF_VARDIR="@VARBASE@/lib/texmf"
-
-exitcode=0
-case $ACTION in
-ADD)
-       # Update teTeX installation to support different TeX formats.
-       ${TEST} ! -x ${PKG_PREFIX}/bin/texlinks ||
-               ${PKG_PREFIX}/bin/texlinks
-       ;;
-
-REMOVE)
-       @MKTEXLSR@ ${TEXMF_VARDIR} @PKG_SYSCONFBASE@/texmf
-       ;;
-
-*)
-       ${ECHO} "Usage: ./+TETEX ADD|REMOVE [metadatadir]"
-       ;;
-esac
-exit $exitcode
-EOF
-       ${CHMOD} +x ./+TETEX
-       ;;
-esac
diff -r c99f5ffc9991 -r 536dc236cbf0 print/teTeX3-bin/Makefile
--- a/print/teTeX3-bin/Makefile Wed Apr 15 09:08:15 2009 +0000
+++ b/print/teTeX3-bin/Makefile Wed Apr 15 09:19:44 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2009/04/14 07:48:59 minskim Exp $
+# $NetBSD: Makefile,v 1.46 2009/04/15 09:19:45 minskim Exp $
 
 DISTNAME=      tetex-src-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/:C/src/bin/}
-PKGREVISION=   31
+PKGREVISION=   32
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -14,6 +14,7 @@
 
 DEPENDS+=      teTeX-texmf>=3.0nb10:../../print/teTeX3-texmf
 DEPENDS+=      tex-bin-kpathsea-[0-9]*:../../print/tex-bin-kpathsea
+DEPENDS+=      tex-bin-latex-[0-9]*:../../print/tex-bin-latex
 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
@@ -79,7 +80,10 @@
 .for f in a2ping e2pall epstopdf
        ${INSTALL_SCRIPT} ${WRKSRC}/texk/tetex/${f} ${DESTDIR}${PREFIX}/bin
 .endfor
-       ${LN} -sf texexec ${DESTDIR}${PREFIX}/bin/mptopdf
+       ${LN} -sf mpost ${DESTDIR}${PREFIX}/bin/metafun
+       ${LN} -sf omega ${DESTDIR}${PREFIX}/bin/lambda
+       ${LN} -sf aleph ${DESTDIR}${PREFIX}/bin/lamed
+       ${LN} -sf pdftex ${DESTDIR}${PREFIX}/bin/mptopdf
        ${INSTALL_DATA} ${FILESDIR}/format.tetex.cnf \
                ${DESTDIR}${PREFIX}/share/texmf/fmtutil
 
diff -r c99f5ffc9991 -r 536dc236cbf0 print/teTeX3-bin/PLIST
--- a/print/teTeX3-bin/PLIST    Wed Apr 15 09:08:15 2009 +0000
+++ b/print/teTeX3-bin/PLIST    Wed Apr 15 09:19:44 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/04/14 07:48:59 minskim Exp $
+@comment $NetBSD: PLIST,v 1.15 2009/04/15 09:19:45 minskim Exp $
 bin/a2ping
 bin/dvihp
 bin/dvilj
@@ -11,9 +11,12 @@
 bin/fdf2tan
 bin/fdf2tex
 bin/gsftopk
+bin/lambda
+bin/lamed
 bin/mag
 bin/makeindex
 bin/makempy
+bin/metafun
 bin/mkindex
 bin/mptopdf
 bin/pdfcrop
diff -r c99f5ffc9991 -r 536dc236cbf0 print/teTeX3-bin/files/format.tetex.cnf
--- a/print/teTeX3-bin/files/format.tetex.cnf   Wed Apr 15 09:08:15 2009 +0000
+++ b/print/teTeX3-bin/files/format.tetex.cnf   Wed Apr 15 09:19:44 2009 +0000
@@ -35,8 +35,6 @@
 metafun                mpost           -               -translate-file=cp227.tcx metafun.mp
 
 # Standard formats (plain, latex) with all engines:
-latex          pdftex          language.dat    -translate-file=cp227.tcx *latex.ini
-pdflatex       pdftex          language.dat    -translate-file=cp227.tcx *pdflatex.ini
 omega          omega           -       omega.ini
 lambda         omega           language.dat    lambda.ini
 aleph          aleph           -               *aleph.ini
diff -r c99f5ffc9991 -r 536dc236cbf0 print/teTeX3-texmf/Makefile
--- a/print/teTeX3-texmf/Makefile       Wed Apr 15 09:08:15 2009 +0000
+++ b/print/teTeX3-texmf/Makefile       Wed Apr 15 09:19:44 2009 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2009/04/13 07:48:24 minskim Exp $
+# $NetBSD: Makefile,v 1.28 2009/04/15 09:19:44 minskim Exp $
 #
 
 DISTNAME=      tetex-texmf-3.0
 PKGNAME=       ${DISTNAME:C/tetex/teTeX/}
-PKGREVISION=   12
+PKGREVISION=   13
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_TEX_CTAN:=systems/unix/teTeX/3.0/distrib/}
 
@@ -18,6 +18,38 @@
 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-hyphen-basque-[0-9]*:../../print/tex-hyphen-basque
+DEPENDS+=      tex-hyphen-bulgarian-[0-9]*:../../print/tex-hyphen-bulgarian
+DEPENDS+=      tex-hyphen-catalan-[0-9]*:../../print/tex-hyphen-catalan
+DEPENDS+=      tex-hyphen-croatian-[0-9]*:../../print/tex-hyphen-croatian
+DEPENDS+=      tex-hyphen-czech-[0-9]*:../../print/tex-hyphen-czech
+DEPENDS+=      tex-hyphen-danish-[0-9]*:../../print/tex-hyphen-danish
+DEPENDS+=      tex-hyphen-dutch-[0-9]*:../../print/tex-hyphen-dutch
+DEPENDS+=      tex-hyphen-esperanto-[0-9]*:../../print/tex-hyphen-esperanto
+DEPENDS+=      tex-hyphen-estonian-[0-9]*:../../print/tex-hyphen-estonian
+DEPENDS+=      tex-hyphen-finnish-[0-9]*:../../print/tex-hyphen-finnish
+DEPENDS+=      tex-hyphen-french-[0-9]*:../../print/tex-hyphen-french
+DEPENDS+=      tex-hyphen-german-[0-9]*:../../print/tex-hyphen-german
+DEPENDS+=      tex-hyphen-greek-[0-9]*:../../print/tex-hyphen-greek
+DEPENDS+=      tex-hyphen-hungarian-[0-9]*:../../print/tex-hyphen-hungarian
+DEPENDS+=      tex-hyphen-icelandic-[0-9]*:../../print/tex-hyphen-icelandic
+DEPENDS+=      tex-hyphen-indonesian-[0-9]*:../../print/tex-hyphen-indonesian
+DEPENDS+=      tex-hyphen-irish-[0-9]*:../../print/tex-hyphen-irish
+DEPENDS+=      tex-hyphen-italian-[0-9]*:../../print/tex-hyphen-italian
+DEPENDS+=      tex-hyphen-latin-[0-9]*:../../print/tex-hyphen-latin
+DEPENDS+=      tex-hyphen-norwegian-[0-9]*:../../print/tex-hyphen-norwegian
+DEPENDS+=      tex-hyphen-polish-[0-9]*:../../print/tex-hyphen-polish
+DEPENDS+=      tex-hyphen-portuguese-[0-9]*:../../print/tex-hyphen-portuguese
+DEPENDS+=      tex-hyphen-romanian-[0-9]*:../../print/tex-hyphen-romanian
+DEPENDS+=      tex-hyphen-russian-[0-9]*:../../print/tex-hyphen-russian
+DEPENDS+=      tex-hyphen-serbian-[0-9]*:../../print/tex-hyphen-serbian
+DEPENDS+=      tex-hyphen-slovak-[0-9]*:../../print/tex-hyphen-slovak
+DEPENDS+=      tex-hyphen-slovenian-[0-9]*:../../print/tex-hyphen-slovenian
+DEPENDS+=      tex-hyphen-spanish-[0-9]*:../../print/tex-hyphen-spanish
+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-latex-[0-9]*:../../print/tex-latex
 DEPENDS+=      tex-misc-[0-9]*:../../print/tex-misc
 DEPENDS+=      tex-plain-[0-9]*:../../print/tex-plain
 
@@ -50,41 +82,6 @@
 REPLACE_SH+=   doc/latex/bibunits/bibtexall doc/latex/multibib/bibtexall
 USE_TOOLS+=    sh:run pax
 
-TEX_HYPHEN_DAT+=       french frhyph.tex
-TEX_HYPHEN_DAT+=       = patois
-TEX_HYPHEN_DAT+=       german dehypht.tex
-TEX_HYPHEN_DAT+=       = austrian
-TEX_HYPHEN_DAT+=       ngerman dehyphn.tex
-TEX_HYPHEN_DAT+=       = naustrian
-TEX_HYPHEN_DAT+=       bahasa inhyph.tex
-TEX_HYPHEN_DAT+=       basque  bahyph.tex
-TEX_HYPHEN_DAT+=       bulgarian bghyphen.tex
-TEX_HYPHEN_DAT+=       catalan cahyph.tex
-TEX_HYPHEN_DAT+=       croatian hrhyph.tex
-TEX_HYPHEN_DAT+=       czech czhyph.tex
-TEX_HYPHEN_DAT+=       danish dkhyphen.tex
-TEX_HYPHEN_DAT+=       dutch nehyph.tex
-TEX_HYPHEN_DAT+=       esperanto eohyph.tex
-TEX_HYPHEN_DAT+=       estonian eehyph.tex
-TEX_HYPHEN_DAT+=       finnish fi8hyph.tex
-TEX_HYPHEN_DAT+=       greek grhyph.tex
-TEX_HYPHEN_DAT+=       icelandic icehyph.tex
-TEX_HYPHEN_DAT+=       irish gahyph.tex
-TEX_HYPHEN_DAT+=       italian ithyph.tex
-TEX_HYPHEN_DAT+=       latin lahyph.tex
-TEX_HYPHEN_DAT+=       magyar huhyphn.tex
-TEX_HYPHEN_DAT+=       norsk nohyphbx.tex
-TEX_HYPHEN_DAT+=       polish plhyph.tex
-TEX_HYPHEN_DAT+=       portuges pt8hyph.tex
-TEX_HYPHEN_DAT+=       romanian rohyphen.tex
-TEX_HYPHEN_DAT+=       russian ruhyphen.tex
-TEX_HYPHEN_DAT+=       serbian srhyphc.tex
-TEX_HYPHEN_DAT+=       slovak skhyph.tex
-TEX_HYPHEN_DAT+=       slovene sihyph23.tex
-TEX_HYPHEN_DAT+=       spanish eshyph.tex
-TEX_HYPHEN_DAT+=       swedish sehyph.tex
-TEX_HYPHEN_DAT+=       turkish trhyph.tex
-TEX_HYPHEN_DAT+=       ukrainian ukrhyph.tex
 TEX_MAP_FILES+=                antp.map
 TEX_MAP_FILES+=                cork-antt.map
 TEX_MAP_FILES+=                cs-antt.map
@@ -130,12 +127,12 @@
 TEX_MIXEDMAP_FILES+=   vnr.map
 
 .include "../../print/kpathsea/texmf.mk"
-.include "../../print/texlive-tetex/hyphen.mk"
 .include "../../print/texlive-tetex/map.mk"
 
 post-extract:
        rm -f ${WRKSRC}/ls-R
        rmdir ${WRKSRC}/doc/generic/pdfcrop
+       rm -rf ${WRKSRC}/doc/etex
        rm -f ${WRKSRC}/dvips/bluesky/config.cm*
        rm -rf ${WRKSRC}/dvips/config
        rm -rf ${WRKSRC}/dvips/tetex
@@ -164,23 +161,30 @@
        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 -rf ${WRKSRC}/fonts/source/public/latex
        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 -rf ${WRKSRC}/fonts/tfm/public/latex
        rm -f ${WRKSRC}/fonts/tfm/public/misc/[b-q]*.tfm
        rm -rf ${WRKSRC}/fonts/type1/bluesky/cm
+       rm -rf ${WRKSRC}/fonts/type1/bluesky/latex
+       rm -f ${WRKSRC}/makeindex/g*
        rm -rf ${WRKSRC}/omega/ocp/misc
        rm -rf ${WRKSRC}/omega/otp/misc
+       rm -rf ${WRKSRC}/tex/generic/bghyph
        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/german
+       rm -rf ${WRKSRC}/tex/generic/hyphen
        rm -rf ${WRKSRC}/tex/generic/null
+       rm -rf ${WRKSRC}/tex/generic/ruhyphen
        rm -rf ${WRKSRC}/tex/generic/texnames
+       rm -rf ${WRKSRC}/tex/generic/ukrhyph
+       rm -rf ${WRKSRC}/tex/latex/base
        rm -f ${WRKSRC}/tex/latex/dvipdfm/dvipdfm.def
+       rm -rf ${WRKSRC}/tex/latex/config
        rm -f ${WRKSRC}/tex/plain/base/[gmp-z]*
        rm -f ${WRKSRC}/tex/plain/base/letter*
        rm -rf ${WRKSRC}/tex/plain/config
diff -r c99f5ffc9991 -r 536dc236cbf0 print/teTeX3-texmf/PLIST
--- a/print/teTeX3-texmf/PLIST  Wed Apr 15 09:08:15 2009 +0000
+++ b/print/teTeX3-texmf/PLIST  Wed Apr 15 09:19:44 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/04/13 07:48:24 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/04/15 09:19:44 minskim Exp $
 share/texmf-dist/ChangeLog
 share/texmf-dist/LICENSE.texmf
 share/texmf-dist/aliases
@@ -126,8 +126,6 @@



Home | Main Index | Thread Index | Old Index