Resolve conflicts between texlive-tetex and TeX Live 2012 packages.

13 files changed, 71 insertions, 654 deletions

diff --git a/print/texlive-tetex/Makefile b/print/texlive-tetex/Makefile
index 3c3d2105fd0..3c2d7e0f643 100644
--- a/print/texlive-tetex/Makefile
+++ b/print/texlive-tetex/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2012/10/08 13:45:48 asau Exp $
+# $NetBSD: Makefile,v 1.12 2012/10/13 22:43:23 minskim Exp $
 
 DISTNAME=	texlive-20110705-source
 PKGNAME=	texlive-tetex-2011
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
@@ -12,9 +12,8 @@ HOMEPAGE=	http://www.tug.org/texlive/
 COMMENT=	Scripts included in teTeX
 
 CONFLICTS+=	teTeX-bin<=3.0nb22
-DEPENDS+=	dialog>=1.0:../../misc/dialog
 DEPENDS+=	kpathsea-[0-9]*:../../print/kpathsea
-DEPENDS+=	tex-tetex>=3.0.24482:../../print/tex-tetex
+DEPENDS+=	tex-tetex>=3.0.27774:../../print/tex-tetex
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/texk/tetex
@@ -29,26 +28,6 @@ CONF_FILES+=	${PREFIX}/share/texmf/web2c/fmtutil.cnf \
 		${PKG_SYSCONFDIR}/web2c/fmtutil.cnf
 FILES_SUBST+=	UPDMAP_SYS=${PREFIX}/bin/updmap-sys
 
-EVAL_PREFIX+=	DIALOG_PREFIX=dialog
-EVAL_PREFIX+=	KPSEWHICH_PREFIX=kpathsea
-EVAL_PREFIX+=	UPDMAP_PREFIX=tex-tetex
-
-SUBST_CLASSES+=		paths
-SUBST_MESSAGE.paths=	Setting paths to commands.
-SUBST_STAGE.paths=	pre-configure
-SUBST_FILES.paths=	fmtutil fmtutil-sys kpsetool kpsewhere \
-			tcfmgr texconfig texconfig-dialog texconfig-sys \
-			texlinks
-SUBST_SED.paths=	-e 's,@DIALOG@,${DIALOG_PREFIX}/bin/dialog,g' \
-			-e 's,@FMTUTIL@,${PREFIX}/bin/fmtutil,g' \
-			-e 's,@FMTUTIL_SYS@,${PREFIX}/bin/fmtutil-sys,g' \
-			-e 's,@KPSEWHICH@,${KPSEWHICH_PREFIX}/bin/kpsewhich,g' \
-			-e 's,@LOCALBASE@,${LOCALBASE},g' \
-			-e 's,@TEXCONFIG@,${PREFIX}/bin/texconfig,g' \
-			-e 's,@TEXLINKS@,${PREFIX}/bin/texlinks,g' \
-			-e 's,@UPDMAP@,${UPDMAP_PREFIX}/bin/updmap,g' \
-			-e 's,@UPDMAP_SYS@,${UPDMAP_PREFIX}/bin/updmap-sys,g'
-
 INSTALLATION_DIRS+=	share/texmf/web2c
 
 TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR}
diff --git a/print/texlive-tetex/PLIST b/print/texlive-tetex/PLIST
index 31e12e9c5f2..f74ecaf7f73 100644
--- a/print/texlive-tetex/PLIST
+++ b/print/texlive-tetex/PLIST
@@ -1,52 +1,13 @@
-@comment $NetBSD: PLIST,v 1.7 2012/02/09 21:27:26 minskim Exp $
-bin/allcm
-bin/allec
-bin/allneeded
-bin/dvi2fax
-bin/dvired
-bin/fmtutil
-bin/fmtutil-sys
+@comment $NetBSD: PLIST,v 1.8 2012/10/13 22:43:23 minskim Exp $
 bin/fontinst
-bin/kpsepath
-bin/kpsetool
-bin/kpsewhere
-bin/kpsexpand
-bin/mktexfmt
 bin/ps2frag
 bin/pslatex
 bin/rubibtex
 bin/rumakeindex
