Replace the updmap script with the version in TeX Live 2011.

Updating font maps is considerably faster with this version.

29 files changed, 482 insertions, 318 deletions

diff --git a/print/tex-arabi/Makefile b/print/tex-arabi/Makefile
index 33073df26e3..d30b301c51f 100644
--- a/print/tex-arabi/Makefile
+++ b/print/tex-arabi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2010/11/12 16:57:12 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2011/11/06 08:43:31 minskim Exp $
 
 DISTNAME=	arabi
 PKGNAME=	tex-${DISTNAME}-1.1
-PKGREVISION=	1
+PKGREVISION=	2
 TEXLIVE_REV=	20072
 
 MAINTAINER=	kamelderouiche@yahoo.com
diff --git a/print/tex-arabtex/Makefile b/print/tex-arabtex/Makefile
index 060ea27d6ae..4e03511f25b 100644
--- a/print/tex-arabtex/Makefile
+++ b/print/tex-arabtex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/06/15 14:21:10 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2011/11/06 08:43:32 minskim Exp $
 
 DISTNAME=	arabtex
 PKGNAME=	tex-${DISTNAME}-3.11s
+PKGREVISION=	1
 TEXLIVE_REV=	17095
 
 MAINTAINER=	kamelderouiche@yahoo.com
diff --git a/print/tex-chemarrow/Makefile b/print/tex-chemarrow/Makefile
index 05e002ec52c..e523a3ed98d 100644
--- a/print/tex-chemarrow/Makefile
+++ b/print/tex-chemarrow/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/11/09 19:01:42 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2011/11/06 08:43:31 minskim Exp $
 
 DISTNAME=	chemarrow
 PKGNAME=	tex-${DISTNAME}-0.9
+PKGREVISION=	1
 TEXLIVE_REV=	17146
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/print/tex-context/Makefile b/print/tex-context/Makefile
index 0389ca9d03e..7da2236f547 100644
--- a/print/tex-context/Makefile
+++ b/print/tex-context/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2011/03/03 23:13:18 minskim Exp $
+# $NetBSD: Makefile,v 1.5 2011/11/06 08:43:31 minskim Exp $
 
 DISTNAME=	context
 PKGNAME=	tex-${DISTNAME}-2010
+PKGREVISION=	1
 TEXLIVE_REV=	21345
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index 5b980441bfd..c312492bd40 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2011/05/26 23:50:43 minskim Exp $
+# $NetBSD: Makefile,v 1.27 2011/11/06 08:43:32 minskim Exp $
 
 DISTNAME=	musixtex
 PKGNAME=	tex-${DISTNAME}-1.15
+PKGREVISION=	1
 TEXLIVE_REV=	22568
 
 MAINTAINER=	dgriffi@cs.csubak.edu
diff --git a/print/tex-skaknew/Makefile b/print/tex-skaknew/Makefile
index b2d20e605c7..aca0d7a3d5d 100644
--- a/print/tex-skaknew/Makefile
+++ b/print/tex-skaknew/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/02/15 11:22:05 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2011/11/06 08:43:31 minskim Exp $
 
 DISTNAME=	skaknew
 PKGNAME=	tex-${DISTNAME}-2010
+PKGREVISION=	1
 TEXLIVE_REV=	20031
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/print/tex-tetex-doc/Makefile b/print/tex-tetex-doc/Makefile
index 57f260bfe3d..6eba07bc12c 100644
--- a/print/tex-tetex-doc/Makefile
+++ b/print/tex-tetex-doc/Makefile
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.8 2011/03/03 22:13:19 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/06 08:43:28 minskim Exp $
 
 DISTNAME=	tetex.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-3.0.19695
-TEXLIVE_REV=	21308
+PKGNAME=	tex-${DISTNAME:S/./-/}-3.0.24482
+TEXLIVE_REV=	24482
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-tetex
 
 CONFLICTS+=	teTeX-bin<=3.0nb42
+CONFLICTS+=	texlive-tetex<2011
 
 TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
 
-TEXLIVE_IGNORE_PATTERNS=	texmf/doc/man
+TEXLIVE_IGNORE_PATTERNS+=	texmf/doc/man/man1/a* texmf/doc/man/man1/d* \
+				texmf/doc/man/man1/f* texmf/doc/man/man1/t* \
+				texmf/doc/man/man5/f*
 
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-tetex-doc/PLIST b/print/tex-tetex-doc/PLIST
index f4742932ad5..5966d57873f 100644
--- a/print/tex-tetex-doc/PLIST
+++ b/print/tex-tetex-doc/PLIST
@@ -1,3 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/15 00:24:29 minskim Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/11/06 08:43:28 minskim Exp $
+man/man1/updmap-sys.1
+man/man1/updmap.1
+man/man5/updmap.cfg.5
 share/texmf/doc/tetex/TETEXDOC.pdf
 share/texmf/doc/tetex/teTeX-FAQ
diff --git a/print/tex-tetex-doc/distinfo b/print/tex-tetex-doc/distinfo
index cca125a7aa1..d425c11fb71 100644
--- a/print/tex-tetex-doc/distinfo
+++ b/print/tex-tetex-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2011/03/03 22:13:19 minskim Exp $
+$NetBSD: distinfo,v 1.9 2011/11/06 08:43:28 minskim Exp $
 
-SHA1 (tex-tetex-21308/tetex.doc.tar.xz) = 809601ba3862715d8873c23cade038eb1053d17a
-RMD160 (tex-tetex-21308/tetex.doc.tar.xz) = 0ddedd35292e153161eec7d0610c02e6d42fed2c
-Size (tex-tetex-21308/tetex.doc.tar.xz) = 325264 bytes
+SHA1 (tex-tetex-24482/tetex.doc.tar.xz) = 873a2b5e082debd382d9b72fee1704ef85fc6578
+RMD160 (tex-tetex-24482/tetex.doc.tar.xz) = 3d53f36ddb15a26c3224c3c40f4d9f6c0cb24dd3
+Size (tex-tetex-24482/tetex.doc.tar.xz) = 326444 bytes
diff --git a/print/texlive-tetex/DEINSTALL b/print/tex-tetex/DEINSTALL
index cf372205d7c..86cf44aafa9 100644
--- a/print/texlive-tetex/DEINSTALL
+++ b/print/tex-tetex/DEINSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
+# $NetBSD: DEINSTALL,v 1.1 2011/11/06 08:43:28 minskim Exp $
 
 TEXMFSYSVAR="@VARBASE@/lib/texmf"
 
