Update tex-tetex{,-doc} to 3.0.27774.

In TeX Live 2012, this package replaces print/texlive-tetex.

12 files changed, 470 insertions, 37 deletions

diff --git a/print/tex-tetex/Makefile b/print/tex-tetex/Makefile
index 18d8bc30c32..8d10fdeed3f 100644
--- a/print/tex-tetex/Makefile
+++ b/print/tex-tetex/Makefile
@@ -1,29 +1,43 @@
-# $NetBSD: Makefile,v 1.14 2012/10/03 21:57:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/13 22:38:20 minskim Exp $
 
 DISTNAME=	tetex
-PKGNAME=	tex-${DISTNAME}-3.0.26894
-PKGREVISION=	1
-TEXLIVE_REV=	26894
+PKGNAME=	tex-${DISTNAME}-3.0.27774
+TEXLIVE_REV=	27774
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Supplementary files for updmap
 
-CONFLICTS=	texlive-tetex<2011
+CONFLICTS=	texlive-tetex<=2011nb1
+DEPENDS+=	dialog>=1.0:../../misc/dialog
+DEPENDS+=	kpathsea-[0-9]*:../../print/kpathsea
+DEPENDS+=	tex-texconfig-[0-9]*:../../print/tex-texconfig
 DEPENDS+=	tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra
 
 USE_TOOLS+=	perl:run sh:run
 
 FILES_SUBST+=	UPDMAP_SYS=${PREFIX}/bin/updmap-sys
 
+EVAL_PREFIX+=	DIALOG_PREFIX=dialog
+EVAL_PREFIX+=	KPATHSEA_PREFIX=kpathsea
+EVAL_PREFIX+=	TEXCONFIG_PREFIX=tex-texconfig
+
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Setting paths to commands.
 SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	bin/updmap bin/updmap-sys
-SUBST_SED.paths=	-e 's,@KPSEWHICH@,${LOCALBASE}/bin/kpsewhich,g' \
-			-e 's,@UPDMAP@,${PREFIX}/bin/updmap,g'
+SUBST_FILES.paths=	bin/fmtutil bin/fmtutil-sys bin/kpsetool bin/kpsewhere \
+			bin/texconfig-dialog bin/texconfig-sys bin/texlinks \
+			bin/updmap bin/updmap-sys
+SUBST_SED.paths+=	-e 's,@DIALOG@,${DIALOG_PREFIX}/bin/dialog,g'
+SUBST_SED.paths+=	-e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g'
+SUBST_SED.paths+=	-e 's,@KPSEWHICH@,${KPATHSEA_PREFIX}/bin/kpsewhich,g'
+SUBST_SED.paths+=	-e 's,@TEXCONFIG@,${TEXCONFIG_PREFIX}/bin/texconfig,g'
+SUBST_SED.paths+=	-e 's,@UPDMAP@,${PREFIX}/bin/updmap,g'
 
 REPLACE_PERL=	bin/updmap
-REPLACE_SH=	bin/updmap-sys
+REPLACE_SH=	bin/allcm bin/allneeded bin/dvi2fax bin/dvired \
+		bin/fmtutil-sys bin/fmtutil bin/kpsetool bin/kpsewhere \
+		bin/texconfig-dialog bin/texconfig-sys bin/texlinks \
+		bin/updmap-sys
 
 PKG_SYSCONFSUBDIR=	texmf
 
@@ -38,9 +52,21 @@ TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR} \
 
 post-extract:
 	${MKDIR} ${WRKSRC}/bin
