Use absolute paths in invoking tcfmgr, fmtutil, fmtutil-sys, texlinks,

updmap, updmap-sys, and various TeX engines.

6 files changed, 192 insertions, 12 deletions

diff --git a/print/texlive-tetex/Makefile b/print/texlive-tetex/Makefile
index 6d97d8c624b..d04d743344f 100644
--- a/print/texlive-tetex/Makefile
+++ b/print/texlive-tetex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2009/09/20 03:33:42 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2009/09/20 19:16:49 minskim Exp $
 
 DISTNAME=	texlive-20080816-source
 PKGNAME=	texlive-tetex-2008
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.lzma
@@ -38,12 +38,17 @@ SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	fmtutil fmtutil-sys kpsetool kpsewhere \
-			texconfig texconfig-dialog texconfig-sys \
+			tcfmgr texconfig texconfig-dialog texconfig-sys \
 			texlinks updmap updmap-sys
 SUBST_SED.paths=	-e 's,@DIALOG@,${LOCALBASE}/bin/dialog,g' \
+			-e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g' \
+			-e 's,@FMTUTIL_SYS@,${PREFIX}/bin/fmtutil-sys,g' \
 			-e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g' \
+			-e 's,@LOCALBASE@,${LOCALBASE},g' \
 			-e 's,@TEXCONFIG@,${PREFIX}/bin/texconfig,g' \
-			-e 's,@UPDMAP@,${PREFIX}/bin/updmap,g'
+			-e 's,@TEXLINKS@,${PREFIX}/bin/texlinks,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}
diff --git a/print/texlive-tetex/distinfo b/print/texlive-tetex/distinfo
index d3367c49e24..97b7ca851d6 100644
--- a/print/texlive-tetex/distinfo
+++ b/print/texlive-tetex/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2009/09/20 03:33:42 minskim Exp $
+$NetBSD: distinfo,v 1.5 2009/09/20 19:16:49 minskim Exp $
 
 SHA1 (texlive-20080816-source.tar.lzma) = 730986c628bd658b5062face9e400f61203d6b8d
 RMD160 (texlive-20080816-source.tar.lzma) = 629784b111c0d4bc9fac9f9131f63203d6e1dd38
@@ -7,10 +7,11 @@ SHA1 (patch-aa) = d8e7deffb731f1ad1f27ab085ef6185cd96d5461
 SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
 SHA1 (patch-ac) = 00a18f7106ac91c8f6e38b27cd607dce28d00cd6
 SHA1 (patch-ad) = 3fde31afd0d136e8f04a373b2ece3f6d7f587495
-SHA1 (patch-ae) = 3fc85a25f2618da91c6531f20a26f9d43f36125b
-SHA1 (patch-af) = 01a16d24be655036e8d7f2ad6448a06faa84cdf9
+SHA1 (patch-ae) = fb409ba1f357b257a041080ee2a71cbd456f026b
+SHA1 (patch-af) = a5c098fc4f136d35188318d322adeb6db885291d
 SHA1 (patch-ag) = 71dcd936a37628de69bb56f9f17f67e009b4646c
 SHA1 (patch-ah) = 12e49c230b2af8bac83539fb07a954e04e62fbd7
-SHA1 (patch-ai) = f082ca1a7525e7264a92e77d734342fe3861e377
+SHA1 (patch-ai) = 59d06c8fa109226045f56ff6cbfcaf18b77582ce
 SHA1 (patch-aj) = 4abe9d57ebafe6b053b84e1eea7fd63a43952e8b
 SHA1 (patch-ak) = 9c2125e681a4ae59f3d05ec92323c42cd928a1a2
+SHA1 (patch-al) = 0b51e3aecd3a048132ffd02bacfb9a63f55051ef
diff --git a/print/texlive-tetex/patches/patch-ae b/print/texlive-tetex/patches/patch-ae
index 62e409513f5..5107f0542eb 100644
--- a/print/texlive-tetex/patches/patch-ae
+++ b/print/texlive-tetex/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1 2009/09/20 03:33:43 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2009/09/20 19:16:49 minskim Exp $
 
 --- fmtutil.orig	2008-06-17 11:00:24.000000000 -0700
 +++ fmtutil