@@ -7,9 +7,7 @@ DEINSTALL)
 	# Remove font map files generated by updmap-sys.  The list of
 	# files is taken from the updmap man page and matches the
 	# "output files" for updmap.
-	${RM} -f ${TEXMFSYSVAR}/fonts/map/dvipdfm/updmap/dvipdfm.map
-	${RM} -f ${TEXMFSYSVAR}/fonts/map/dvipdfm/updmap/dvipdfm_dl14.map
-	${RM} -f ${TEXMFSYSVAR}/fonts/map/dvipdfm/updmap/dvipdfm_ndl14.map
+	${RM} -f ${TEXMFSYSVAR}/fonts/map/dvipdfm/updmap/kanjix.map
 	${RM} -f ${TEXMFSYSVAR}/fonts/map/dvips/updmap/builtin35.map
 	${RM} -f ${TEXMFSYSVAR}/fonts/map/dvips/updmap/download35.map
 	${RM} -f ${TEXMFSYSVAR}/fonts/map/dvips/updmap/ps2pk.map
diff --git a/print/tex-tetex/INSTALL b/print/tex-tetex/INSTALL
new file mode 100644
index 00000000000..5111b5c3972
--- /dev/null
+++ b/print/tex-tetex/INSTALL
@@ -0,0 +1,7 @@
+# $NetBSD: INSTALL,v 1.1 2011/11/06 08:43:28 minskim Exp $
+
+case "${STAGE}" in
+POST-INSTALL)
+	@UPDMAP_SYS@
+	;;
+esac
diff --git a/print/tex-tetex/Makefile b/print/tex-tetex/Makefile
index 0bca4d39569..b1f4aa0ca3a 100644
--- a/print/tex-tetex/Makefile
+++ b/print/tex-tetex/Makefile
@@ -1,18 +1,44 @@
-# $NetBSD: Makefile,v 1.10 2011/03/03 22:13:18 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2011/11/06 08:43:28 minskim Exp $
 
 DISTNAME=	tetex
-PKGNAME=	tex-${DISTNAME}-3.0.21248
-TEXLIVE_REV=	21308
+PKGNAME=	tex-${DISTNAME}-3.0.24482
+TEXLIVE_REV=	24482
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Supplementary files for updmap
 
-SUPERSEDES=	tex-bin-tetex<=3.0.12897
-CONFLICTS=	tex-bin-tetex<=3.0.12897
+CONFLICTS=	texlive-tetex<2011
+DEPENDS+=	tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra
 
-TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
+USE_TOOLS+=	perl:run sh:run
+
+FILES_SUBST+=	UPDMAP_SYS=${PREFIX}/bin/updmap-sys
+
+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'
+
+REPLACE_PERL=	bin/updmap
+REPLACE_SH=	bin/updmap-sys
+
+PKG_SYSCONFSUBDIR=	texmf
 
-TEXLIVE_IGNORE_PATTERNS=	texmf/web2c/updmap.cfg
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/web2c
+CONF_FILES+=	${PREFIX}/share/texmf/web2c/updmap.cfg \
+		${PKG_SYSCONFDIR}/web2c/updmap.cfg
+
+TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
 
 .include "../../print/texlive/package.mk"
+
+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
+	${RMDIR} -p ${WRKSRC}/texmf/scripts/tetex 2>/dev/null || ${TRUE}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-tetex/PLIST b/print/tex-tetex/PLIST
index 04901b2c37e..9f34ac57a8d 100644
--- a/print/tex-tetex/PLIST
+++ b/print/tex-tetex/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2011/01/22 21:04:05 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/11/06 08:43:28 minskim Exp $
+bin/updmap
+bin/updmap-sys
 share/texmf/dvips/tetex/config.builtin35
 share/texmf/dvips/tetex/config.dfaxhigh
 share/texmf/dvips/tetex/config.dfaxlo
@@ -20,13 +22,10 @@ share/texmf/fonts/enc/dvips/tetex/bbad153f.enc
 share/texmf/fonts/enc/dvips/tetex/d9b29452.enc
 share/texmf/fonts/enc/dvips/tetex/f7b6d320.enc
 share/texmf/fonts/enc/dvips/tetex/mtex.enc
-share/texmf/fonts/map/dvipdfm/tetex/cm-dvipdfm-fix.map
 share/texmf/fonts/map/dvips/tetex/README
-share/texmf/fonts/map/dvips/tetex/cid-base.map
 share/texmf/fonts/map/dvips/tetex/dvipdfm35.map
 share/texmf/fonts/map/dvips/tetex/dvips35.map
 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/scripts/tetex/updmap.pl
-@pkgdir share/texmf/web2c
+share/texmf/web2c/updmap.cfg
diff --git a/print/tex-tetex/distinfo b/print/tex-tetex/distinfo
index ffc180e8f13..99998d0d8af 100644
--- a/print/tex-tetex/distinfo
+++ b/print/tex-tetex/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.9 2011/03/03 22:13:18 minskim Exp $
+$NetBSD: distinfo,v 1.10 2011/11/06 08:43:28 minskim Exp $
 
-SHA1 (tex-tetex-21308/tetex.tar.xz) = 13eb4e1d3e4d7401e0f7e9cfc7f585f0b8caa708
-RMD160 (tex-tetex-21308/tetex.tar.xz) = 38c7b927317df33aec766c32f38d3356994d4da1
-Size (tex-tetex-21308/tetex.tar.xz) = 19896 bytes
+SHA1 (tex-tetex-24482/tetex.tar.xz) = 0af33275c49cc4f1cc1dacaa369020745a6c7d54
+RMD160 (tex-tetex-24482/tetex.tar.xz) = 62abb5bbcd0286535d31e453f2c58bed9785d479
+Size (tex-tetex-24482/tetex.tar.xz) = 22376 bytes
+SHA1 (patch-bin_updmap) = 993283ee01bad935a41cd22e78b5ff57d9b32e2e
+SHA1 (patch-bin_updmap-sys) = adf818f5e13cb20f104d3d590eb4a7d1b4598139
+SHA1 (patch-texmf_web2c_updmap.cfg) = 86c4bc369b85ed981a23a0c66a122216de9115b7
diff --git a/print/texlive-tetex/files/map-deinstall.tmpl b/print/tex-tetex/files/map-deinstall.tmpl
index 2edc166b6d1..e0f0cd018ac 100644
--- a/print/texlive-tetex/files/map-deinstall.tmpl
+++ b/print/tex-tetex/files/map-deinstall.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: map-deinstall.tmpl,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
+# $NetBSD: map-deinstall.tmpl,v 1.1 2011/11/06 08:43:28 minskim Exp $
 #
 # Disable font maps and remove entries from updmap.cfg.
 #
