Update texlive-tetex to 2009.

Major changes:
        * fmtutil (--byengine): new option, from Norbert.
        (help): mention it; other tweaks.
        * texlinks: new option -e to specify executable extension (for
        cygwin).

4 files changed, 103 insertions, 96 deletions

diff --git a/print/texlive-tetex/Makefile b/print/texlive-tetex/Makefile
index d04d743344f..480504d80cf 100644
--- a/print/texlive-tetex/Makefile
+++ b/print/texlive-tetex/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2009/09/20 19:16:49 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/16 03:40:44 minskim Exp $
 
-DISTNAME=	texlive-20080816-source
-PKGNAME=	texlive-tetex-2008
-PKGREVISION=	4
+DISTNAME=	texlive-20091011-source
+PKGNAME=	texlive-tetex-2009
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
-EXTRACT_SUFX=	.tar.lzma
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.tug.org/texlive/
@@ -13,12 +12,10 @@ COMMENT=	Scripts included in teTeX
 
 CONFLICTS+=	teTeX-bin<=3.0nb22
 DEPENDS+=	dialog>=1.0:../../misc/dialog
-DEPENDS+=	tex-bin-tetex-[0-9]*:../../print/tex-bin-tetex
+DEPENDS+=	tex-tetex-[0-9]*:../../print/tex-tetex
 
-EXTRACT_ELEMENTS=	${DISTNAME}/texk/tetex \
-			${DISTNAME}/texk/make \
-			${DISTNAME}/texk/install.sh \
-			${DISTNAME}/texk/mkinstalldirs
+EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
+			${DISTNAME}/texk/tetex
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -50,8 +47,7 @@ SUBST_SED.paths=	-e 's,@DIALOG@,${LOCALBASE}/bin/dialog,g' \
 			-e 's,@UPDMAP@,${PREFIX}/bin/updmap,g' \
 			-e 's,@UPDMAP_SYS@,${PREFIX}/bin/updmap-sys,g'
 
-INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
-			mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+INSTALLATION_DIRS+=	share/texmf/web2c
 
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
diff --git a/print/texlive-tetex/distinfo b/print/texlive-tetex/distinfo
index 97b7ca851d6..2bfb6d9d4fd 100644
--- a/print/texlive-tetex/distinfo
+++ b/print/texlive-tetex/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.5 2009/09/20 19:16:49 minskim Exp $
+$NetBSD: distinfo,v 1.6 2010/01/16 03:40:44 minskim Exp $
 
-SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
-RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
-Size (texlive-20080816-source.tar.lzma) = 23175835 bytes
-SHA1 (patch-aa) = d8e7deffb731f1ad1f27ab085ef6185cd96d5461
+SHA1 (texlive-20091011-source.tar.xz) = 82fc9fcdb82c63a00f4b08a51733c761cbda897d
+RMD160 (texlive-20091011-source.tar.xz) = 81b86cd93e629d6b1b3d7918848dd76babc0d5a9
+Size (texlive-20091011-source.tar.xz) = 29683728 bytes
+SHA1 (patch-aa) = 0ecc9a662343bc64a95da24ca010fcbf3aab5582
 SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
 SHA1 (patch-ac) = 00a18f7106ac91c8f6e38b27cd607dce28d00cd6
 SHA1 (patch-ad) = 3fde31afd0d136e8f04a373b2ece3f6d7f587495
-SHA1 (patch-ae) = fb409ba1f357b257a041080ee2a71cbd456f026b
+SHA1 (patch-ae) = 8dd5b7987d5e2b60b8158136141c3b9e3a569705
 SHA1 (patch-af) = a5c098fc4f136d35188318d322adeb6db885291d
 SHA1 (patch-ag) = 71dcd936a37628de69bb56f9f17f67e009b4646c
 SHA1 (patch-ah) = 12e49c230b2af8bac83539fb07a954e04e62fbd7
diff --git a/print/texlive-tetex/patches/patch-aa b/print/texlive-tetex/patches/patch-aa
index ca0465a436e..c9050035187 100644
--- a/print/texlive-tetex/patches/patch-aa
+++ b/print/texlive-tetex/patches/patch-aa
@@ -1,72 +1,83 @@
-$NetBSD: patch-aa,v 1.3 2009/09/19 15:31:03 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2010/01/16 03:40:44 minskim Exp $
 
---- Makefile.in.orig	2008-07-05 09:43:44.000000000 -0700
+--- Makefile.in.orig	2009-09-28 08:46:20.000000000 -0700
 +++ Makefile.in
-@@ -11,7 +11,7 @@ man5dir = $(mandir)/man5
+@@ -197,7 +197,6 @@ dist_bin_SCRIPTS = \
+ 	kpsetool \
+ 	kpsewhere \
+ 	ps2frag \
+-	ps4pdf \
+ 	pslatex \
+ 	rubibtex \
+ 	rumakeindex \
+@@ -225,7 +224,6 @@ dist_man1_MANS = \
+ 	context/texutil.man \
+ 	dvi2fax.man \
+ 	dvired.man \
+-	e2pall.man \
+ 	fmtutil.man \
+ 	fontinst.man \
+ 	kpsetool.man \
+@@ -254,14 +252,14 @@ dist_man5_MANS = \
+ 	fmtutil.cnf.5 \
+ 	updmap.cfg.5
  