-bin/texconfig
-bin/texconfig-dialog
-bin/texconfig-sys
-bin/texlinks
-man/man1/allcm.1
-man/man1/allec.1
-man/man1/allneeded.1
-man/man1/dvi2fax.1
-man/man1/dvired.1
-man/man1/fmtutil-sys.1
-man/man1/fmtutil.1
 man/man1/fontinst.1
-man/man1/kpsepath.1
-man/man1/kpsetool.1
-man/man1/kpsewhere.1
-man/man1/kpsexpand.1
-man/man1/mktexfmt.1
 man/man1/ps2frag.1
 man/man1/pslatex.1
 man/man1/rubibtex.1
 man/man1/rumakeindex.1
-man/man1/texconfig-sys.1
-man/man1/texconfig.1
-man/man1/texlinks.1
-man/man1/thumbpdf.1
 man/man5/fmtutil.cnf.5
-share/texmf/texconfig/README
-share/texmf/texconfig/g/generic
-share/texmf/texconfig/generic
-share/texmf/texconfig/tcfmgr
-share/texmf/texconfig/tcfmgr.map
-share/texmf/texconfig/v/vt100
-share/texmf/texconfig/x/xterm
 share/texmf/web2c/fmtutil.cnf
diff --git a/print/texlive-tetex/distinfo b/print/texlive-tetex/distinfo
index 65090e7e890..e7dfdf64d09 100644
--- a/print/texlive-tetex/distinfo
+++ b/print/texlive-tetex/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2012/02/09 21:27:26 minskim Exp $
+$NetBSD: distinfo,v 1.12 2012/10/13 22:43:23 minskim Exp $
 
 SHA1 (texlive-20110705-source.tar.xz) = 7a47cfe847801c86c98da8ade181baf97339f6e4
 RMD160 (texlive-20110705-source.tar.xz) = fbcad494cc4717a0238ab2624f259270fce9332b
 Size (texlive-20110705-source.tar.xz) = 131207904 bytes
-SHA1 (patch-aa) = 284158bee8b825e4076f0f8fa5526d42b4182a55
+SHA1 (patch-aa) = fd61fd7bf4c6cea8204234b3daed23031589ca45
 SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
 SHA1 (patch-ae) = e17e8579ccb4db6302119b046fa319ece06ed663
 SHA1 (patch-af) = a5c098fc4f136d35188318d322adeb6db885291d
diff --git a/print/texlive-tetex/patches/patch-aa b/print/texlive-tetex/patches/patch-aa
index 8b77c945d07..c3481b419a0 100644
--- a/print/texlive-tetex/patches/patch-aa
+++ b/print/texlive-tetex/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2012/02/09 21:27:26 minskim Exp $
+$NetBSD: patch-aa,v 1.10 2012/10/13 22:43:23 minskim Exp $
 
 --- Makefile.in.orig	2011-06-16 14:01:09.000000000 +0000
 +++ Makefile.in
-@@ -195,11 +195,9 @@ top_build_prefix = @top_build_prefix@
+@@ -195,30 +195,16 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I ../../m4
@@ -15,8 +15,28 @@ $NetBSD: patch-aa,v 1.9 2012/02/09 21:27:26 minskim Exp $
 +shell_scripts =
  
  sh_scripts = \