diff --git a/print/texlive-tetex/files/map-install.tmpl b/print/tex-tetex/files/map-install.tmpl
index 6dee4ae75c5..3bd430a092a 100644
--- a/print/texlive-tetex/files/map-install.tmpl
+++ b/print/tex-tetex/files/map-install.tmpl
@@ -1,4 +1,4 @@
-# $NetBSD: map-install.tmpl,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
+# $NetBSD: map-install.tmpl,v 1.1 2011/11/06 08:43:28 minskim Exp $
 #
 # Enable font maps.
 #
diff --git a/print/texlive-tetex/map.mk b/print/tex-tetex/map.mk
index ebc1d8fffe4..05e4f395b4d 100644
--- a/print/texlive-tetex/map.mk
+++ b/print/tex-tetex/map.mk
@@ -1,4 +1,4 @@
-# $NetBSD: map.mk,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
+# $NetBSD: map.mk,v 1.1 2011/11/06 08:43:28 minskim Exp $
 #
 # This Makefile fragment is intended to be included by packages that
 # install font maps for TeX.  It updates font map entries in updmap.cfg
@@ -14,13 +14,13 @@
 .if !defined(TEX_MAP_MK)
 TEX_MAP_MK=		# defined
 
-DEPENDS+=		texlive-tetex>=2008:../../print/texlive-tetex
+DEPENDS+=		tex-tetex>=3.0.24482:../../print/tex-tetex
 
-EVAL_PREFIX+=		TETEX_PREFIX=texlive-tetex
+EVAL_PREFIX+=		TETEX_PREFIX=tex-tetex
 FILES_SUBST+=		UPDMAP_SYS=${TETEX_PREFIX:Q}/bin/updmap-sys
 FILES_SUBST+=		MAP_FILES=${TEX_MAP_FILES:Q}
 FILES_SUBST+=		MIXEDMAP_FILES=${TEX_MIXEDMAP_FILES:Q}
-INSTALL_TEMPLATES+=	../../print/texlive-tetex/files/map-install.tmpl
-DEINSTALL_TEMPLATES+=	../../print/texlive-tetex/files/map-deinstall.tmpl
+INSTALL_TEMPLATES+=	../../print/tex-tetex/files/map-install.tmpl
+DEINSTALL_TEMPLATES+=	../../print/tex-tetex/files/map-deinstall.tmpl
 
 .endif	# TEX_MAP_MK