- SCRIPTS = \
-   allcm allneeded dvi2fax dvired fmtutil fmtutil-sys fontinst \
--  kpsetool kpsewhere ps2frag ps4pdf pslatex rubibtex rumakeindex \
-+  kpsetool kpsewhere ps2frag pslatex rubibtex rumakeindex \
-   texconfig texconfig-dialog texconfig-sys \
-   texlinks updmap updmap-sys
+-tetexdocdir = ${prefix}/texmf/doc/tetex
++tetexdocdir = ${prefix}/texmf
+ dist_tetexdoc_DATA = \
+ 	doc/TETEXDOC.dvi \
+ 	doc/TETEXDOC.pdf \
+ 	doc/TETEXDOC.ps \
+ 	doc/teTeX-FAQ
  
-@@ -22,7 +22,7 @@ contextmanpgs = \
- # The man pages for script packages such as thumbpdf and mkjobtexmf are
- # copied here by hand; ctan2tl doesn't know how to handle this case.  Help.
- manpgs = \
--  allcm allec allneeded dvi2fax dvired e2pall epstopdf fontinst \
-+  allcm allec allneeded dvi2fax dvired fontinst \
-   kpsetool kpsewhere mkjobtexmf mkocp mkofm ofm2opl opl2ofm otp2ocp outocp \
-   ovf2ovp ovp2ovf ps2frag pslatex rubibtex rumakeindex texconfig \
-   texdoctk thumbpdf ttf2afm updmap
-@@ -34,7 +34,7 @@ install: install-data install-exec
+-texconfdir = ${prefix}
++texconfdir = ${prefix}/share
+ nobase_dist_texconf_DATA = \
+ 	texmf/texconfig/README \
+ 	texmf/texconfig/g/generic \
+@@ -269,7 +267,7 @@ nobase_dist_texconf_DATA = \
+ 	texmf/texconfig/v/vt100 \
+ 	texmf/texconfig/x/xterm
  