- 	allcm \
-@@ -226,7 +224,7 @@ all_scripts = $(lua_scripts) $(perl_scri
+-	allcm \
+-	allneeded \
+-	dvi2fax \
+-	dvired \
+-	fmtutil \
+-	fmtutil-sys \
+ 	fontinst \
+-	kpsetool \
+-	kpsewhere \
+ 	ps2frag \
+ 	pslatex \
+ 	rubibtex \
+-	rumakeindex \
+-	texconfig \
+-	texconfig-dialog \
+-	texconfig-sys \
+-	texlinks
++	rumakeindex
+ 
+ scriptsdir = texmf/scripts/tetex
+ nodist_bin_SCRIPTS = $(am__append_1)
+@@ -226,57 +212,30 @@ all_scripts = $(lua_scripts) $(perl_scri
  @WIN32_TRUE@@WIN32_WRAP_TRUE@wrappers = $(all_scripts:=.exe)
  @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
  texmfdir = ${prefix}/$(scriptsdir)
@@ -25,23 +45,26 @@ $NetBSD: patch-aa,v 1.9 2012/02/09 21:27:26 minskim Exp $
  @WIN32_FALSE@dist_bin_SCRIPTS = $(sh_scripts)
  CLEANFILES = $(nodist_bin_SCRIPTS)
  dist_man1_MANS = \
-@@ -235,7 +233,6 @@ dist_man1_MANS = \
- 	allneeded.man \
- 	dvi2fax.man \
- 	dvired.man \
+-	allcm.man \
+-	allec.man \
+-	allneeded.man \
+-	dvi2fax.man \
+-	dvired.man \
 -	e2pall.man \
- 	fmtutil.man \
+-	fmtutil.man \
  	fontinst.man \
- 	kpsetool.man \
-@@ -245,16 +242,13 @@ dist_man1_MANS = \
+-	kpsetool.man \
+-	kpsewhere.man \
+ 	ps2frag.man \
+ 	pslatex.man \
  	rubibtex.man \
- 	rumakeindex.man \
- 	texconfig.man \
+-	rumakeindex.man \
+-	texconfig.man \
 -	texdoctk.man \
- 	texlinks.man \
+-	texlinks.man \
 -	thumbpdf.man \
 -	updmap.man
-+	thumbpdf.man
++	rumakeindex.man
  
  dist_man5_MANS = \
 -	fmtutil.cnf.5 \
@@ -49,30 +72,41 @@ $NetBSD: patch-aa,v 1.9 2012/02/09 21:27:26 minskim Exp $
 +	fmtutil.cnf.5
  
 -texconfdir = ${prefix}
-+texconfdir = ${prefix}/share
- nobase_dist_texconf_DATA = \
- 	texmf/texconfig/README \
- 	texmf/texconfig/g/generic \
-@@ -262,7 +256,7 @@ nobase_dist_texconf_DATA = \
- 	texmf/texconfig/v/vt100 \
- 	texmf/texconfig/x/xterm
- 
+-nobase_dist_texconf_DATA = \
+-	texmf/texconfig/README \
+-	texmf/texconfig/g/generic \
+-	texmf/texconfig/generic \
+-	texmf/texconfig/v/vt100 \
+-	texmf/texconfig/x/xterm
+-
 -texconfigdir = ${prefix}/texmf/texconfig
+-dist_texconfig_SCRIPTS = tcfmgr
+-dist_texconfig_DATA = tcfmgr.map
++texconfdir = ${prefix}/share
++nobase_dist_texconf_DATA =
++
 +texconfigdir = ${prefix}/share/texmf/texconfig
- dist_texconfig_SCRIPTS = tcfmgr
- dist_texconfig_DATA = tcfmgr.map
++dist_texconfig_SCRIPTS =
++dist_texconfig_DATA =
  web2cdir = ${prefix}/texmf/web2c
-@@ -275,8 +269,7 @@ bin_links = \
- 
- man1_links = $(bin_links) \
- 	fmtutil:fmtutil-sys \
+ dist_web2c_DATA = fmtutil.cnf
+-bin_links = \
+-	allcm:allec \
+-	fmtutil:mktexfmt \
+-	kpsetool:kpsexpand \
+-	kpsetool:kpsepath
+-
+-man1_links = $(bin_links) \
+-	fmtutil:fmtutil-sys \
 -	texconfig:texconfig-sys \
 -	updmap:updmap-sys
-+	texconfig:texconfig-sys
++bin_links =
++
++man1_links = $(bin_links)
  
  EXTRA_DIST = README.texdoctk old-fontinst.bat old-updmap
  run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
-@@ -810,7 +803,7 @@ info-am:
+@@ -810,7 +769,7 @@ info-am:
  
  install-data-am: install-dist_texconfigDATA \
  	install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
diff --git a/print/texlive-tetex/patches/patch-ab b/print/texlive-tetex/patches/patch-ab
deleted file mode 100644
index fc6ff9da742..00000000000
--- a/print/texlive-tetex/patches/patch-ab
+++ /dev/null
@@ -1,69 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/09/20 03:33:43 minskim Exp $
-
---- texconfig-dialog.orig	2007-07-16 10:08:10.000000000 -0700
-+++ texconfig-dialog
-@@ -83,14 +83,7 @@ logexec()
- runDialog()
- {
-   termCtl clear
--  if test -n "$DIALOG_PROG"; then
--    $DIALOG_PROG --title "TeX setup utility" ${1+"$@"}
--    runDialogRc=$?
--  else
--    TERM=$DIALOG_TERM TERMINFO=$DIALOG_TERMINFO \
--      tcdialog --title "TeX setup utility" ${1+"$@"}
--    runDialogRc=$?
--  fi
-+  @DIALOG@ --title "TeX setup utility" ${1+"$@"}
-   termCtl clear
-   (exit $runDialogRc)
-   return $runDialogRc
-@@ -105,7 +98,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;;
-@@ -243,7 +236,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()
-@@ -348,7 +341,7 @@ 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
-@@ -424,7 +417,7 @@ 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
-     "")
-@@ -454,9 +447,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/texlive-tetex/patches/patch-ae b/print/texlive-tetex/patches/patch-ae
deleted file mode 100644
index da23c5c300d..00000000000
--- a/print/texlive-tetex/patches/patch-ae
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2010/09/13 04:08:32 minskim Exp $
-
---- fmtutil.orig	2010-07-04 12:26:44.000000000 +0000
-+++ 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
- }
-@@ -573,7 +573,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
-@@ -682,7 +682,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
- }
- 
- ###############################################################################
-@@ -695,7 +695,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
- }
- 
-@@ -726,7 +726,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
-@@ -762,7 +762,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
-@@ -885,7 +885,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
- }
- 
-@@ -895,7 +895,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/texlive-tetex/patches/patch-af b/print/texlive-tetex/patches/patch-af
deleted file mode 100644
index 844f1afa32c..00000000000
--- a/print/texlive-tetex/patches/patch-af
+++ /dev/null
@@ -1,19 +0,0 @@
-$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,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/texlive-tetex/patches/patch-ag b/print/texlive-tetex/patches/patch-ag
deleted file mode 100644
index 0ba5797f550..00000000000
--- a/print/texlive-tetex/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/09/20 03:33:43 minskim Exp $
-
---- kpsetool.orig	2006-01-17 13:41:51.000000000 -0800
-+++ 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/texlive-tetex/patches/patch-ah b/print/texlive-tetex/patches/patch-ah
deleted file mode 100644
index 28a1d116bac..00000000000
--- a/print/texlive-tetex/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/09/20 03:33:43 minskim Exp $
-
---- kpsewhere.orig	2006-01-17 13:41:51.000000000 -0800
-+++ 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/texlive-tetex/patches/patch-ai b/print/texlive-tetex/patches/patch-ai
deleted file mode 100644
index 45171477ba5..00000000000
--- a/print/texlive-tetex/patches/patch-ai
+++ /dev/null
@@ -1,223 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2011/11/06 08:43:29 minskim Exp $
-
---- texconfig.orig	2011-01-07 11:45:38.000000000 +0000
-+++ texconfig
-@@ -91,7 +91,7 @@ echoShowKpseVariable()
-   for eskv
-   do
-     var=$eskv
--    val=`kpsewhich -var-value="$eskv"`
-+    val=`@KPSEWHICH@ -var-value="$eskv"`
-     echo "$var=$val"
-   done
- }
-@@ -123,7 +123,7 @@ echoLocateCfgfile()
-   for elc
-   do
-     case $elc in
--      texmf.cnf) elcLoc=`kpsewhich $elc`;;
-+      texmf.cnf) elcLoc=`@KPSEWHICH@ $elc`;;
-       *) elcLoc=`tcfmgr --cmd find --file "$elc"`;;
-     esac
-     case $elcLoc in
-@@ -190,7 +190,7 @@ setupTmpDir()
- setupTexmfmain()
- {
-   case $MT_TEXMFMAIN in
--    "") MT_TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`;;
-+    "") MT_TEXMFMAIN=`@KPSEWHICH@ -var-value=TEXMFMAIN`;;
-     *) return;;
-   esac
- }
-@@ -201,7 +201,7 @@ setupTexmfmain()
- setupTexmfdist()
- {
-   case $MT_TEXMFDIST in
--    "") MT_TEXMFDIST=`kpsewhich -var-value=TEXMFDIST`;;
-+    "") MT_TEXMFDIST=`@KPSEWHICH@ -var-value=TEXMFDIST`;;
-     *) return;;
-   esac
- }
-@@ -212,7 +212,7 @@ setupTexmfdist()
- setupTexmfvar()
- {
-   case $MT_TEXMVAR in
--    "") MT_TEXMVAR=`kpsewhich -var-value=TEXMFVAR`;;
-+    "") MT_TEXMVAR=`@KPSEWHICH@ -var-value=TEXMFVAR`;;
-     *) return;;
-   esac
- }
-@@ -223,7 +223,7 @@ setupTexmfvar()
- setupSystexmf()
- {
-   case $MT_SYSTEXMF in
--    "") MT_SYSTEXMF=`kpsewhich -var-value=SYSTEXMF`;;
-+    "") MT_SYSTEXMF=`@KPSEWHICH@ -var-value=SYSTEXMF`;;
-     *) return;;
-   esac
- }
-@@ -478,7 +478,7 @@ listDvipsPapers()
- #
- getFormatsForHyphen()
- {
--  fmtutil --catcfg | awk '$3 != "-" {print $1}' | sort
-+  @FMTUTIL@ --catcfg | awk '$3 != "-" {print $1}' | sort
- }
- 
- ###############################################################################
-@@ -607,7 +607,7 @@ TeX Live home page: <http://tug.org/texl
-       echo
-       echo '============================= font map files ============================='
-       for m in psfonts.map pdftex.map ps2pk.map dvipdfm.map; do
--        echo "$m: `kpsewhich $m`"
-+        echo "$m: `@KPSEWHICH@ $m`"
-       done
-       echo
-       echo '=========================== kpathsea variables ==========================='
-@@ -703,7 +703,7 @@ Valid PAPER settings:
-             *)
-               otherPrinter=true
-               otherPrinterName=$2
--              otherPrinterFile=`kpsewhich -format='dvips config' "config.$otherPrinterName"`
-+              otherPrinterFile=`@KPSEWHICH@ -format='dvips config' "config.$otherPrinterName"`
-               case $otherPrinterFile in
-                 "")
-                   echo "$progname: configuration file \`config.$otherPrinterName' for printer \`$otherPrinterName' not found" >&2
-@@ -736,7 +736,7 @@ Valid PAPER settings:
-               ;;
-             *)
-               printerName=$2
--              pFile=`kpsewhich -format='dvips config' "config.$printerName"`
-+              pFile=`@KPSEWHICH@ -format='dvips config' "config.$printerName"`
-               case $pFile in
-                 "")
-                   setupTmpDir
-@@ -773,7 +773,7 @@ Valid PAPER settings:
-               ;;
-             *)
-               printerName=$2
--              pFile=`kpsewhich -format='dvips config' "config.$printerName"`
-+              pFile=`@KPSEWHICH@ -format='dvips config' "config.$printerName"`
-               case $pFile in
-                 "")
-                   echo "$progname: configuration file for printer \`$printerName' (config.$printerName) not found" >&2
-@@ -931,7 +931,7 @@ For more information about these \`featu
-               ;;
-             *)
-               tcBatchFontVardir=$3
--              tfc=`kpsewhich texmf.cnf`
-+              tfc=`@KPSEWHICH@ texmf.cnf`
-               if test -n "$tfc"; then
-                 if test -w "$tfc"; then
-                   configReplace "$tfc" '^VARTEXFONTS' "VARTEXFONTS  = $tcBatchFontVardir"
-@@ -947,7 +947,7 @@ For more information about these \`featu
-           esac
-           ;;
-         rw)
--          MT_VARTEXFONTS=`kpsewhich -var-value VARTEXFONTS`
-+          MT_VARTEXFONTS=`@KPSEWHICH@ -var-value VARTEXFONTS`
-           if test -z "$MT_VARTEXFONTS"; then
-             echo "$progname: failed to set \`font rw'; reason: could not determine VARTEXFONTS variable." >&2; rc=1
-             return
-@@ -973,7 +973,7 @@ For more information about these \`featu
-           fmgrConfigReplace mktex.cnf '^: ..MT_FEATURES=' ": \${MT_FEATURES=appendonlydir:varfonts}"
-           ;;
-         ro)
--          MT_VARTEXFONTS=`kpsewhich -var-value VARTEXFONTS`
-+          MT_VARTEXFONTS=`@KPSEWHICH@ -var-value VARTEXFONTS`
-           if test -z "$MT_VARTEXFONTS"; then
-             echo "$progname: failed to set \`font ro'; reason: could not determine VARTEXFONTS variable." >&2; rc=1
-             return
-@@ -1024,10 +1024,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
-@@ -1035,9 +1035,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
-       ;;
- 
-@@ -1077,7 +1077,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
-@@ -1134,7 +1134,7 @@ $formatsForHyphenFmt"
-                   fi
-                   ;;
-               esac
--              fmtutil --byhyphen "$tcBatchHFOut"
-+              @FMTUTIL@ --byhyphen "$tcBatchHFOut"
-             fi
-           else
-             echo "$progname: invalid format \`$tcBatchHyphenFormat' specified as argument for \`$progname hyphen'" >&2
-@@ -1152,9 +1152,9 @@ $formatsForHyphenFmt"
-     init)
-       case $2 in
-         "")
--          if fmtutil --all \
--             && texlinks --multiplatform \
--             && updmap; then
-+          if @FMTUTIL@ --all \
-+             && @TEXLINKS@ --multiplatform \
-+             && @UPDMAP@; then
-             :
-           else
-             rc=1
-@@ -1163,7 +1163,7 @@ $formatsForHyphenFmt"
-         *)
-           shift 1
-           for i in "$@"; do
--            fmtutil --byfmt "$i" || rc=1
-+            @FMTUTIL@ --byfmt "$i" || rc=1
-           done
-           ;;
-       esac
-@@ -1266,7 +1266,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
-@@ -1285,7 +1285,7 @@ Valid PAPER settings:
-               wChanged=$fmgrConfigReplaceChanged
-               fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
-               if $wChanged || $fmgrConfigReplaceChanged; then
--                fmtutil --refresh
-+                @FMTUTIL@ --refresh
-               fi
-               ;;
-             a4)
-@@ -1294,7 +1294,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-aj b/print/texlive-tetex/patches/patch-aj
deleted file mode 100644
index 4e2d979daac..00000000000
--- a/print/texlive-tetex/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2009/09/20 03:33:43 minskim Exp $
-
---- texconfig-sys.orig	2007-09-30 11:06:26.000000000 -0700
-+++ 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/texlive-tetex/patches/patch-ak b/print/texlive-tetex/patches/patch-ak
deleted file mode 100644
index a1badd57ce1..00000000000
--- a/print/texlive-tetex/patches/patch-ak
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2009/09/20 03:33:43 minskim Exp $
-
---- texlinks.orig	2008-06-18 11:24:19.000000000 -0700
-+++ texlinks
-@@ -179,7 +179,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
-@@ -241,7 +241,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)
-@@ -261,7 +261,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"
- 
- 
-@@ -276,7 +276,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/texlive-tetex/patches/patch-al b/print/texlive-tetex/patches/patch-al
deleted file mode 100644
index 17d6333d82f..00000000000
--- a/print/texlive-tetex/patches/patch-al
+++ /dev/null
@@ -1,58 +0,0 @@
-$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()