@@ -70,6 +70,15 @@ $NetBSD: patch-ae,v 1.1 2009/09/20 03:33:43 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()
+   (
+     # If necessary, set TEXPOOL. Use absolute path, because of KPSE_DOT.
+     $localpool && { TEXPOOL="`pwd`:$TEXPOOL"; export TEXPOOL; }
+-    verbose $engine -ini $tcxflag $jobswitch $prgswitch $texargs
++    verbose @LOCALBASE@/bin/$engine -ini $tcxflag $jobswitch $prgswitch $texargs
+   ) </dev/null
+ 
+   if test $use_engine_dir; then
 @@ -790,7 +790,7 @@ recreate_by_fmt()
  create_missing()
  {
diff --git a/print/texlive-tetex/patches/patch-af b/print/texlive-tetex/patches/patch-af
index e4470aef59a..844f1afa32c 100644
--- a/print/texlive-tetex/patches/patch-af
+++ b/print/texlive-tetex/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2009/09/20 03:33:43 minskim Exp $
+$NetBSD: patch-af,v 1.2 2009/09/20 19:16:49 minskim Exp $
 
 --- fmtutil-sys.orig	2006-01-17 13:41:51.000000000 -0800
 +++ fmtutil-sys
-@@ -19,8 +19,8 @@ unset RUNNING_BSH
+@@ -19,11 +19,11 @@ unset RUNNING_BSH
  test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
  export PATH
  
@@ -13,3 +13,7 @@ $NetBSD: patch-af,v 1.1 2009/09/20 03:33:43 minskim Exp $
  
  TEXMFVAR="$v"
  TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+ 
+-exec fmtutil ${1+"$@"}
++exec @FMTUTIL@ ${1+"$@"}
diff --git a/print/texlive-tetex/patches/patch-ai b/print/texlive-tetex/patches/patch-ai
index e6516739957..2665c2cadd1 100644
--- a/print/texlive-tetex/patches/patch-ai
+++ b/print/texlive-tetex/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2009/09/20 03:33:43 minskim Exp $
+$NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
 
 --- texconfig.orig	2008-07-17 13:24:39.000000000 -0700
 +++ texconfig
@@ -56,6 +56,15 @@ $NetBSD: patch-ai,v 1.1 2009/09/20 03:33:43 minskim Exp $
      *) return;;
    esac
  }
+@@ -478,7 +478,7 @@ listDvipsPapers()
+ #
+ getFormatsForHyphen()
+ {
+-  fmtutil --catcfg | awk '$3 != "-" {print $1}' | sort
++  @FMTUTIL@ --catcfg | awk '$3 != "-" {print $1}' | sort
+ }
+ 
+ ###############################################################################
 @@ -606,7 +606,7 @@ Report bugs to <tex-k@tug.org>."
        echo
        echo '============================= font map files ============================='
@@ -119,3 +128,97 @@ $NetBSD: patch-ai,v 1.1 2009/09/20 03:33:43 minskim Exp $
            if test -z "$MT_VARTEXFONTS"; then
              echo "$progname: failed to set \`font ro'; reason: could not determine VARTEXFONTS variable." >&2; rc=1
              return