- # Auxiliary files.
- install-data::
--	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex
-+	$(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir)
- 	for p in $(manpgs); do \
- 	  $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \
- 	done
-@@ -46,29 +46,18 @@ install-data::
- 	$(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 $(man5dir)/fmtutil.cnf.5
- 	$(INSTALL_DATA) $(srcdir)/updmap.cfg.5 $(man5dir)/updmap.cfg.5
- 	cd $(man1dir); rm -f allec.$(manext) texhash.$(manext) \
--	  lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \
--	  kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \
--	  cweave.$(manext) odvicopy.$(manext) \
--	  odvitype.$(manext) texconfig-sys.$(manext) \
-+	  kpsepath.$(manext) \
-+	  kpsexpand.$(manext) \
-+	  texconfig-sys.$(manext) \
- 	  updmap-sys.$(manext) mktexfmt.$(manext) fmtutil-sys.$(manext)
- 	ln -s allcm.$(manext) $(man1dir)/allec.$(manext)
- 	ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext)
--	ln -s omega.$(manext) $(man1dir)/lambda.$(manext)
--	ln -s pdftex.$(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)
--	ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext)
--	ln -s cweb.$(manext) $(man1dir)/cweave.$(manext)
--	ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext)
--	ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext)
- 	ln -s texconfig.$(manext) $(man1dir)/texconfig-sys.$(manext)
- 	ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext)
- 	ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext)
- 	ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext)
--	for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \
--	  $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \
--	done
- 	$(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x
- 	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g
- 	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 $(texmf)/texconfig/v
-@@ -77,7 +66,6 @@ install-data::
- 	$(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig
- 	$(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr
- 	$(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map
--	$(INSTALL_DATA) $(srcdir)/fmtutil.cnf $(texmf)/web2c/fmtutil.cnf
+-texconfigdir = ${prefix}/texmf/texconfig
++texconfigdir = ${prefix}/share/texmf/texconfig
+ dist_texconfig_SCRIPTS = tcfmgr
+ dist_texconfig_DATA = tcfmgr.map
+ web2cdir = ${prefix}/texmf/web2c
+@@ -753,8 +751,8 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-dist_tetexdocDATA install-dist_texconfigDATA \
+-	install-dist_texconfigSCRIPTS install-dist_web2cDATA \
++install-data-am: install-dist_texconfigDATA \
++	install-dist_texconfigSCRIPTS \
+ 	install-man install-nobase_dist_texconfDATA
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -848,22 +846,15 @@ install-exec-hook:
+ 
+ install-data-hook:
+ 	cd $(DESTDIR)$(man1dir) \
+-	  && rm -f allec.1 ctangle.1 cweave.1 fmtutil-sys.1 kpsexpand.1 \
+-	    kpsepath.1 lambda.1 mf-nowin.1 mktexfmt.1 odvicopy.1 \
+-	    odvitype.1 pdflatex.1 texconfig-sys.1 texhash.1 updmap-sys.1 \
+-	  && $(LN_S) aleph.1 lambda.1 \
++	  && rm -f allec.1 fmtutil-sys.1 kpsexpand.1 \
++	    kpsepath.1 mktexfmt.1 \
++	    texconfig-sys.1 texhash.1 updmap-sys.1 \
+ 	  && $(LN_S) allcm.1 allec.1 \
+-	  && $(LN_S) cweb.1 ctangle.1 \
+-	  && $(LN_S) cweb.1 cweave.1 \
+-	  && $(LN_S) dvicopy.1 odvicopy.1 \
+-	  && $(LN_S) dvitype.1 odvitype.1 \
+ 	  && $(LN_S) fmtutil.1 fmtutil-sys.1 \
+ 	  && $(LN_S) fmtutil.1 mktexfmt.1 \
+ 	  && $(LN_S) kpsetool.1 kpsexpand.1 \
+ 	  && $(LN_S) kpsetool.1 kpsepath.1 \
+-	  && $(LN_S) mf.1 mf-nowin.1 \
+ 	  && $(LN_S) mktexlsr.1 texhash.1  \
+-	  && $(LN_S) pdftex.1 pdflatex.1 \
+ 	  && $(LN_S) texconfig.1 texconfig-sys.1 \
+ 	  && $(LN_S) updmap.1 updmap-sys.1
  
- install-exec: 
- 	-$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir)
diff --git a/print/texlive-tetex/patches/patch-ae b/print/texlive-tetex/patches/patch-ae
index 5107f0542eb..9e289a3b599 100644
--- a/print/texlive-tetex/patches/patch-ae
+++ b/print/texlive-tetex/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
+$NetBSD: patch-ae,v 1.3 2010/01/16 03:40:44 minskim Exp $
 
---- fmtutil.orig	2008-06-17 11:00:24.000000000 -0700
+--- fmtutil.orig	2009-10-08 17:24:54.000000000 -0700
 +++ fmtutil
-@@ -166,7 +166,7 @@ getmatch()
+@@ -191,7 +191,7 @@ getmatch()
  initTexmfMain()
  {
    case $MT_TEXMFMAIN in
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
    esac
    export MT_TEXMFMAIN
  }
-@@ -178,14 +178,14 @@ initTexmfMain()
+@@ -203,14 +203,14 @@ initTexmfMain()
  ###############################################################################
  cache_vars()
  {
@@ -34,7 +34,7 @@ $NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
    export MT_VARTEXFONTS MT_MKTEXNAM MT_MKTEXNAM_OPT MT_MKTEXDIR
    export MT_MKTEXDIR_OPT MT_MKTEXUPD MT_MKTEX_CNF MT_MKTEX_OPT
  }
-@@ -512,7 +512,7 @@ main()
+@@ -541,7 +541,7 @@ main()
  
    # set up destdir:
    if test -z "$destdir"; then
@@ -43,8 +43,8 @@ $NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
      destdir=$MT_TEXMFVAR/web2c
    fi
    test -d "$destdir" || mktexdir "$destdir" >/dev/null 2>&1
-@@ -617,7 +617,7 @@ parse_line()
-   esac
+@@ -650,7 +650,7 @@ parse_line()
+   inifile=`echo $lastarg | sed 's%^\*%%'`
  
    # See if we can find $inifile for return code:
 -  kpsewhich -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1
@@ -52,7 +52,7 @@ $NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
  }
  
  ###############################################################################
-@@ -630,7 +630,7 @@ find_hyphenfile()
+@@ -663,7 +663,7 @@ find_hyphenfile()
    format="$1"; hyphenation="$2"
    case $hyphenation in
      -) ;;
@@ -61,7 +61,7 @@ $NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
    esac
  }
  
-@@ -661,7 +661,7 @@ run_initex()
+@@ -694,7 +694,7 @@ run_initex()
    poolfile=
    tcxflag=
    test -n "$pool" \
@@ -70,7 +70,7 @@ $NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
    if test -n "$poolfile" && test -f "$poolfile"; then
      verboseMsg "$progname: attempting to create localized format using pool=$pool and tcx=$tcx."
      cp "$poolfile" $engine.pool
-@@ -694,7 +694,7 @@ run_initex()
+@@ -727,7 +727,7 @@ run_initex()
    (
      # If necessary, set TEXPOOL. Use absolute path, because of KPSE_DOT.
      $localpool && { TEXPOOL="`pwd`:$TEXPOOL"; export TEXPOOL; }
@@ -79,7 +79,7 @@ $NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
    ) </dev/null
  
    if test $use_engine_dir; then
-@@ -790,7 +790,7 @@ recreate_by_fmt()
+@@ -850,7 +850,7 @@ recreate_by_fmt()
  create_missing()
  {
    # match_cmd='test ! -f $destdir/$fmtfile'
@@ -88,7 +88,7 @@ $NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
    recreate_loop
  }
  
-@@ -800,7 +800,7 @@ create_missing()
+@@ -860,7 +860,7 @@ create_missing()
  ###############################################################################
  recreate_existing()
  {