-	${MV} ${WRKSRC}/texmf/scripts/tetex/updmap-sys.sh \
-		${WRKSRC}/bin/updmap-sys
-	${MV} ${WRKSRC}/texmf/scripts/tetex/updmap.pl ${WRKSRC}/bin/updmap
+.for script in fmtutil-sys.sh fmtutil.sh texconfig-dialog.sh \
+		texconfig-sys.sh texlinks.sh
+	${MV} ${WRKSRC}/texmf/scripts/tetex/${script} \
+		${WRKSRC}/bin/${script:S/.sh//}
+.endfor
+.for script in allcm.sh allneeded.sh dvi2fax.sh dvired.sh kpsetool.sh \
+		kpsewhere.sh updmap-sys.sh updmap.pl
+	${MV} ${WRKSRC}/texmf-dist/scripts/tetex/${script} \
+		${WRKSRC}/bin/${script:S/.pl//:S/.sh//}
+.endfor
 	${RMDIR} -p ${WRKSRC}/texmf/scripts/tetex 2>/dev/null || ${TRUE}
 
+post-install:
+	${LN} -sf allcm ${DESTDIR}${PREFIX}/bin/allec
+	${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsepath
+	${LN} -sf kpsetool ${DESTDIR}${PREFIX}/bin/kpsexpand
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-tetex/PLIST b/print/tex-tetex/PLIST
index 2e33d030307..c5ff5cc5520 100644
--- a/print/tex-tetex/PLIST
+++ b/print/tex-tetex/PLIST
@@ -1,4 +1,18 @@
-@comment $NetBSD: PLIST,v 1.5 2012/07/22 20:24:42 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/10/13 22:38:20 minskim Exp $
+bin/allcm
+bin/allec
+bin/allneeded
+bin/dvi2fax
+bin/dvired
+bin/fmtutil
+bin/fmtutil-sys
+bin/kpsepath
+bin/kpsetool
+bin/kpsewhere
+bin/kpsexpand
+bin/texconfig-dialog
+bin/texconfig-sys
+bin/texlinks
 bin/updmap
 bin/updmap-sys
 share/texmf-dist/web2c/updmap.cfg
@@ -30,3 +44,4 @@ share/texmf/fonts/map/dvips/tetex/mathpple.map
 share/texmf/fonts/map/dvips/tetex/pdftex35.map
 share/texmf/fonts/map/dvips/tetex/ps2pk35.map
 share/texmf/web2c/updmap.cfg
+@pkgdir share/texmf-dist/scripts/tetex
diff --git a/print/tex-tetex/distinfo b/print/tex-tetex/distinfo
index 49773f5122d..214048d365a 100644
--- a/print/tex-tetex/distinfo
+++ b/print/tex-tetex/distinfo
@@ -1,8 +1,15 @@
-$NetBSD: distinfo,v 1.12 2012/07/22 20:24:42 minskim Exp $
+$NetBSD: distinfo,v 1.13 2012/10/13 22:38:20 minskim Exp $
 
-SHA1 (tex-tetex-26894/tetex.tar.xz) = 23dc779933cbabcebd7603c62d84f31983fad2c4
-RMD160 (tex-tetex-26894/tetex.tar.xz) = 2a9a2364fe7ac1b9e91b5d0eded75f3738d51ccd
-Size (tex-tetex-26894/tetex.tar.xz) = 28908 bytes
-SHA1 (patch-bin_updmap) = db3717e0dc5046530e2b8cf52ba7cfc194616618
+SHA1 (tex-tetex-27774/tetex.tar.xz) = 325de417b58edb930d3931f1de1a4304b97faf47
+RMD160 (tex-tetex-27774/tetex.tar.xz) = 56b1823fa3d3a39675bc418ecdfb746ca7c4b3f4
+Size (tex-tetex-27774/tetex.tar.xz) = 45068 bytes
+SHA1 (patch-bin_fmtutil) = 236e785100421eb544cf6c2ba37aa54d584b11cd
+SHA1 (patch-bin_fmtutil-sys) = 9503b6ab417676b8ad390a8fb02a07593da4084e
+SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb
+SHA1 (patch-bin_kpsewhere) = d442bf917f9fbd5f6a0bc3c461b01cf4ad03346e
+SHA1 (patch-bin_texconfig-dialog) = 6d4522833219687fcbc2b4b91047254fe97052aa
+SHA1 (patch-bin_texconfig-sys) = 5f72cf599cfde3af0bd21797aa8ad77f78287459
+SHA1 (patch-bin_texlinks) = da88d185d7610afae9a84b5d0ce34c8fac957e0b
+SHA1 (patch-bin_updmap) = b2982af8d74176f473710fadf67fc81fc3be5f31
 SHA1 (patch-bin_updmap-sys) = adf818f5e13cb20f104d3d590eb4a7d1b4598139
-SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 79e98098006917c455a7b4403e88a9186edcbf56
+SHA1 (patch-texmf-dist_web2c_updmap.cfg) = f87dfc7759a8e49453f99c02134fa0bd94bb3912
diff --git a/print/tex-tetex/patches/patch-bin_fmtutil b/print/tex-tetex/patches/patch-bin_fmtutil
new file mode 100644
index 00000000000..5c5ef02834d
--- /dev/null
+++ b/print/tex-tetex/patches/patch-bin_fmtutil
@@ -0,0 +1,90 @@
+$NetBSD: patch-bin_fmtutil,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/fmtutil.orig	2012-10-09 17:39:16.000000000 +0000
++++ bin/fmtutil
+@@ -213,7 +213,7 @@ getmatch()
+ initTexmfMain()
+ {
+   case $MT_TEXMFMAIN in
+-    "") MT_TEXMFMAIN=`kpsewhich --var-value=TEXMFMAIN`;;
++    "") MT_TEXMFMAIN=`@KPSEWHICH@ --var-value=TEXMFMAIN`;;
+   esac
+   export MT_TEXMFMAIN
+ }
+@@ -225,14 +225,14 @@ initTexmfMain()
+ ###############################################################################
+ cache_vars()
+ {
+-  : ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
+-  : ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`}
+-  : ${MT_MKTEXNAM_OPT=`kpsewhich --format='web2c files' mktexnam.opt`}
+-  : ${MT_MKTEXDIR=`kpsewhich --format='web2c files' mktexdir`}
+-  : ${MT_MKTEXDIR_OPT=`kpsewhich --format='web2c files' mktexdir.opt`}
+-  : ${MT_MKTEXUPD=`kpsewhich --format='web2c files' mktexupd`}
+-  : ${MT_MKTEX_CNF=`kpsewhich --format='web2c files' mktex.cnf`}
+-  : ${MT_MKTEX_OPT=`kpsewhich --format='web2c files' mktex.opt`}
++  : ${MT_VARTEXFONTS=`@KPSEWHICH@ --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
++  : ${MT_MKTEXNAM=`@KPSEWHICH@ --format='web2c files' mktexnam`}
++  : ${MT_MKTEXNAM_OPT=`@KPSEWHICH@ --format='web2c files' mktexnam.opt`}
++  : ${MT_MKTEXDIR=`@KPSEWHICH@ --format='web2c files' mktexdir`}
++  : ${MT_MKTEXDIR_OPT=`@KPSEWHICH@ --format='web2c files' mktexdir.opt`}
++  : ${MT_MKTEXUPD=`@KPSEWHICH@ --format='web2c files' mktexupd`}
++  : ${MT_MKTEX_CNF=`@KPSEWHICH@ --format='web2c files' mktex.cnf`}
++  : ${MT_MKTEX_OPT=`@KPSEWHICH@ --format='web2c files' mktex.opt`}
+   export MT_VARTEXFONTS MT_MKTEXNAM MT_MKTEXNAM_OPT MT_MKTEXDIR
+   export MT_MKTEXDIR_OPT MT_MKTEXUPD MT_MKTEX_CNF MT_MKTEX_OPT
+ }
+@@ -574,7 +574,7 @@ main()
+ 
+   # set up destdir:
+   if test -z "$destdir"; then
+-    : ${MT_TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`}
++    : ${MT_TEXMFVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`}
+     destdir=$MT_TEXMFVAR/web2c
+   fi
+   test -d "$destdir" || mktexdir "$destdir" >/dev/null 2>&1
+@@ -683,7 +683,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
++  @KPSEWHICH@ -progname=$format -format=$kpsefmt $inifile >/dev/null 2>&1
+ }
+ 
+ ###############################################################################
+@@ -696,7 +696,7 @@ find_hyphenfile()
+   format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`"
+   case $hyphenation in
+     -) ;;
+-    *) kpsewhich -progname="$format" -format=tex $hyphenation;;
++    *) @KPSEWHICH@ -progname="$format" -format=tex $hyphenation;;
+   esac
+ }
+ 
+@@ -727,7 +727,7 @@ run_initex()
+   poolfile=
+   tcxflag=
+   test -n "$pool" \
+-    && poolfile=`(kpsewhich -progname=$engine $pool.pool) 2>/dev/null`
++    && poolfile=`(@KPSEWHICH@ -progname=$engine $pool.pool) 2>/dev/null`
+   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
+@@ -886,7 +886,7 @@ recreate_by_fmt()
+ create_missing()
+ {
+   # match_cmd='test ! -f $destdir/$fmtfile'
+-  match_cmd='test ! -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
++  match_cmd='test ! -f "`@KPSEWHICH@ -engine=$texengine -progname=$format $fmtfile`"'
+   recreate_loop
+ }
+ 
+@@ -896,7 +896,7 @@ create_missing()
+ ###############################################################################
+ recreate_existing()
+ {
+-  match_cmd='test -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
++  match_cmd='test -f "`@KPSEWHICH@ -engine=$texengine -progname=$format $fmtfile`"'
+   recreate_loop
+ }
+ 
diff --git a/print/tex-tetex/patches/patch-bin_fmtutil-sys b/print/tex-tetex/patches/patch-bin_fmtutil-sys
new file mode 100644
index 00000000000..4c9fbd2a4cf
--- /dev/null
+++ b/print/tex-tetex/patches/patch-bin_fmtutil-sys
@@ -0,0 +1,19 @@
+$NetBSD: patch-bin_fmtutil-sys,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/fmtutil-sys.orig	2012-10-09 17:39:16.000000000 +0000
++++ bin/fmtutil-sys
+@@ -19,11 +19,11 @@ unset RUNNING_BSH
+ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+ export PATH
+ 
+-v=`kpsewhich -var-value TEXMFSYSVAR`
+-c=`kpsewhich -var-value TEXMFSYSCONFIG`
++v=`@KPSEWHICH@ -var-value TEXMFSYSVAR`
++c=`@KPSEWHICH@ -var-value TEXMFSYSCONFIG`
+ 
+ TEXMFVAR="$v"
+ TEXMFCONFIG="$c"
+ export TEXMFVAR TEXMFCONFIG
+ 
+-exec fmtutil ${1+"$@"}
++exec @FMTUTIL@ ${1+"$@"}
diff --git a/print/tex-tetex/patches/patch-bin_kpsetool b/print/tex-tetex/patches/patch-bin_kpsetool
new file mode 100644
index 00000000000..ad6c1239c0c
--- /dev/null
+++ b/print/tex-tetex/patches/patch-bin_kpsetool
@@ -0,0 +1,18 @@
+$NetBSD: patch-bin_kpsetool,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/kpsetool.orig	2012-10-09 17:39:16.000000000 +0000
++++ bin/kpsetool
+@@ -109,10 +109,10 @@ esac
+ case "$action" in
+   kpsewhich)
+     test $# = 1 || { echo "$progname: missing filename"; echo "$usage"; exit 1; }
+-    kpsewhich $flags -format="$format" "$1";;
++    @KPSEWHICH@ $flags -format="$format" "$1";;
+   kpsepath)
+-    kpsewhich $flags -show-path="$format";;
++    @KPSEWHICH@ $flags -show-path="$format";;
+   kpsexpand)
+     test $# = 1 || { echo "$progname: missing string"; echo "$usage"; exit 1; }
+-    kpsewhich $flags -expand-var="$1";;
++    @KPSEWHICH@ $flags -expand-var="$1";;
+ esac
diff --git a/print/tex-tetex/patches/patch-bin_kpsewhere b/print/tex-tetex/patches/patch-bin_kpsewhere
new file mode 100644
index 00000000000..71f8c66903c
--- /dev/null
+++ b/print/tex-tetex/patches/patch-bin_kpsewhere
@@ -0,0 +1,16 @@
+$NetBSD: patch-bin_kpsewhere,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/kpsewhere.orig	2012-10-09 17:39:16.000000000 +0000
++++ bin/kpsewhere
+@@ -55,9 +55,9 @@ esac
+ IFS=':'
+ for file
+ do
+-    for path in `kpsewhich --expand-path='$TEXMF'`
++    for path in `@KPSEWHICH@ --expand-path='$TEXMF'`
+     do
+-        eval TEXMF=\$path kpsewhich $options \"\$file\"
++        eval TEXMF=\$path @KPSEWHICH@ $options \"\$file\"
+     done
+ done
+ exit 0
diff --git a/print/tex-tetex/patches/patch-bin_texconfig-dialog b/print/tex-tetex/patches/patch-bin_texconfig-dialog
new file mode 100644
index 00000000000..7471a31dead
--- /dev/null
+++ b/print/tex-tetex/patches/patch-bin_texconfig-dialog
@@ -0,0 +1,178 @@
+$NetBSD: patch-bin_texconfig-dialog,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/texconfig-dialog.orig	2012-10-09 17:39:16.000000000 +0000
++++ bin/texconfig-dialog
+@@ -81,14 +81,7 @@ logexec()
+ ###############################################################################
+ runDialog()
+ {
+-  if test -n "$DIALOG_PROG"; then
+-    termCtl clear
+-    $DIALOG_PROG --title "TeX setup utility" ${1+"$@"}
+-    runDialogRc=$?
+-    termCtl clear
+-  else
+-    abort "could not find dialog or whiptail program to run"
+-  fi
++  @DIALOG@ --title "TeX setup utility" ${1+"$@"}
+   (exit $runDialogRc)
+   return $runDialogRc
+ }
+@@ -101,7 +94,7 @@ findDialog()
+ {
+   for bin in whiptail dialog
+   do
+-    binLoc=`texconfig findprog $bin`
++    binLoc=`@TEXCONFIG@ findprog $bin`
+     case $binLoc in
+       "") DIALOG_PROG="";;
+       *)  DIALOG_PROG=$binLoc; break;;
+@@ -195,11 +188,11 @@ trouble, you may have more luck with +/-
+         menuMode
+         ;;
+       REHASH)
+-        logexec texconfig rehash
++        logexec @TEXCONFIG@ rehash
+         termCtl readln
+         ;;
+       FORMATS)
+-        texconfig formats
++        @TEXCONFIG@ formats
+         termCtl readln
+         ;;
+       HYPHENATION)
+@@ -209,11 +202,11 @@ trouble, you may have more luck with +/-
+         menuDvips
+         ;;
+       FAQ)
+-        texconfig faq
++        @TEXCONFIG@ faq
+         termCtl readln
+         ;;
+       CONF)
+-        logexec texconfig conf
++        logexec @TEXCONFIG@ conf
+         termCtl readln
+         ;;
+       LOG)
+@@ -234,7 +227,7 @@ Chosse a mode to be used when metafont g
+ be differences between modes of the same resolution. See the comments in the file modes.mf for more details.
+ \"" \
+       23 80 14 \
+-      `texconfig mode-list` 2>"$tmpmenu"
++      `@TEXCONFIG@ mode-list` 2>"$tmpmenu"
+ }
+ 
+ menuMode()
+@@ -243,7 +236,7 @@ menuMode()
+   mode=`cat "$tmpmenu"`
+ 
+   if test -n "$mode"; then
+-    logexec texconfig mode "$mode"
++    logexec @TEXCONFIG@ mode "$mode"
+     termCtl readln
+   fi
+ }
+@@ -312,7 +305,7 @@ NOTE: If you just press return, printing
+               menuDvipsPrintOpt=$menuDvipsAns
+               ;;
+           esac
+-          logexec texconfig dvips $menuDvipsPrinterOpt printcmd "$menuDvipsPrintOpt"
++          logexec @TEXCONFIG@ dvips $menuDvipsPrinterOpt printcmd "$menuDvipsPrintOpt"
+           termCtl readln
+         fi
+         ;;
+@@ -321,7 +314,7 @@ NOTE: If you just press return, printing
+         mode=`cat "$tmpmenu"`
+   
+         if test -n "$mode"; then
+-          logexec texconfig dvips $menuDvipsPrinterOpt mode "$mode"
++          logexec @TEXCONFIG@ dvips $menuDvipsPrinterOpt mode "$mode"
+           termCtl readln
+         fi
+         ;;
+@@ -331,7 +324,7 @@ offset), e.g. 2mm,-0.5in (right 2mm and 
+         case $menuDvipsAns in
+           "") : ;;
+           *)
+-            logexec texconfig dvips $menuDvipsPrinterOpt offset "$menuDvipsAns"
++            logexec @TEXCONFIG@ dvips $menuDvipsPrinterOpt offset "$menuDvipsAns"
+             termCtl readln
+             ;;
+         esac
+@@ -339,11 +332,11 @@ offset), e.g. 2mm,-0.5in (right 2mm and 
+       PAPER)
+         eval runDialog \
+           --menu \'\\n\\nChoose the default papersize definition for dvips.\\n\\n\' \
+-          23 80 8 `texconfig dvips paper-list` \
++          23 80 8 `@TEXCONFIG@ dvips paper-list` \
+           2>"$tmpmenu"
+         paper=`cat "$tmpmenu"`
+         if test -n "$paper"; then
+-          logexec texconfig dvips paper "$paper"
++          logexec @TEXCONFIG@ dvips paper "$paper"
+           termCtl readln
+         fi
+         ;;
+@@ -364,7 +357,7 @@ offset), e.g. 2mm,-0.5in (right 2mm and 
+         case $menuDvipsAns in
+           "") : ;;
+           *)
+-            logexec texconfig dvips add $menuDvipsAns
++            logexec @TEXCONFIG@ dvips add $menuDvipsAns
+             termCtl readln
+             ;;
+         esac
+@@ -375,7 +368,7 @@ offset), e.g. 2mm,-0.5in (right 2mm and 
+         case $menuDvipsAns in
+           "") : ;;
+           *)
+-	    logexec texconfig dvips del $menuDvipsAns
++	    logexec @TEXCONFIG@ dvips del $menuDvipsAns
+             termCtl readln
+             ;;
+         esac
+@@ -398,11 +391,11 @@ Select your default paper format.
+   p=`cat "$tmpmenu"`
+   case $p in
+     A4)
+-      logexec texconfig paper a4
++      logexec @TEXCONFIG@ paper a4
+       termCtl readln
+       ;;
+     LETTER)
+-      logexec texconfig paper letter
++      logexec @TEXCONFIG@ paper letter
+       termCtl readln
+       ;;
+   esac
+@@ -415,14 +408,14 @@ menuHyphenation()
+ Choose format to set up hyphenation for.
+ " \
+     23 80 14 \
+-    `texconfig hyphen-list | sed 's@\(.*\)@\1 \1@'`  2>"$tmpmenu"
++    `@TEXCONFIG@ hyphen-list | sed 's@\(.*\)@\1 \1@'`  2>"$tmpmenu"
+   p=`cat "$tmpmenu"`
+   case $p in
+     "")
+       return
+       ;;
+     *)
+-      texconfig hyphen "$p"
++      @TEXCONFIG@ hyphen "$p"
+       termCtl readln
+   esac
+ }
+@@ -445,9 +438,9 @@ eof
+ esac
+ 
+ 
+-: ${TEXMFCONFIG=`kpsewhich -var-value=TEXMFCONFIG`}
+-: ${TEXMFVAR=`kpsewhich -var-value=TEXMFVAR`}
+-: ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
++: ${TEXMFCONFIG=`@KPSEWHICH@ -var-value=TEXMFCONFIG`}
++: ${TEXMFVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`}
++: ${TEXMFMAIN=`@KPSEWHICH@ -var-value=TEXMFMAIN`}
+ export TEXMFCONFIG TEXMFVAR TEXMFMAIN
+ 
+ setupTmpDir
diff --git a/print/tex-tetex/patches/patch-bin_texconfig-sys b/print/tex-tetex/patches/patch-bin_texconfig-sys
new file mode 100644
index 00000000000..79ef900d3b0
--- /dev/null
+++ b/print/tex-tetex/patches/patch-bin_texconfig-sys
@@ -0,0 +1,15 @@
+$NetBSD: patch-bin_texconfig-sys,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/texconfig-sys.orig	2012-10-09 17:39:16.000000000 +0000
++++ bin/texconfig-sys
+@@ -21,8 +21,8 @@ export PATH
+ # hack around a bug in zsh:
+ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+ 
+-v=`kpsewhich -var-value TEXMFSYSVAR`
+-c=`kpsewhich -var-value TEXMFSYSCONFIG`
++v=`@KPSEWHICH@ -var-value TEXMFSYSVAR`
++c=`@KPSEWHICH@ -var-value TEXMFSYSCONFIG`
+ 
+ TEXMFVAR="$v"
+ TEXMFCONFIG="$c"
diff --git a/print/tex-tetex/patches/patch-bin_texlinks b/print/tex-tetex/patches/patch-bin_texlinks
new file mode 100644
index 00000000000..0b68ff18e03
--- /dev/null
+++ b/print/tex-tetex/patches/patch-bin_texlinks
@@ -0,0 +1,40 @@
+$NetBSD: patch-bin_texlinks,v 1.1 2012/10/13 22:38:20 minskim Exp $
+
+--- bin/texlinks.orig	2012-10-09 17:39:16.000000000 +0000
++++ bin/texlinks
+@@ -188,7 +188,7 @@ install_link()
+ ###############################################################################
+ search_symlinkdir()
+ {
+-  kpsewhich=`check_for_binary kpsewhich`
++  kpsewhich=@KPSEWHICH@
+   test -z "$kpsewhich" && return 1
+   symlinkdir=`echo $kpsewhich | sed 's@/*kpsewhich$@@'`
+   kpseaccess -w "$symlinkdir" || return 1
+@@ -251,7 +251,7 @@ main()
+   silent=false
+   thisdir=`pwd`
+   : ${KPSE_DOT=$thisdir}; export KPSE_DOT
+-  selfautoloc=`kpsewhich --expand-var='$SELFAUTOLOC'`
++  selfautoloc=`@KPSEWHICH@ --expand-var='$SELFAUTOLOC'`
+   while 
+     case $1 in
+       --h*|-h)
+@@ -272,7 +272,7 @@ main()
+   dirs="$*"
+ 
+   # if no cnf_file from command-line, look it up with kpsewhich:
+-  test -z "$cnf_file" && cnf_file=`kpsewhich --format='web2c files' $cnf`
++  test -z "$cnf_file" && cnf_file=`@KPSEWHICH@ --format='web2c files' $cnf`
+   test -f "$cnf_file" || abort "config file \`$cnf' not found"
+ 
+ 
+@@ -287,7 +287,7 @@ main()
+     if test $multiplatform = true; then
+       case $selfautoloc in
+         */bin) dirs=$selfautoloc;;
+-        *)     parent=`kpsewhich --expand-var='$SELFAUTODIR'`
++        *)     parent=`@KPSEWHICH@ --expand-var='$SELFAUTODIR'`
+                dirs=`find $parent -type f -name kpsewhich -print \
+                        | sed 's@/kpsewhich$@@'`;;
+       esac
diff --git a/print/tex-tetex/patches/patch-bin_updmap b/print/tex-tetex/patches/patch-bin_updmap
index 849a9e0c565..1bfb5aed2c6 100644
--- a/print/tex-tetex/patches/patch-bin_updmap
+++ b/print/tex-tetex/patches/patch-bin_updmap
@@ -1,6 +1,6 @@
-$NetBSD: patch-bin_updmap,v 1.2 2012/07/22 20:24:42 minskim Exp $
+$NetBSD: patch-bin_updmap,v 1.3 2012/10/13 22:38:20 minskim Exp $
 