diff --git a/print/tex-tetex/patches/patch-bin_updmap b/print/tex-tetex/patches/patch-bin_updmap
new file mode 100644
index 00000000000..d1ebfd431d7
--- /dev/null
+++ b/print/tex-tetex/patches/patch-bin_updmap
@@ -0,0 +1,74 @@
+$NetBSD: patch-bin_updmap,v 1.1 2011/11/06 08:43:28 minskim Exp $
+
+--- bin/updmap.orig	2011-06-17 23:45:54.000000000 +0000
++++ bin/updmap
+@@ -8,7 +8,7 @@
+ 
+ BEGIN {
+   $^W=1;
+-  chomp($TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`);
++  chomp($TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`);
+   unshift (@INC, "$TEXMFROOT/tlpkg");
+ }
+ 
+@@ -453,7 +453,7 @@ sub locateWeb2c {
+   my @files = @_;
+   return @files if ($#files < 0);
+ 
+-  @files = split (/\n/, `kpsewhich --format="web2c files" @files`);
++  @files = split (/\n/, `@KPSEWHICH@ --format="web2c files" @files`);
+   if (wantarray) {
+     return @files;
+   }
+@@ -470,7 +470,7 @@ sub locateMap {
+   my @maps = @_;
+   return @maps if ($#maps < 0);
+ 
+-  my @files = `kpsewhich --format=map @maps`;
++  my @files = `@KPSEWHICH@ --format=map @maps`;
+   chomp @files;
+ 
+   foreach my $map (@maps) {
+@@ -672,7 +672,7 @@ sub setupOutputDir {
+     my $tf;
+     # Try TEXMFVAR tree. Use it if variable is set and $rel can
+     # be written.
+-    chomp($tf = `kpsewhich --var-value=TEXMFVAR`);
++    chomp($tf = `@KPSEWHICH@ --var-value=TEXMFVAR`);
+     if ($tf) {
+       &mkdirhier("$tf/$rel");
+       if (! -w "$tf/$rel") {
+@@ -697,13 +697,13 @@ sub setupDestDir {
+ #
+ sub setupCfgFile {
+   if (! $cnfFile) {
+-    my $tf = `kpsewhich --var-value=TEXMFCONFIG`;
++    my $tf = `@KPSEWHICH@ --var-value=TEXMFCONFIG`;
+     chomp($tf);
+     if ($tf && ! -f "$tf/web2c/$cnfFileShort") {
+       &mkdirhier("$tf/web2c") if (! -d "$tf/web2c");
+       if (-d "$tf/web2c" && -w "$tf/web2c") {
+         unlink "$tf/web2c/$cnfFileShort";
+-        my $original_cfg=`kpsewhich updmap.cfg`;
++        my $original_cfg=`@KPSEWHICH@ updmap.cfg`;
+         chomp($original_cfg);
+         print("copy $original_cfg => $tf/web2c/$cnfFileShort\n") if !$quiet;
+         $newcnf="$tf/web2c/$cnfFileShort";
+@@ -839,7 +839,7 @@ sub mkMaps {
+   $cache=1;
+ 
+   if (! $dry_run) {
+-    my $TEXMFVAR = `kpsewhich --var-value=TEXMFVAR`;
++    my $TEXMFVAR = `@KPSEWHICH@ --var-value=TEXMFVAR`;
+     chomp($TEXMFVAR);
+     $logfile = "$TEXMFVAR/web2c/updmap.log";
+     mkdirhier "$TEXMFVAR/web2c";
+@@ -1072,7 +1072,7 @@ sub initVars {
+   $cnfFile = "";
+   $cnfFileShort = "updmap.cfg";
+   $outputdir = "";
+-  chomp($TEXMFMAIN =`kpsewhich --var-value=TEXMFMAIN`);
++  chomp($TEXMFMAIN =`@KPSEWHICH@ --var-value=TEXMFMAIN`);
+ 
+   @psADOBE = (
+        's/ URWGothicL-Demi / AvantGarde-Demi /',
diff --git a/print/texlive-tetex/patches/patch-ad b/print/tex-tetex/patches/patch-bin_updmap-sys
index 84dcf4d2fc9..ee8ae572586 100644
--- a/print/texlive-tetex/patches/patch-ad
+++ b/print/tex-tetex/patches/patch-bin_updmap-sys
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2009/09/20 03:33:43 minskim Exp $
+$NetBSD: patch-bin_updmap-sys,v 1.1 2011/11/06 08:43:28 minskim Exp $
 
---- updmap-sys.orig	2006-01-17 13:41:51.000000000 -0800
-+++ updmap-sys
+--- bin/updmap-sys.orig	2011-05-20 09:20:02.000000000 +0000
++++ bin/updmap-sys
 @@ -20,11 +20,11 @@ export PATH
  # hack around a bug in zsh:
  test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
diff --git a/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg b/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg
new file mode 100644
index 00000000000..39b0ea98da5
--- /dev/null
+++ b/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg
@@ -0,0 +1,219 @@
+$NetBSD: patch-texmf_web2c_updmap.cfg,v 1.1 2011/11/06 08:43:28 minskim Exp $
+
+--- texmf/web2c/updmap.cfg.orig	2011-11-03 03:30:53.000000000 +0000
++++ texmf/web2c/updmap.cfg
+@@ -111,214 +111,4 @@ kanjiEmbed noEmbed
+ # Map files should be marked by "#! " (without the quotes), not just #.
+ #
+ 
+-Map OrnementsADF.map
+-Map ArrowsADF.map
+-Map BulletsADF.map
+-MixedMap allrunes.map
+-Map      euler.map
+-MixedMap cm.map
+-MixedMap cmextra.map
+-MixedMap cyrillic.map
+-MixedMap latxfont.map
+-MixedMap symbols.map
+-Map uaq.map
+-Map antt.map
+-Map arabi.map
+-MixedMap arabtex.map
+-Map archaicprw.map
+-Map arev.map
+-Map bkaiu.map
+-Map bsmiu.map
+-Map gbsnu.map
+-Map gkaiu.map
+-Map ascii.map
+-Map augie.map
+-Map auncial.map
+-Map aurical.map
+-Map ybv.map
+-MixedMap bbold.map
+-Map belleek.map
+-Map bera.map
+-Map ybd.map
+-Map sqrcaps.map
+-Map boondox.map
+-Map pbsi.map
+-Map burmese.map
+-Map calligra.map
+-Map cantarell.map
+-Map cmin.map
+-MixedMap cbgreek-full.map
+-MixedMap ccpl.map
+-Map ccicons.map
+-Map clm.map
+-Map chemarrow.map
+-Map cjhebrew.map
+-MixedMap cmtext-bsr-interpolated.map
+-Map cm-lgc.map
+-MixedMap cm-super-t1.map
+-MixedMap cm-super-t2a.map
+-MixedMap cm-super-t2b.map
+-MixedMap cm-super-t2c.map
+-MixedMap cm-super-ts1.map
+-MixedMap cm-super-x2.map
+-Map cmcyr.map
+-MixedMap cmll.map
+-Map comfortaa.map
+-Map original-context-symbol.map
+-MixedMap csother.map
+-MixedMap cstext.map
+-Map cyklop.map
+-Map dejavu-type1.map
+-Map dictsym.map
+-Map dstroke.map
+-Map droid.map
+-Map dutchcal.map
+-Map yes.map
+-Map epigrafica.map
+-Map epiolmec.map
+-MixedMap esint.map
+-Map ESSTIX.map
+-Map esvect.map
+-MixedMap ethiop.map
+-MixedMap eurosym.map
+-Map fdsymbol.map
+-Map fge.map
+-Map foekfont.map
+-Map fonetika.map
+-Map fourier-utopia-expert.map
+-Map fourier.map
+-Map garuda-c90.map
+-Map gfsartemisia.map
+-Map gfsbaskerville.map
+-Map gfsbodoni.map
+-Map gfscomplutum.map
+-Map gfsdidot.map
+-Map gfsneohellenic.map
+-Map gfsporson.map
+-Map gfssolomos.map
+-Map yfrak.map
+-Map ugq.map
+-Map grverb.map
+-MixedMap hfbright.map
+-MixedMap iby.map
+-Map fi4.map
+-Map Acorn.map
+-Map AnnSton.map
+-Map ArtNouv.map
+-Map ArtNouvc.map
+-Map Carrickc.map
+-Map Eichenla.map
+-Map Eileen.map
+-Map EileenBl.map
+-Map Elzevier.map
+-Map GotIn.map
+-Map GoudyIn.map
+-Map Kinigcap.map
+-Map Konanur.map
+-Map Kramer.map
+-Map MorrisIn.map
+-Map Nouveaud.map
+-Map Romantik.map
+-Map Rothdn.map
+-Map RoyalIn.map
+-Map Sanremo.map
+-Map Starburst.map
+-Map Typocaps.map
+-Map Zallman.map
+-Map iwona.map
+-KanjiMap otf-@kanjiEmbed@.map
+-KanjiMap otf-cktx.map
+-Map kerkis.map
+-Map knitfont.map
+-Map kpfonts.map
+-Map kurier.map
+-Map lato.map
+-Map libertine.map
+-Map yly.map
+-Map linearA.map
+-Map l7x-urwvn.map
+-Map lm.map
+-MixedMap lxfonts.map
+-MixedMap manfnt.map
+-Map marvosym.map
+-Map mathabx.map
+-Map mdbch.map
+-Map mdput.map
+-Map mdugm.map
+-Map troff-updmap.map
+-MixedMap mflogo.map
+-Map MnSymbol.map
+-MixedMap mongolian.map
+-MixedMap musix.map
+-Map norasi-c90.map
+-Map cherokee.map
+-Map ocrb.map
+-Map oinuit.map
+-Map omega.map
+-Map opensans.map
+-Map paratype-type1.map
+-Map phaistos.map
+-MixedMap pigpen.map
+-MixedMap plother.map
+-MixedMap pltext.map
+-Map ap.map
+-Map prodint.map
+-Map charter.map
+-Map fpls.map
+-Map pazo.map
+-Map utopia.map
+-KanjiMap morisawa.map
+-KanjiMap ptex-@kanjiEmbed@.map
+-Map pxfonts.map
+-Map pxtx.map
+-Map recycle.map
+-Map yrd.map
+-MixedMap rsfs.map
+-Map rsfso.map
+-Map skt.map
+-MixedMap semaf.map
+-Map SkakNew.map
+-Map starfont.map
+-Map icelandic.map
+-MixedMap stmaryrd.map
+-Map tabvar.map
+ Map mathpple.map
+-Map qag.map
+-Map qbk.map
+-Map qcr.map
+-Map qcs.map
+-Map qhv.map
+-Map qpl.map
+-Map qtm.map
+-Map qzc.map
+-Map tfrupee.map
+-MixedMap tipa.map
+-MixedMap trajan.map
+-Map txfonts.map
+-Map gptimes.map
+-Map umj.map
+-MixedMap dvng.map
+-Map yv1.map
+-Map yv2.map
+-Map yv3.map
+-Map yvo.map
+-Map yvt.map
+-Map arevvn.map
+-Map chartervn.map
+-Map cmbrightvn.map
+-Map concretevn.map
+-Map grotesqvn.map
+-Map txttvn.map
+-Map urwvn.map
+-MixedMap vnrother.map
+-MixedMap vnrtext.map
+-Map vntopia.map
+-Map dgj.map
+-Map dmj.map
+-Map mc2j.map
+-Map mcj.map
+-Map mr2j.map
+-Map mrj.map
+-MixedMap wasy.map
+-MixedMap xypic.map
+-MixedMap yhmath.map
diff --git a/print/texlive-tetex/INSTALL b/print/texlive-tetex/INSTALL
deleted file mode 100644
index cf458c9ff42..00000000000
--- a/print/texlive-tetex/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: INSTALL,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
-
-case "${STAGE}" in
-POST-INSTALL)
-	@UPDMAP_SYS@
-	;;
-esac
diff --git a/print/texlive-tetex/Makefile b/print/texlive-tetex/Makefile
index c736664820b..f6689b0a789 100644
--- a/print/texlive-tetex/Makefile
+++ b/print/texlive-tetex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/09/13 04:08:32 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2011/11/06 08:43:28 minskim Exp $
 
-DISTNAME=	texlive-20100720-source
-PKGNAME=	texlive-tetex-2010
+DISTNAME=	texlive-20110705-source
+PKGNAME=	texlive-tetex-2011
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
@@ -12,7 +12,8 @@ COMMENT=	Scripts included in teTeX
 
 CONFLICTS+=	teTeX-bin<=3.0nb22
 DEPENDS+=	dialog>=1.0:../../misc/dialog
-DEPENDS+=	tex-tetex-[0-9]*:../../print/tex-tetex
+DEPENDS+=	kpathsea-[0-9]*:../../print/kpathsea
+DEPENDS+=	tex-tetex>=3.0.24482:../../print/tex-tetex
 
 EXTRACT_ELEMENTS=	${DISTNAME}/build-aux \
 			${DISTNAME}/texk/tetex
@@ -27,25 +28,27 @@ PKG_SYSCONFSUBDIR=	texmf
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/web2c
 CONF_FILES+=	${PREFIX}/share/texmf/web2c/fmtutil.cnf \
 		${PKG_SYSCONFDIR}/web2c/fmtutil.cnf
-CONF_FILES+=	${PREFIX}/share/texmf/web2c/updmap.cfg \
-		${PKG_SYSCONFDIR}/web2c/updmap.cfg
 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 updmap updmap-sys
-SUBST_SED.paths=	-e 's,@DIALOG@,${LOCALBASE}/bin/dialog,g' \
+			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@,${LOCALBASE}/bin/kpsewhich,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@,${PREFIX}/bin/updmap,g' \
-			-e 's,@UPDMAP_SYS@,${PREFIX}/bin/updmap-sys,g'
+			-e 's,@UPDMAP@,${UPDMAP_PREFIX}/bin/updmap,g' \
+			-e 's,@UPDMAP_SYS@,${UPDMAP_PREFIX}/bin/updmap-sys,g'
 
 INSTALLATION_DIRS+=	share/texmf/web2c
 
@@ -56,7 +59,7 @@ TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
 .include "../../print/kpathsea/texmf.mk"
 
 post-install:
-.for f in fmtutil.cnf updmap.cfg
+.for f in fmtutil.cnf
 	${INSTALL_DATA} ${FILESDIR}/${f} \
 		${DESTDIR}${PREFIX}/share/texmf/web2c
 .endfor
diff --git a/print/texlive-tetex/PLIST b/print/texlive-tetex/PLIST
index 5b7178aaa87..b18ed517f9f 100644
--- a/print/texlive-tetex/PLIST
+++ b/print/texlive-tetex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/09/13 04:08:32 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/11/06 08:43:28 minskim Exp $
 bin/allcm
 bin/allec
 bin/allneeded
@@ -20,8 +20,6 @@ bin/texconfig
 bin/texconfig-dialog
 bin/texconfig-sys
 bin/texlinks
-bin/updmap
-bin/updmap-sys
 man/man1/allcm.1
 man/man1/allec.1
 man/man1/allneeded.1
@@ -34,7 +32,6 @@ man/man1/kpsepath.1
 man/man1/kpsetool.1
 man/man1/kpsewhere.1
 man/man1/kpsexpand.1
-man/man1/mkjobtexmf.1
 man/man1/mktexfmt.1
 man/man1/ps2frag.1
 man/man1/pslatex.1
@@ -45,10 +42,7 @@ man/man1/texconfig.1
 man/man1/texdoctk.1
 man/man1/texlinks.1
 man/man1/thumbpdf.1
-man/man1/updmap-sys.1
-man/man1/updmap.1
 man/man5/fmtutil.cnf.5
-man/man5/updmap.cfg.5
 share/texmf/texconfig/README
 share/texmf/texconfig/g/generic
 share/texmf/texconfig/generic
@@ -57,4 +51,3 @@ share/texmf/texconfig/tcfmgr.map
 share/texmf/texconfig/v/vt100
 share/texmf/texconfig/x/xterm
 share/texmf/web2c/fmtutil.cnf
-share/texmf/web2c/updmap.cfg
diff --git a/print/texlive-tetex/distinfo b/print/texlive-tetex/distinfo
index 69ba2fdeb72..ee5b6eeeaba 100644
--- a/print/texlive-tetex/distinfo
+++ b/print/texlive-tetex/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.8 2010/09/13 04:08:32 minskim Exp $
+$NetBSD: distinfo,v 1.9 2011/11/06 08:43:28 minskim Exp $
 
-SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
-RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
-Size (texlive-20100720-source.tar.xz) = 33484212 bytes
-SHA1 (patch-aa) = f065630c44b9714c33d3717fc39b87060d1e53fa
+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) = 63eeaa34147242dd9b5ba70ed3e900792f1a2726
 SHA1 (patch-ab) = 7dedf57466ab0256b25a4c6a52e47cfaa0183b0b
-SHA1 (patch-ac) = 00a18f7106ac91c8f6e38b27cd607dce28d00cd6
-SHA1 (patch-ad) = 3fde31afd0d136e8f04a373b2ece3f6d7f587495
 SHA1 (patch-ae) = e17e8579ccb4db6302119b046fa319ece06ed663
 SHA1 (patch-af) = a5c098fc4f136d35188318d322adeb6db885291d
 SHA1 (patch-ag) = 71dcd936a37628de69bb56f9f17f67e009b4646c
 SHA1 (patch-ah) = 12e49c230b2af8bac83539fb07a954e04e62fbd7
-SHA1 (patch-ai) = 59d06c8fa109226045f56ff6cbfcaf18b77582ce
+SHA1 (patch-ai) = c194542cbed5e8a6af8f50f2b9873106a8b146fe
 SHA1 (patch-aj) = 4abe9d57ebafe6b053b84e1eea7fd63a43952e8b
 SHA1 (patch-ak) = 9c2125e681a4ae59f3d05ec92323c42cd928a1a2
 SHA1 (patch-al) = 0b51e3aecd3a048132ffd02bacfb9a63f55051ef
diff --git a/print/texlive-tetex/files/updmap.cfg b/print/texlive-tetex/files/updmap.cfg
deleted file mode 100644
index f17a2d566df..00000000000
--- a/print/texlive-tetex/files/updmap.cfg
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: updmap.cfg,v 1.1.1.1 2009/01/26 21:04:33 minskim Exp $
-# 
-# The full updmap.cfg is generated by concatenating updmap-hdr.cfg with
-# all the Map and MixedMap lines from an installation, possibly
-# appending a local configuration file.
-#
-# To make local customizations to the map files, please use the
-# following method:
-#
-# call 
-#       updmap-sys --enable Map=foo.map
-#    for each map file.  (Or MixedMap instead of Map, if your font has
-#    both Metafont and outline definitions.)  See the updmap --help
-#    documentation.
-
-
-################################################################
-# OPTIONS
-################################################################
-
-#
-# dvipsPreferOutline
-#
-# Should dvips (by default) prefer bitmap fonts or outline fonts
-# if both are available? Independent of this setting, outlines
-# can be forced by putting "p psfonts_t1.map" into a config file
-# that dvips reads. Bitmaps (for the fonts in question) can
-# be forced by putting "p psfonts_pk.map" into a config file.
-# We provide such config files which can be enabled via
-# dvips -Poutline ... resp. dvips -Ppk ...
-#
-# Valid settings for dvipsPreferOutline are true / false:
-dvipsPreferOutline true
-
-#
-# LW35
-#
-# Which fonts for the "Basic 35 Laserwriter Fonts" do you want to use and
-# how are the filenames chosen? Valid settings:
-#   URW:     URW fonts with "vendor" filenames (e.g. n019064l.pfb)
-#   URWkb:   URW fonts with "berry" filenames (e.g. uhvbo8ac.pfb)
-#   ADOBE:   Adobe fonts with "vendor" filenames (e.g. hvnbo___.pfb)
-#   ADOBEkb: Adobe fonts with  "berry" filenames (e.g. phvbo8an.pfb)
-LW35 URWkb
-
-#
-# dvipsDownloadBase35
-# 
-# Should dvips (by default) download the standard 35 LaserWriter fonts
-# with the document (then set dvipsDownloadBase35 true) or should these
-# fonts be used from the ps interpreter / printer?
-# Whatever the default is, the user can override it by specifying
-# dvips -Pdownload35 ... resp. dvips -Pbuiltin35 ... to either download
-# the LW35 fonts resp. use the built-in fonts.
-#
-# Valid settings are true / false:
-dvipsDownloadBase35 false
-
-#
-# pdftexDownloadBase14
-#
-# Should pdftex download the base 14 pdf fonts? Since some configurations
-# (ps / pdf tools / printers) use bad default fonts, it is safer to download
-# the fonts. The pdf files will get bigger, though.
-# Valid settings are true (download the fonts) or false (don't download
-# the fonts). Adobe recommends embedding all fonts.
-pdftexDownloadBase14 true
-
-#
-# dvipdfmDownloadBase14
-#
-# Should dvipdfm download the base 14 pdf fonts? Since some configurations
-# (ps / pdf tools / printers) use bad default fonts, it is safer to download
-# the fonts. The pdf files will get bigger, though.
-# Valid settings are true (download the fonts) or false (don't download
-# the fonts).
-dvipdfmDownloadBase14 true
-
-################################################################
-# Map files.
-################################################################
-#
-# There are two possible entries: Map and MixedMap. Both have one additional
-# argument: the filename of the map file. MixedMap ("mixed" means that
-# the font is available as bitmap and as outline) lines will not be used
-# in the default map of dvips if dvipsPreferOutline is false. Inactive
-# Map files should be marked by "#! " (without the quotes), not just #.
-#
-
diff --git a/print/texlive-tetex/patches/patch-aa b/print/texlive-tetex/patches/patch-aa
index 341304af9dd..6b627848b8c 100644
--- a/print/texlive-tetex/patches/patch-aa
+++ b/print/texlive-tetex/patches/patch-aa
@@ -1,46 +1,48 @@
-$NetBSD: patch-aa,v 1.6 2010/09/13 04:08:32 minskim Exp $
+$NetBSD: patch-aa,v 1.7 2011/11/06 08:43:29 minskim Exp $
 
---- Makefile.in.orig	2010-06-06 18:04:05.000000000 +0000
+--- Makefile.in.orig	2011-06-16 14:01:09.000000000 +0000
 +++ Makefile.in
-@@ -196,7 +196,6 @@ dist_bin_SCRIPTS = \
- 	kpsetool \
- 	kpsewhere \
- 	ps2frag \
--	ps4pdf \
- 	pslatex \
- 	rubibtex \
- 	rumakeindex \
-@@ -211,14 +210,8 @@ dist_man1_MANS = \
- 	allcm.man \
- 	allec.man \
+@@ -195,11 +195,9 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I ../../m4
+-perl_scripts = \
+-	updmap
++perl_scripts =
+ 
+-shell_scripts = \
+-	updmap-sys
++shell_scripts =
+ 
+ sh_scripts = \
+ 	allcm \
+@@ -235,7 +233,6 @@ dist_man1_MANS = \
  	allneeded.man \
--	context/ctxtools.man \
--	context/mptopdf.man \
--	context/pstopdf.man \
--	context/texexec.man \
--	context/texmfstart.man \
  	dvi2fax.man \
  	dvired.man \
 -	e2pall.man \
  	fmtutil.man \
  	fontinst.man \
  	kpsetool.man \
-@@ -238,12 +231,12 @@ dist_man5_MANS = \
- 	fmtutil.cnf.5 \
- 	updmap.cfg.5
+@@ -247,14 +244,12 @@ dist_man1_MANS = \
+ 	texconfig.man \
+ 	texdoctk.man \
+ 	texlinks.man \
+-	thumbpdf.man \
+-	updmap.man
++	thumbpdf.man
  
--tetexdocdir = ${prefix}/texmf/doc/tetex
-+tetexdocdir = ${prefix}/texmf
- dist_tetexdoc_DATA = \
- 	doc/TETEXDOC.pdf \
- 	doc/teTeX-FAQ
+ dist_man5_MANS = \
+-	fmtutil.cnf.5 \
+-	updmap.cfg.5
++	fmtutil.cnf.5
  
 -texconfdir = ${prefix}
 +texconfdir = ${prefix}/share
  nobase_dist_texconf_DATA = \
  	texmf/texconfig/README \
  	texmf/texconfig/g/generic \
-@@ -251,7 +244,7 @@ nobase_dist_texconf_DATA = \
+@@ -262,7 +257,7 @@ nobase_dist_texconf_DATA = \
  	texmf/texconfig/v/vt100 \
  	texmf/texconfig/x/xterm
  
@@ -49,14 +51,22 @@ $NetBSD: patch-aa,v 1.6 2010/09/13 04:08:32 minskim Exp $
  dist_texconfig_SCRIPTS = tcfmgr
  dist_texconfig_DATA = tcfmgr.map
  web2cdir = ${prefix}/texmf/web2c
-@@ -754,8 +747,8 @@ info: info-am
+@@ -275,8 +270,7 @@ bin_links = \
+ 
+ man1_links = $(bin_links) \
+ 	fmtutil:fmtutil-sys \
+-	texconfig:texconfig-sys \
+-	updmap:updmap-sys
++	texconfig:texconfig-sys
  
- info-am:
+ EXTRA_DIST = README.texdoctk old-fontinst.bat old-updmap
+ run_texlinks = $(DESTDIR)$(bindir)/texlinks -v \
+@@ -810,7 +804,7 @@ 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
+ install-data-am: install-dist_texconfigDATA \
+ 	install-dist_texconfigSCRIPTS install-dist_texmfSCRIPTS \
+-	install-dist_web2cDATA install-man \
++	install-man \
+ 	install-nobase_dist_texconfDATA
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
diff --git a/print/texlive-tetex/patches/patch-ac b/print/texlive-tetex/patches/patch-ac
deleted file mode 100644
index 259be70275f..00000000000
--- a/print/texlive-tetex/patches/patch-ac
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/09/20 03:33:43 minskim Exp $
-
---- updmap.orig	2008-05-25 15:24:33.000000000 -0700
-+++ updmap
-@@ -597,7 +597,7 @@ fileADOBE()
- ###############################################################################
- locateWeb2c()
- {
--  kpsewhich --format='web2c files' ${1+"$@"}
-+  @KPSEWHICH@ --format='web2c files' ${1+"$@"}
- }
- 
- ###############################################################################
-@@ -617,7 +617,7 @@ locateMap()
-   # The old version of the code; not used at the moment.
-   for map
-   do
--    file=`kpsewhich --format=map "$map"`
-+    file=`@KPSEWHICH@ --format=map "$map"`
-     if test -f "$file"; then
-       verboseMsg "$progname: using map file \`$file'"
-       echo "$file"
-@@ -637,10 +637,10 @@ locateMapMigrate()
-   for map
-   do
-     # look up using the new search path
--    file=`kpsewhich --format=map "$map"`
-+    file=`@KPSEWHICH@ --format=map "$map"`
- 
-     # look up using the old search path
--    file2=`kpsewhich --format='dvips config' "$map"`
-+    file2=`@KPSEWHICH@ --format='dvips config' "$map"`
- 
-     # Well, the search paths should not overlap. If they do, and if
-     # file1 = file2, we don't want to complain about file2, so:
-@@ -830,7 +830,7 @@ mktexdir()
- ###############################################################################
- setupDestDir()
- {
--  vartexmf=`kpsewhich -var-value=TEXMFVAR`
-+  vartexmf=`@KPSEWHICH@ -var-value=TEXMFVAR`
- 
-   # dvips
-   if test -z "$dvipsoutputdir"; then
-@@ -861,7 +861,7 @@ setupDestDir()
- ###############################################################################
- setupLog()
- {
--  vartexmf=`kpsewhich -var-value=TEXMFVAR`
-+  vartexmf=`@KPSEWHICH@ -var-value=TEXMFVAR`
-   dir=$vartexmf/web2c
-   mktexdir "$dir" >/dev/null 2>&1
-   log="$dir/$progname.log"
-@@ -1055,7 +1055,7 @@ listAvailableMaps()
- '
-   for line in `egrep '^(#! *)?(Mixed)?Map' "$cnfFile"`; do
-     m=`echo "$line" | sed 's@[ 	]*$@@; s@.*[ 	]@@'`
--    kpsewhich --format=map "$m" >/dev/null && echo "$line"
-+    @KPSEWHICH@ --format=map "$m" >/dev/null && echo "$line"
-   done
-   IFS=$OLDIFS
- }
-@@ -1068,7 +1068,7 @@ listAvailableMaps()
- syncWithTrees()
- {
-   for i in `egrep '^(Mixed)?Map' "$cnfFile" | sed 's@.* @@'`; do
--    kpsewhich --format=map "$i" >/dev/null || echo "$i"
-+    @KPSEWHICH@ --format=map "$i" >/dev/null || echo "$i"
-   done > $tmp1
-   {
-     sed 's@/@\\/@g; s@^@/^MixedMap[ 	]*@; s@$@$/s/^/#! /@' <$tmp1
-@@ -1335,7 +1335,7 @@ main()
-   cnfFileShort=updmap.cfg
-   cnfFile=
-   dvipsoutputdir=; pdftexoutputdir=; dvipdfmoutputdir=
--  : ${TEXMFMAIN=`kpsewhich -var-value=TEXMFMAIN`}
-+  : ${TEXMFMAIN=`@KPSEWHICH@ -var-value=TEXMFMAIN`}
- 
-   tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-   tmp1=$tmpdir/a
diff --git a/print/texlive-tetex/patches/patch-ai b/print/texlive-tetex/patches/patch-ai
index 2665c2cadd1..45171477ba5 100644
--- a/print/texlive-tetex/patches/patch-ai
+++ b/print/texlive-tetex/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
+$NetBSD: patch-ai,v 1.3 2011/11/06 08:43:29 minskim Exp $
 
---- texconfig.orig	2008-07-17 13:24:39.000000000 -0700
+--- texconfig.orig	2011-01-07 11:45:38.000000000 +0000
 +++ texconfig
 @@ -91,7 +91,7 @@ echoShowKpseVariable()
    for eskv
@@ -65,7 +65,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
  }
  
  ###############################################################################
-@@ -606,7 +606,7 @@ Report bugs to <tex-k@tug.org>."
+@@ -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
@@ -74,7 +74,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
        done
        echo
        echo '=========================== kpathsea variables ==========================='
-@@ -702,7 +702,7 @@ Valid PAPER settings:
+@@ -703,7 +703,7 @@ Valid PAPER settings:
              *)
                otherPrinter=true
                otherPrinterName=$2
@@ -83,7 +83,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
                case $otherPrinterFile in
                  "")
                    echo "$progname: configuration file \`config.$otherPrinterName' for printer \`$otherPrinterName' not found" >&2
-@@ -735,7 +735,7 @@ Valid PAPER settings:
+@@ -736,7 +736,7 @@ Valid PAPER settings:
                ;;
              *)
                printerName=$2
@@ -92,7 +92,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
                case $pFile in
                  "")
                    setupTmpDir
-@@ -772,7 +772,7 @@ Valid PAPER settings:
+@@ -773,7 +773,7 @@ Valid PAPER settings:
                ;;
              *)
                printerName=$2
@@ -101,7 +101,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
                case $pFile in
                  "")
                    echo "$progname: configuration file for printer \`$printerName' (config.$printerName) not found" >&2
-@@ -930,7 +930,7 @@ For more information about these \`featu
+@@ -931,7 +931,7 @@ For more information about these \`featu
                ;;
              *)
                tcBatchFontVardir=$3
@@ -110,7 +110,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
                if test -n "$tfc"; then
                  if test -w "$tfc"; then
                    configReplace "$tfc" '^VARTEXFONTS' "VARTEXFONTS  = $tcBatchFontVardir"
-@@ -946,7 +946,7 @@ For more information about these \`featu
+@@ -947,7 +947,7 @@ For more information about these \`featu
            esac
            ;;
          rw)
@@ -119,7 +119,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
            if test -z "$MT_VARTEXFONTS"; then
              echo "$progname: failed to set \`font rw'; reason: could not determine VARTEXFONTS variable." >&2; rc=1
              return
-@@ -972,7 +972,7 @@ For more information about these \`featu
+@@ -973,7 +973,7 @@ For more information about these \`featu
            fmgrConfigReplace mktex.cnf '^: ..MT_FEATURES=' ": \${MT_FEATURES=appendonlydir:varfonts}"
            ;;
          ro)
@@ -128,7 +128,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 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
+@@ -1024,10 +1024,10 @@ EOM
  
        setupTmpDir
        echo "$progname: analyzing old configuration..." >&2
@@ -142,7 +142,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
  
        if cmp $tmpdir/pre $tmpdir/post >/dev/null 2>&1; then
          echo "$progname: no new/updated formats available ..." >&2
-@@ -1034,9 +1034,9 @@ EOM
+@@ -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
@@ -154,7 +154,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
        fi
        ;;
  
-@@ -1076,7 +1076,7 @@ $formatsForHyphenFmt"
+@@ -1077,7 +1077,7 @@ $formatsForHyphenFmt"
          *)
            if checkElemInList "$tcBatchHyphenFormat" $formatsForHyphen; then
  
@@ -163,7 +163,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
              case $tcBatchHyphenFile in
                "")
                  echo "$progname: could not find hyphen setup file for format \`$tcBatchHyphenFormat'" >&2
-@@ -1133,7 +1133,7 @@ $formatsForHyphenFmt"
+@@ -1134,7 +1134,7 @@ $formatsForHyphenFmt"
                    fi
                    ;;
                esac
@@ -172,30 +172,29 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
              fi
            else
              echo "$progname: invalid format \`$tcBatchHyphenFormat' specified as argument for \`$progname hyphen'" >&2
-@@ -1150,17 +1150,17 @@ $formatsForHyphenFmt"
- 
+@@ -1152,9 +1152,9 @@ $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 \
+-          if fmtutil --all \
 -             && texlinks --multiplatform \
+-             && updmap; then
++          if @FMTUTIL@ --all \
 +             && @TEXLINKS@ --multiplatform \
-              && $updmap; then
++             && @UPDMAP@; then
              :
            else
-@@ -1273,7 +1273,7 @@ Valid PAPER settings:
+             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
@@ -204,7 +203,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
                  fi
                else
                  echo "$progname: unknown MODE \`$tcBatchPdftexMode' given as argument for \`$progname pdftex mode'" >&2
-@@ -1292,7 +1292,7 @@ Valid PAPER settings:
+@@ -1285,7 +1285,7 @@ Valid PAPER settings:
                wChanged=$fmgrConfigReplaceChanged
                fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
                if $wChanged || $fmgrConfigReplaceChanged; then
@@ -213,7 +212,7 @@ $NetBSD: patch-ai,v 1.2 2009/09/20 19:16:49 minskim Exp $
                fi
                ;;
              a4)
-@@ -1301,7 +1301,7 @@ Valid PAPER settings:
+@@ -1294,7 +1294,7 @@ Valid PAPER settings:
                wChanged=$fmgrConfigReplaceChanged
                fmgrConfigReplace pdftexconfig.tex pdfpageheight '\pdfpageheight='"$h"
                if $wChanged || $fmgrConfigReplaceChanged; then
diff --git a/print/texlive/package.mk b/print/texlive/package.mk
index 4b0dd57e2de..2ba6ff0c805 100644
--- a/print/texlive/package.mk
+++ b/print/texlive/package.mk
@@ -1,4 +1,4 @@
-# $NetBSD: package.mk,v 1.10 2011/09/18 19:04:56 bsiegert Exp $
+# $NetBSD: package.mk,v 1.11 2011/11/06 08:43:28 minskim Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # TeX Live packages.
@@ -141,7 +141,7 @@ _texlive-install:
 .  include "../../print/texlive-tetex/hyphen.mk"
 .endif
 .if !empty(TEX_MAP_FILES) || !empty(TEX_MIXEDMAP_FILES)
-.  include "../../print/texlive-tetex/map.mk"
+.  include "../../print/tex-tetex/map.mk"
 .endif
 
 post-extract: _texlive-set-permission _texlive-info _texlive-man