+@@ -1023,10 +1023,10 @@ EOM
+ 
+       setupTmpDir
+       echo "$progname: analyzing old configuration..." >&2
+-      fmtutil --catcfg > $tmpdir/pre
+-      fmtutil --edit
++      @FMTUTIL@ --catcfg > $tmpdir/pre
++      @FMTUTIL@ --edit
+       echo "$progname: analyzing new configuration..." >&2
+-      fmtutil --catcfg > $tmpdir/post
++      @FMTUTIL@ --catcfg > $tmpdir/post
+ 
+       if cmp $tmpdir/pre $tmpdir/post >/dev/null 2>&1; then
+         echo "$progname: no new/updated formats available ..." >&2
+@@ -1034,9 +1034,9 @@ EOM
+       echo "$progname: updating formats ..." >&2
+         comm -13 $tmpdir/pre $tmpdir/post > $tmpdir/addOrChange
+         for i in `awk '{print $1}' $tmpdir/addOrChange`; do
+-          fmtutil --byfmt "$i" || rc=1
++          @FMTUTIL@ --byfmt "$i" || rc=1
+         done
+-        texlinks --multiplatform || rc=1
++        @TEXLINKS@ --multiplatform || rc=1
+       fi
+       ;;
+ 
+@@ -1076,7 +1076,7 @@ $formatsForHyphenFmt"
+         *)
+           if checkElemInList "$tcBatchHyphenFormat" $formatsForHyphen; then
+ 
+-            tcBatchHyphenFile=`fmtutil --showhyphen "$tcBatchHyphenFormat"`
++            tcBatchHyphenFile=`@FMTUTIL@ --showhyphen "$tcBatchHyphenFormat"`
+             case $tcBatchHyphenFile in
+               "")
+                 echo "$progname: could not find hyphen setup file for format \`$tcBatchHyphenFormat'" >&2
+@@ -1133,7 +1133,7 @@ $formatsForHyphenFmt"
+                   fi
+                   ;;
+               esac
+-              fmtutil --byhyphen "$tcBatchHFOut"
++              @FMTUTIL@ --byhyphen "$tcBatchHFOut"
+             fi
+           else
+             echo "$progname: invalid format \`$tcBatchHyphenFormat' specified as argument for \`$progname hyphen'" >&2
+@@ -1150,17 +1150,17 @@ $formatsForHyphenFmt"
+ 
+     init)
+       if test -n "$texconfig_sys"; then  # set by texconfig-sys
+-        fmtutil=fmtutil-sys
+-        updmap=updmap-sys
++        fmtutil=@FMTUTIL_SYS@
++        updmap=@UPDMAP_SYS@
+       else
+-        fmtutil=fmtutil
+-        updmap=updmap
++        fmtutil=@FMTUTIL@
++        updmap=@UPDMAP@
+       fi
+       
+       case $2 in
+         "")
+           if $fmtutil --all \
+-             && texlinks --multiplatform \
++             && @TEXLINKS@ --multiplatform \
+              && $updmap; then
+             :
+           else
+@@ -1273,7 +1273,7 @@ Valid PAPER settings:
+                 set x `getRes "$tcBatchPdftexMode"`; shift
+                 fmgrConfigReplace pdftexconfig.tex 'pdfpkresolution' "\\pdfpkresolution=$1"
+                 if $fmgrConfigReplaceChanged; then
+-                  fmtutil --refresh
++                  @FMTUTIL@ --refresh
+                 fi
+               else
+                 echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2
+@@ -1292,7 +1292,7 @@ Valid PAPER settings:
+               wChanged=$fmgrConfigReplaceChanged
+               fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
+               if $wChanged || $fmgrConfigReplaceChanged; then
+-                fmtutil --refresh
++                @FMTUTIL@ --refresh
+               fi
+               ;;
+             a4)
+@@ -1301,7 +1301,7 @@ Valid PAPER settings:
+               wChanged=$fmgrConfigReplaceChanged
+               fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
+               if $wChanged || $fmgrConfigReplaceChanged; then
+-                fmtutil --refresh
++                @FMTUTIL@ --refresh
+               fi
+               ;;
+             "") echo "$help" >&2; rc=1;;
diff --git a/print/texlive-tetex/patches/patch-al b/print/texlive-tetex/patches/patch-al
new file mode 100644
index 00000000000..17d6333d82f
--- /dev/null
+++ b/print/texlive-tetex/patches/patch-al
@@ -0,0 +1,58 @@
+$NetBSD: patch-al,v 1.1 2009/09/20 19:16:49 minskim Exp $
+
+--- tcfmgr.orig	2008-05-08 01:16:38.000000000 -0700
++++ tcfmgr
+@@ -46,7 +46,7 @@ setupMap()
+   esac
+   
+   case $TFC_MAP in
+-    "") TFC_MAP=`(kpsewhich -progname=texconfig -format='other text files' tcfmgr.map) 2>/dev/null`;;
++    "") TFC_MAP=`(@KPSEWHICH@ -progname=texconfig -format='other text files' tcfmgr.map) 2>/dev/null`;;
+   esac
+ 
+   case $TFC_MAP in
+@@ -83,7 +83,7 @@ setupTemp()
+ setupTexmfConfig()
+ {
+   case $TFC_TEXMFCONFIG in
+-    "") TFC_TEXMFCONFIG=`(kpsewhich -var-value=TEXMFCONFIG) 2>/dev/null`;;
++    "") TFC_TEXMFCONFIG=`(@KPSEWHICH@ -var-value=TEXMFCONFIG) 2>/dev/null`;;
+     *) (exit 0); return 0;;
+   esac
+   case $TFC_TEXMFCONFIG in
+@@ -94,7 +94,7 @@ setupTexmfConfig()
+ setupMktexDir()
+ {
+   case $TFC_MKTEXDIR in
+-    "") TFC_MKTEXDIR=`(kpsewhich --format='web2c files' mktexdir) 2>/dev/null`;;
++    "") TFC_MKTEXDIR=`(@KPSEWHICH@ --format='web2c files' mktexdir) 2>/dev/null`;;
+   esac
+ 
+   case $TFC_MKTEXDIR in
+@@ -105,7 +105,7 @@ setupMktexDir()
+ setupMktexupd()
+ {
+   case $TFC_MKTEXUPD in
+-    "") TFC_MKTEXUPD=`(kpsewhich --format='web2c files' mktexupd) 2>/dev/null`;;
++    "") TFC_MKTEXUPD=`(@KPSEWHICH@ --format='web2c files' mktexupd) 2>/dev/null`;;
+   esac
+ 
+   case $TFC_MKTEXUPD in
+@@ -192,7 +192,7 @@ check_out()
+     case "$orig" in
+       "")
+           get_info
+-          orig=`(kpsewhich -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE") 2>/dev/null`
++          orig=`(@KPSEWHICH@ -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE") 2>/dev/null`
+           ;;
+       *)
+           test -f "$orig" || orig=
+@@ -307,7 +307,7 @@ check_in()
+ find_file()
+ {
+   get_info
+-  kpsewhich -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE"
++  @KPSEWHICH@ -format="$kpseFormat" -progname="$kpseProgArg" "$TFC_FILE"
+ }
+ 
+ help()