---- bin/updmap.orig	2012-06-10 22:43:00.000000000 +0000
+--- bin/updmap.orig	2012-09-13 03:38:21.000000000 +0000
 +++ bin/updmap
 @@ -23,7 +23,7 @@ my $TEXMFROOT;
  
@@ -11,20 +11,22 @@ $NetBSD: patch-bin_updmap,v 1.2 2012/07/22 20:24:42 minskim Exp $
    if ($?) {
      print STDERR "updmap: Cannot find TEXMFROOT, aborting!\n";
      exit 1;
-@@ -50,9 +50,9 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
+@@ -50,10 +50,10 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
  # this function checks by itself whether it is running on windows or not
  reset_root_home();
  
 -chomp(my $TEXMFMAIN = `kpsewhich --var-value=TEXMFMAIN`);
 -chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
 -chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
+-chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`);
 +chomp(my $TEXMFMAIN = `@KPSEWHICH@ --var-value=TEXMFMAIN`);
 +chomp(my $TEXMFVAR = `@KPSEWHICH@ -var-value=TEXMFVAR`);
 +chomp(my $TEXMFCONFIG = `@KPSEWHICH@ -var-value=TEXMFCONFIG`);
++chomp(my $TEXMFHOME = `@KPSEWHICH@ -var-value=TEXMFHOME`);
  
  # make sure that on windows *everything* is in lower case for comparison
  if (win32()) {
-@@ -213,15 +213,15 @@ sub main {
+@@ -215,7 +215,7 @@ sub main {
      # in the list is the one where changes will be written to.
      ($changes_config_file) = @{$opts{'cnffile'}};
    } else {
@@ -33,17 +35,20 @@ $NetBSD: patch-bin_updmap,v 1.2 2012/07/22 20:24:42 minskim Exp $
      chomp(@all_files);
      my @used_files;
      for my $f (@all_files) {
-       push @used_files, (win32() ? lc($f) : $f);
+@@ -225,10 +225,10 @@ sub main {
+     my $TEXMFLOCALVAR;
+     my @TEXMFLOCAL;
+     if (win32()) {
+-      chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`);
++      chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path=\$TEXMFLOCAL`);
+       @TEXMFLOCAL = map { lc } split(/;/ , $TEXMFLOCALVAR);
+     } else {
+-      chomp($TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`);
++      chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path='\$TEXMFLOCAL'`);
+       @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR;
      }
      #
--    chomp(my $TEXMFLOCAL =`kpsewhich --var-value=TEXMFLOCAL`);
--    chomp(my $TEXMFHOME =`kpsewhich --var-value=TEXMFHOME`);
-+    chomp(my $TEXMFLOCAL =`@KPSEWHICH@ --var-value=TEXMFLOCAL`);
-+    chomp(my $TEXMFHOME =`@KPSEWHICH@ --var-value=TEXMFHOME`);
-     if (win32()) {
-       $TEXMFLOCAL = lc($TEXMFLOCAL);
-       $TEXMFHOME = lc($TEXMFHOME);
-@@ -1140,7 +1140,7 @@ sub mkMaps {
+@@ -1139,7 +1139,7 @@ sub mkMaps {
  
  sub locateMap {
    my $map = shift;
@@ -52,7 +57,7 @@ $NetBSD: patch-bin_updmap,v 1.2 2012/07/22 20:24:42 minskim Exp $
    chomp($ret);
    return $ret;
  }
-@@ -1788,7 +1788,7 @@ sub read_map_files {
+@@ -1787,7 +1787,7 @@ sub read_map_files {
      $alldata->{'maps'}{$m}{'status'} = 'enabled';
    }
    @maps = sort_uniq(@maps);
diff --git a/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg b/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
index 9bfce4a82cc..137ce43ccd7 100644
--- a/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
+++ b/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
@@ -1,8 +1,8 @@
-$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.1 2012/07/22 20:24:42 minskim Exp $
+$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp $
 
---- texmf-dist/web2c/updmap.cfg.orig	2012-06-11 02:40:03.000000000 +0000
+--- texmf-dist/web2c/updmap.cfg.orig	2012-09-22 02:28:30.000000000 +0000
 +++ texmf-dist/web2c/updmap.cfg
-@@ -26,223 +26,4 @@
+@@ -26,227 +26,4 @@
  # The default settings of the updmap options (not maps) are specified in
  # TEXMFMAIN/web2c/updmap.cfg and can be overridden by an updmap.cfg in
  # any other tree.
@@ -36,6 +36,8 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.1 2012/07/22 20:24:42 minskim Exp
 -Map belleek.map
 -Map bera.map
 -Map ybd.map
+-Map bguq.map
+-Map biolinum-type1.map
 -Map sqrcaps.map
 -Map boondox.map
 -Map pbsi.map
@@ -98,6 +100,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.1 2012/07/22 20:24:42 minskim Exp
 -Map yfrak.map
 -Map ugq.map
 -Map grverb.map
+-Map hacm.map
 -MixedMap hfbright.map
 -MixedMap iby.map
 -Map fi4.map
@@ -133,7 +136,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.1 2012/07/22 20:24:42 minskim Exp
 -Map kpfonts.map
 -Map kurier.map
 -Map lato.map
--Map libertine.map
+-Map libertine-type1.map
 -Map yly.map
 -Map linearA.map
 -Map l7x-urwvn.map
@@ -184,6 +187,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.1 2012/07/22 20:24:42 minskim Exp
 -Map starfont.map
 -Map icelandic.map
 -MixedMap stmaryrd.map
+-Map superiors.map
 -Map tabvar.map
  Map mathpple.map
 -Map qag.map