Update tex-tetex{,-doc} to 3.0.32132

- Files in share/texmf have been moved to share/texmf-dist.
- 'updmap --sys' replaces 'updmap-sys'.

9 files changed, 400 insertions, 109 deletions

diff --git a/print/tex-tetex-doc/Makefile b/print/tex-tetex-doc/Makefile
index f4975fc5433..6fde499835e 100644
--- a/print/tex-tetex-doc/Makefile
+++ b/print/tex-tetex-doc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/10/13 22:38:20 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2013/11/17 17:15:43 minskim Exp $
 
 DISTNAME=	tetex.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-3.0.27774
-TEXLIVE_REV=	27774
+PKGNAME=	tex-${DISTNAME:S/./-/}-3.0.32132
+TEXLIVE_REV=	32132
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Documentation for tex-tetex
@@ -10,7 +10,5 @@ COMMENT=	Documentation for tex-tetex
 CONFLICTS+=	teTeX-bin<=3.0nb42
 CONFLICTS+=	texlive-tetex<=2011nb1
 
-TEX_TEXMF_DIRS+=	${PREFIX}/share/texmf
-
 .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 f577f48c669..5319df067fd 100644
--- a/print/tex-tetex-doc/PLIST
+++ b/print/tex-tetex-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/10/13 22:38:20 minskim Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/11/17 17:15:43 minskim Exp $
 man/man1/allcm.1
 man/man1/allec.1
 man/man1/allneeded.1
@@ -15,5 +15,5 @@ man/man1/updmap-sys.1
 man/man1/updmap.1
 man/man5/fmtutil.cnf.5
 man/man5/updmap.cfg.5
-share/texmf/doc/tetex/TETEXDOC.pdf
-share/texmf/doc/tetex/teTeX-FAQ
+share/texmf-dist/doc/tetex/TETEXDOC.pdf
+share/texmf-dist/doc/tetex/teTeX-FAQ
diff --git a/print/tex-tetex-doc/distinfo b/print/tex-tetex-doc/distinfo
index 040d37926c4..b9e0e8d705a 100644
--- a/print/tex-tetex-doc/distinfo
+++ b/print/tex-tetex-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: distinfo,v 1.13 2013/11/17 17:15:43 minskim Exp $
 
-SHA1 (tex-tetex-27774/tetex.doc.tar.xz) = 881f862b15cb960b41cd866fe464e4e8d0452963
-RMD160 (tex-tetex-27774/tetex.doc.tar.xz) = e5e224cb8715752b0a77f4034e3cdd29ae35c6a8
-Size (tex-tetex-27774/tetex.doc.tar.xz) = 339860 bytes
+SHA1 (tex-tetex-32132/tetex.doc.tar.xz) = 19681519510bf8794aba8c0848dedb1a03cd34f9
+RMD160 (tex-tetex-32132/tetex.doc.tar.xz) = 92da273d09c33bdaa9786e480173c6d7b5d99b69
+Size (tex-tetex-32132/tetex.doc.tar.xz) = 340524 bytes
diff --git a/print/tex-tetex/Makefile b/print/tex-tetex/Makefile
index 08a043aa0dd..7365aee6dcd 100644
--- a/print/tex-tetex/Makefile
+++ b/print/tex-tetex/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2013/05/31 12:41:50 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2013/11/17 17:15:43 minskim Exp $
 
 DISTNAME=	tetex
-PKGNAME=	tex-${DISTNAME}-3.0.27774
-PKGREVISION=	2
-TEXLIVE_REV=	27774
+PKGNAME=	tex-${DISTNAME}-3.0.32132
+TEXLIVE_REV=	32132
 
 MAINTAINER=	minskim@NetBSD.org
 COMMENT=	Supplementary files for updmap
@@ -12,7 +11,7 @@ CONFLICTS=	texlive-tetex<=2011nb1
 DEPENDS+=	dialog>=1.0:../../misc/dialog
 DEPENDS+=	kpathsea-[0-9]*:../../print/kpathsea
 DEPENDS+=	tex-kpathsea>=2012nb1:../../print/tex-kpathsea
-DEPENDS+=	tex-texconfig-[0-9]*:../../print/tex-texconfig
+DEPENDS+=	tex-texconfig>=2013:../../print/tex-texconfig
 DEPENDS+=	tex-texlive.infra-[0-9]*:../../print/tex-texlive.infra
 
 USE_TOOLS+=	perl:run sh:run
@@ -47,8 +46,7 @@ MAKE_DIRS+=	${PKG_SYSCONFDIR}/web2c
 CONF_FILES+=	${PREFIX}/share/texmf-dist/web2c/updmap.cfg \
 		${PKG_SYSCONFDIR}/web2c/updmap.cfg
 
-TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR} \
-			${PREFIX}/share/texmf ${PREFIX}/share/texmf-dist
+TEX_TEXMF_DIRS+=	${PKG_SYSCONFDIR} ${PREFIX}/share/texmf-dist
 
 .include "../../print/texlive/package.mk"
 
@@ -56,15 +54,15 @@ post-extract:
 	${MKDIR} ${WRKSRC}/bin
 .for script in fmtutil-sys.sh fmtutil.sh texconfig-dialog.sh \
 		texconfig-sys.sh texlinks.sh
-	${MV} ${WRKSRC}/texmf/scripts/tetex/${script} \
+	${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${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} \
+	${MV} ${WRKSRC}/texmf-dist/scripts/texlive/${script} \
 		${WRKSRC}/bin/${script:S/.pl//:S/.sh//}
 .endfor
-	${RMDIR} -p ${WRKSRC}/texmf/scripts/tetex 2>/dev/null || ${TRUE}
+	${RMDIR} -p ${WRKSRC}/texmf-dist/scripts/texlive 2>/dev/null || ${TRUE}
 
 post-install:
 	${LN} -sf allcm ${DESTDIR}${PREFIX}/bin/allec
diff --git a/print/tex-tetex/PLIST b/print/tex-tetex/PLIST
index 70049199bf8..38dd85e5ddc 100644
--- a/print/tex-tetex/PLIST
+++ b/print/tex-tetex/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/10/14 21:25:22 minskim Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/11/17 17:15:43 minskim Exp $
 bin/allcm
 bin/allec
 bin/allneeded
@@ -16,33 +16,35 @@ bin/texconfig-sys
 bin/texlinks
 bin/updmap
 bin/updmap-sys
+share/texmf-dist/dvips/tetex/config.builtin35
+share/texmf-dist/dvips/tetex/config.dfaxhigh
+share/texmf-dist/dvips/tetex/config.dfaxlo
+share/texmf-dist/dvips/tetex/config.download35
+share/texmf-dist/dvips/tetex/config.gsftopk
+share/texmf-dist/dvips/tetex/config.maxmem
+share/texmf-dist/dvips/tetex/config.outline
+share/texmf-dist/dvips/tetex/config.pdf
+share/texmf-dist/dvips/tetex/config.pk
+share/texmf-dist/dvips/tetex/config.www
+share/texmf-dist/fonts/enc/dvips/tetex/09fbbfac.enc
+share/texmf-dist/fonts/enc/dvips/tetex/0ef0afca.enc
+share/texmf-dist/fonts/enc/dvips/tetex/10037936.enc
+share/texmf-dist/fonts/enc/dvips/tetex/1b6d048e.enc
+share/texmf-dist/fonts/enc/dvips/tetex/71414f53.enc
+share/texmf-dist/fonts/enc/dvips/tetex/74afc74c.enc
+share/texmf-dist/fonts/enc/dvips/tetex/aae443f0.enc
+share/texmf-dist/fonts/enc/dvips/tetex/b6a4d7c7.enc
+share/texmf-dist/fonts/enc/dvips/tetex/bbad153f.enc
+share/texmf-dist/fonts/enc/dvips/tetex/d9b29452.enc
+share/texmf-dist/fonts/enc/dvips/tetex/f7b6d320.enc
+share/texmf-dist/fonts/enc/dvips/tetex/mtex.enc
+share/texmf-dist/fonts/map/dvips/tetex/Makefile
+share/texmf-dist/fonts/map/dvips/tetex/README
+share/texmf-dist/fonts/map/dvips/tetex/base14flags.ltx
+share/texmf-dist/fonts/map/dvips/tetex/base14flags.tex
+share/texmf-dist/fonts/map/dvips/tetex/dvipdfm35.map
+share/texmf-dist/fonts/map/dvips/tetex/dvips35.map
+share/texmf-dist/fonts/map/dvips/tetex/mathpple.map
+share/texmf-dist/fonts/map/dvips/tetex/pdftex35.map
+share/texmf-dist/fonts/map/dvips/tetex/ps2pk35.map
 share/texmf-dist/web2c/updmap.cfg
-share/texmf/dvips/tetex/config.builtin35
-share/texmf/dvips/tetex/config.dfaxhigh
-share/texmf/dvips/tetex/config.dfaxlo
-share/texmf/dvips/tetex/config.download35
-share/texmf/dvips/tetex/config.gsftopk
-share/texmf/dvips/tetex/config.outline
-share/texmf/dvips/tetex/config.pdf
-share/texmf/dvips/tetex/config.pk
-share/texmf/dvips/tetex/config.www
-share/texmf/fonts/enc/dvips/tetex/09fbbfac.enc
-share/texmf/fonts/enc/dvips/tetex/0ef0afca.enc
-share/texmf/fonts/enc/dvips/tetex/10037936.enc
-share/texmf/fonts/enc/dvips/tetex/1b6d048e.enc
-share/texmf/fonts/enc/dvips/tetex/71414f53.enc
-share/texmf/fonts/enc/dvips/tetex/74afc74c.enc
-share/texmf/fonts/enc/dvips/tetex/aae443f0.enc
-share/texmf/fonts/enc/dvips/tetex/b6a4d7c7.enc
-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/dvips/tetex/README
-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/web2c/updmap.cfg
-@pkgdir share/texmf-dist/scripts/tetex
diff --git a/print/tex-tetex/distinfo b/print/tex-tetex/distinfo
index 214048d365a..15c44c1706c 100644
--- a/print/tex-tetex/distinfo
+++ b/print/tex-tetex/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: distinfo,v 1.14 2013/11/17 17:15:43 minskim Exp $
 
-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 (tex-tetex-32132/tetex.tar.xz) = a3d48983771318668f75085f89c291d8f074986a
+RMD160 (tex-tetex-32132/tetex.tar.xz) = 4b853290e39fb6b1d251398865b5876114e79f09
+Size (tex-tetex-32132/tetex.tar.xz) = 50824 bytes
 SHA1 (patch-bin_fmtutil) = 236e785100421eb544cf6c2ba37aa54d584b11cd
 SHA1 (patch-bin_fmtutil-sys) = 9503b6ab417676b8ad390a8fb02a07593da4084e
 SHA1 (patch-bin_kpsetool) = 6b19c9711dba7f2d73a4dc3fc6a62c48add928bb
@@ -10,6 +10,6 @@ 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) = f87dfc7759a8e49453f99c02134fa0bd94bb3912
+SHA1 (patch-bin_updmap) = 9472a7e1fd0842e1baa39378266017946be3aa03
+SHA1 (patch-bin_updmap-sys) = 4671c8a8bade0e282f72a76f34debbd502a5c905
+SHA1 (patch-texmf-dist_web2c_updmap.cfg) = e5ef9f07b356916a35fc43c1f157d3a3e61f3cfe
diff --git a/print/tex-tetex/patches/patch-bin_updmap b/print/tex-tetex/patches/patch-bin_updmap
index 1bfb5aed2c6..9f09d8c8447 100644
--- a/print/tex-tetex/patches/patch-bin_updmap
+++ b/print/tex-tetex/patches/patch-bin_updmap
@@ -1,42 +1,69 @@
-$NetBSD: patch-bin_updmap,v 1.3 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: patch-bin_updmap,v 1.4 2013/11/17 17:15:43 minskim Exp $
 
---- bin/updmap.orig	2012-09-13 03:38:21.000000000 +0000
+--- bin/updmap.orig	2013-10-07 22:58:25.000000000 +0000
 +++ bin/updmap
-@@ -23,7 +23,7 @@ my $TEXMFROOT;
- 
+@@ -3,5 +3,5 @@
+ # updmap - maintain map files for outline fonts.
+ # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
+-# 
++#
+ # Copyright 2011, 2012, 2013 Norbert Preining
+ # This file is licensed under the GNU General Public License version 2
+@@ -24,5 +24,5 @@ my $TEXMFROOT;
  BEGIN {
    $^W=1;
 -  $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
 +  $TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`;
    if ($?) {
      print STDERR "updmap: Cannot find TEXMFROOT, aborting!\n";
-     exit 1;
-@@ -50,10 +50,10 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
- # this function checks by itself whether it is running on windows or not
+@@ -38,5 +38,5 @@ my $version = '$Id: updmap.pl 31853 2013
+ use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
+ use strict;
+-use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname 
++use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname
+   sort_uniq member touch);
+ 
+@@ -51,10 +51,10 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
  reset_root_home();
  
--chomp(my $TEXMFMAIN = `kpsewhich --var-value=TEXMFMAIN`);
+-chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
 -chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
+-chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
 -chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
+-chomp(my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`);
 -chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`);
-+chomp(my $TEXMFMAIN = `@KPSEWHICH@ --var-value=TEXMFMAIN`);
++chomp(my $TEXMFDIST = `@KPSEWHICH@ --var-value=TEXMFDIST`);
 +chomp(my $TEXMFVAR = `@KPSEWHICH@ -var-value=TEXMFVAR`);
++chomp(my $TEXMFSYSVAR = `@KPSEWHICH@ -var-value=TEXMFSYSVAR`);
 +chomp(my $TEXMFCONFIG = `@KPSEWHICH@ -var-value=TEXMFCONFIG`);
++chomp(my $TEXMFSYSCONFIG = `@KPSEWHICH@ -var-value=TEXMFSYSCONFIG`);
 +chomp(my $TEXMFHOME = `@KPSEWHICH@ -var-value=TEXMFHOME`);
  
  # make sure that on windows *everything* is in lower case for comparison
- if (win32()) {
-@@ -215,7 +215,7 @@ sub main {
-     # in the list is the one where changes will be written to.
+@@ -80,6 +80,6 @@ my @cmdline_options = (
+   "sys",
+   "listfiles",
+-  "cnffile=s@", 
+-  "copy", 
++  "cnffile=s@",
++  "copy",
+   "disable=s@",
+   "dvipdfmoutputdir=s",
+@@ -191,5 +191,5 @@ sub main {
+     exit 0;
+   }
+- 
++
+   if ($opts{'showoptions'}) {
+     for my $o (@{$opts{'showoptions'}}) {
+@@ -231,5 +231,5 @@ sub main {
      ($changes_config_file) = @{$opts{'cnffile'}};
    } else {
 -    my @all_files = `kpsewhich -all updmap.cfg`;
 +    my @all_files = `@KPSEWHICH@ -all updmap.cfg`;
      chomp(@all_files);
      my @used_files;
-     for my $f (@all_files) {
-@@ -225,10 +225,10 @@ sub main {
-     my $TEXMFLOCALVAR;
+@@ -241,8 +241,8 @@ sub main {
      my @TEXMFLOCAL;
      if (win32()) {
 -      chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`);
@@ -47,22 +74,261 @@ $NetBSD: patch-bin_updmap,v 1.3 2012/10/13 22:38:20 minskim Exp $
 +      chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path='\$TEXMFLOCAL'`);
        @TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR;
      }
-     #
-@@ -1139,7 +1139,7 @@ sub mkMaps {
+@@ -280,5 +280,5 @@ sub main {
+     # TEXMFLOCAL     $TEXLIVE/texmf-local/web2c/updmap.cfg
+     # TEXMFDIST      $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
+-    # 
++    #
+     # updmap-sys (root):
+     # ==================
+@@ -415,5 +415,5 @@ sub main {
+ 
+   if ($cmd && !$opts{'force'} && !$changed) {
+-    print "$changes_config_file unchanged.  Map files not recreated.\n" 
++    print "$changes_config_file unchanged.  Map files not recreated.\n"
+       if !$opts{'quiet'};
+   } else {
+@@ -435,5 +435,5 @@ sub main {
+       my @missing = read_map_files();
+       if (@missing) {
+-        print STDERR "\nERROR:  The following map file(s) couldn't be found:\n"; 
++        print STDERR "\nERROR:  The following map file(s) couldn't be found:\n";
+         for my $m (@missing) {
+           my $orig = $alldata->{'maps'}{$m}{'origin'};
+@@ -913,5 +913,5 @@ sub cidx2dvips_old {
+       elsif ($_ =~ /^[^ ][^ ]* unicode /) {next;}
+       s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Oo][Tt][Ff]/$1/;
+-      s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Tt][Tt][FfCc]/$1/; 
++      s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Tt][Tt][FfCc]/$1/;
+       s/$/ %/;
+       s/^(([^ ]*).*)/$1$2/;
+@@ -961,9 +961,9 @@ sub mkMaps {
+ 
+   my ($mode, $mode_origin) = get_cfg('LW35');
+-  my ($dvipsPreferOutline, $dvipsPreferOutline_origin) = 
++  my ($dvipsPreferOutline, $dvipsPreferOutline_origin) =
+     get_cfg('dvipsPreferOutline');
+-  my ($dvipsDownloadBase35, $dvipsDownloadBase35_origin) = 
++  my ($dvipsDownloadBase35, $dvipsDownloadBase35_origin) =
+     get_cfg('dvipsDownloadBase35');
+-  my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) = 
++  my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) =
+     get_cfg('pdftexDownloadBase14');
+   my ($pxdviUse, $pxdviUse_origin) = get_cfg('pxdviUse');
+@@ -1120,5 +1120,5 @@ sub mkMaps {
+   push @ps2pk_map, @mixedmaps_fonts;
+   push @ps2pk_map, @notmixedmaps_fonts;
+-  &writeLines(">$dvipsoutputdir/ps2pk.map", 
++  &writeLines(">$dvipsoutputdir/ps2pk.map",
+     normalizeLines(@ps2pk_map));
  
+@@ -1127,5 +1127,5 @@ sub mkMaps {
+   push @download35_map, "% ps2pk35.map";
+   push @download35_map, transLW35($mode, @ps2pk_fonts);
+-  &writeLines(">$dvipsoutputdir/download35.map", 
++  &writeLines(">$dvipsoutputdir/download35.map",
+     normalizeLines(@download35_map));
+ 
+@@ -1133,8 +1133,8 @@ sub mkMaps {
+   push @builtin35_map, "% dvips35.map";
+   push @builtin35_map, transLW35($mode, @dvips35_fonts);
+-  &writeLines(">$dvipsoutputdir/builtin35.map", 
++  &writeLines(">$dvipsoutputdir/builtin35.map",
+     normalizeLines(@builtin35_map));
+ 
+-  my @dftdvips_fonts = 
++  my @dftdvips_fonts =
+     (($dvipsDownloadBase35 eq "true") ? @ps2pk_fonts : @dvips35_fonts);
+ 
+@@ -1152,5 +1152,5 @@ sub mkMaps {
+   push @psfonts_t1_map, @notmixedmaps_fonts;
+   push @psfonts_t1_map, @tmpkanji2;
+-  &writeLines(">$dvipsoutputdir/psfonts_t1.map", 
++  &writeLines(">$dvipsoutputdir/psfonts_t1.map",
+     normalizeLines(@psfonts_t1_map));
+ 
+@@ -1159,5 +1159,5 @@ sub mkMaps {
+   push @psfonts_pk_map, @notmixedmaps_fonts;
+   push @psfonts_pk_map, @tmpkanji2;
+-  &writeLines(">$dvipsoutputdir/psfonts_pk.map", 
++  &writeLines(">$dvipsoutputdir/psfonts_pk.map",
+     normalizeLines(@psfonts_pk_map));
+ 
+@@ -1216,5 +1216,5 @@ sub mkMaps {
+     } else {
+       print STDERR "$prg: Warning: File $d/$f doesn't exist.\n";
+-      print LOG    "Warning: File $d/$f doesn't exist.\n" 
++      print LOG    "Warning: File $d/$f doesn't exist.\n"
+         unless $opts{'dry-run'};
+     }
+@@ -1223,5 +1223,5 @@ sub mkMaps {
+   sub check_mismatch {
+     my ($mm, $d, $f, $prog) = @_;
+-    chomp (my $kpsefound = `kpsewhich --progname=$prog $f`);
++    chomp (my $kpsefound = `@KPSEWHICH@ --progname=$prog $f`);
+     if (lc("$d/$f") ne lc($kpsefound)) {
+       $mm->{$f} = $kpsefound;
+@@ -1332,5 +1332,5 @@ listed below).
  sub locateMap {
    my $map = shift;
 -  my $ret = `kpsewhich --format=map $map`;
 +  my $ret = `@KPSEWHICH@ --format=map $map`;
    chomp($ret);
    return $ret;
+@@ -1376,5 +1376,5 @@ sub processOptions {
+   # now continue with normal option handling
+ 
+-  GetOptions(\%opts, @cmdline_options) or 
++  GetOptions(\%opts, @cmdline_options) or
+     die "Try \"$prg --help\" for more information.\n";
  }
-@@ -1787,7 +1787,7 @@ sub read_map_files {
-     $alldata->{'maps'}{$m}{'status'} = 'enabled';
+@@ -1408,5 +1408,5 @@ sub setupOutputDir {
+ #   in process_options
+ #   (These were the values provided to --setoption.)
+-#   
++#
+ sub setOptions {
+   my (@options) = @_;
+@@ -1415,5 +1415,5 @@ sub setOptions {
+ 
+     my ($key,$val) = split (/=/, $o, 2);
+-    
++
+     die "$prg: unexpected empty key or val for options (@options), goodbye.\n"
+       if !$key || !defined($val);
+@@ -1497,5 +1497,5 @@ sub disable_map {
+     # add a new entry to the top level where we disable it
+     # copy over the type from the last entry
+-    $alldata->{'updmap'}{$tc}{'maps'}{$map}{'type'} = 
++    $alldata->{'updmap'}{$tc}{'maps'}{$map}{'type'} =
+       $alldata->{'updmap'}{$orig}{'maps'}{$map}{'type'};
+     $alldata->{'updmap'}{$tc}{'maps'}{$map}{'status'} = "disabled";
+@@ -1595,5 +1595,5 @@ sub save_updmap {
+ sub check_option {
+   my ($opt, $val) = @_;
+-  if ((($settings{$opt}{'type'} eq "binary") && 
++  if ((($settings{$opt}{'type'} eq "binary") &&
+        $val ne "true" && $val ne "false") ||
+       (($settings{$opt}{'type'} eq "string") &&
+@@ -1613,10 +1613,10 @@ sub setOption {
+ 
+   die "$prg: Unsupported option $opt." if (!defined($settings{$opt}));
+-  die "$0: Invalid value $val for option $opt." 
++  die "$0: Invalid value $val for option $opt."
+     if (!check_option($opt, $val));
+ 
+   # silently accept this old option name, just in case.
+   return if $opt eq "dvipdfmDownloadBase14";
+-  
++
+   #print "Setting option $opt to $val...\n" if !$opts{'quiet'};
+   my $tc = $alldata->{'changes_config'};
+@@ -1766,7 +1766,7 @@ sub normalizeLines {
+ # $alldata->{'updmap'}{$full_path_name_of_updmap}{'setting'}{$key}{'val'} = $val
+ # $alldata->{'updmap'}{$full_path_name_of_updmap}{'setting'}{$key}{'line'} = $i
+-# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'type'} 
++# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'type'}
+ #            = 'Map'|'MixedMap'|'KanjiMap'|'disabled'
+-# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'status'} 
++# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'status'}
+ #            = 'enabled'|'disabled'
+ # $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'line'} = $i
+@@ -1978,5 +1978,5 @@ sub read_map_files {
    }
    @maps = sort_uniq(@maps);
 -  my @fullpath = `kpsewhich --format=map @maps`;
 +  my @fullpath = `@KPSEWHICH@ --format=map @maps`;
    chomp @fullpath;
    foreach my $map (@maps) {
-     my ($ff) = grep /\/$map(\.map)?$/, @fullpath;
+@@ -1985,5 +1985,5 @@ sub read_map_files {
+       $alldata->{'maps'}{$map}{'fullpath'} = $ff;
+     } else {
+-      # if the map file is not found, then push it onto the list of 
++      # if the map file is not found, then push it onto the list of
+       # missing map files, since we know that it is enabled
+       push @missing, $map;
+@@ -2087,11 +2087,11 @@ sub merge_data {
+       # use the font definition only for those fonts where the origin matches
+       if ($alldata->{'fonts'}{$f}{'origin'} eq $m) {
+-        $alldata->{'merged'}{'allMaps'}{'fonts'}{$f} = 
++        $alldata->{'merged'}{'allMaps'}{'fonts'}{$f} =
+           $alldata->{'maps'}{$m}{'fonts'}{$f}
+             if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} ne "KanjiMap");
+-        $alldata->{'merged'}{'noMixedMaps'}{'fonts'}{$f} = 
++        $alldata->{'merged'}{'noMixedMaps'}{'fonts'}{$f} =
+           $alldata->{'maps'}{$m}{'fonts'}{$f}
+             if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} eq "Map");
+-        $alldata->{'merged'}{'KanjiMap'}{'fonts'}{$f} = 
++        $alldata->{'merged'}{'KanjiMap'}{'fonts'}{$f} =
+           $alldata->{'maps'}{$m}{'fonts'}{$f}
+             if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} eq "KanjiMap");
+@@ -2105,5 +2105,5 @@ sub merge_data {
+ # $HOME and sudo and updmap-sys horror
+ #   some instances of sudo do not reset $HOME to the home of root
+-#   as an effect of "sudo updmap" creates root owned files in the home 
++#   as an effect of "sudo updmap" creates root owned files in the home
+ #   of a normal user, and "sudo updmap-sys" uses map files and updmap.cfg
+ #   files from the directory of a normal user, but creating files
+@@ -2133,5 +2133,5 @@ sub reset_root_home {
+           # envhome and roothome do agree, nothing to do, that is the good case
+         }
+-      } else { 
++      } else {
+         warning("$prg: home of root not defined, strange!\n");
+       }
+@@ -2158,5 +2158,5 @@ Usage: $prg     [OPTION] ... [COMMAND]
+ 
+ Update the default font map files used by pdftex, dvips, and dvipdfm(x),
+-and optionally pxdvi, as determined by all configuration files updmap.cfg 
++and optionally pxdvi, as determined by all configuration files updmap.cfg
+ (the ones returned by running "kpsewhich --all updmap.cfg", but see below).
+ 
+@@ -2174,5 +2174,5 @@ By default, the TeX filename database (l
+ 
+ Options:
+-  --cnffile FILE            read FILE for the updmap configuration 
++  --cnffile FILE            read FILE for the updmap configuration
+                              (can be given multiple times, in which case
+                              all the files are used)
+@@ -2261,5 +2261,5 @@ Explanation of trees and files normally 
+   layout is used as shipped with TeX Live, the following files are
+   read, in the given order.
+-  
++
+   For updmap-sys:
+   TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
+@@ -2276,7 +2276,7 @@ Explanation of trees and files normally 
+   TEXMFLOCAL     \$TEXLIVE/texmf-local/web2c/updmap.cfg
+   TEXMFDIST      \$TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
+-  
++
+   (where YYYY is the TeX Live release version).
+-  
++
+   There is one exception to keep upgradability from earlier versions
+   of TeX Live: if a file TEXMFLOCAL/web2c/updmap-local.cfg exists
+@@ -2299,8 +2299,8 @@ Explanation of trees and files normally 
+     kpsewhich --all (equivalently, the one returned by kpsewhich
+     updmap.cfg), is used.
+-      
++
+     2) If neither of the above two are present and changes are made, a
+     new config file is created in \$TEXMFCONFIG/web2c/updmap.cfg.
+-  
++
+   In general, the idea is that if a given config file is not writable, a
+   higher-level one can be used.  That way, the distribution's settings
+@@ -2321,5 +2321,5 @@ Explanation of trees and files normally 
+     or
+       \#! MixedMap mapname.map
+-    in the higher-priority updmap.cfg file. 
++    in the higher-priority updmap.cfg file.
+ 
+     As an example, suppose you have a copy of MathTime Pro fonts
+@@ -2334,5 +2334,5 @@ Explanation of trees and files normally 
+   updmap writes the map files for dvips (psfonts.map) and pdftex
+   (pdftex.map) to the TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/
+-  directories.   
++  directories.
+ 
+   The log file is written to TEXMFVAR/web2c/updmap.log.
diff --git a/print/tex-tetex/patches/patch-bin_updmap-sys b/print/tex-tetex/patches/patch-bin_updmap-sys
index ee8ae572586..5146e9fe0fa 100644
--- a/print/tex-tetex/patches/patch-bin_updmap-sys
+++ b/print/tex-tetex/patches/patch-bin_updmap-sys
@@ -1,19 +1,10 @@
-$NetBSD: patch-bin_updmap-sys,v 1.1 2011/11/06 08:43:28 minskim Exp $
+$NetBSD: patch-bin_updmap-sys,v 1.2 2013/11/17 17:15:43 minskim Exp $
 
---- bin/updmap-sys.orig	2011-05-20 09:20:02.000000000 +0000
+--- bin/updmap-sys.orig	2013-07-31 01:51:21.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+"$@"}'='"$@"'
+@@ -27,4 +27,4 @@ test -n "${ZSH_VERSION+set}" && alias -g
+ # TEXMFCONFIG="$c"
+ # export TEXMFVAR TEXMFCONFIG
  
--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 updmap ${1+"$@"}
-+exec @UPDMAP@ ${1+"$@"}
+-exec updmap --sys ${1+"$@"}
++exec @UPDMAP@ --sys ${1+"$@"}
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 137ce43ccd7..8f89a5e126c 100644
--- a/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
+++ b/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg
@@ -1,14 +1,16 @@
-$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.3 2013/11/17 17:15:43 minskim Exp $
 
---- texmf-dist/web2c/updmap.cfg.orig	2012-09-22 02:28:30.000000000 +0000
+--- texmf-dist/web2c/updmap.cfg.orig	2013-11-12 02:23:56.000000000 +0000
 +++ texmf-dist/web2c/updmap.cfg
-@@ -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.
+@@ -100,263 +100,3 @@ kanjiEmbed noEmbed
+ 
+ 
+ #  (end of updmap-hdr.cfg)
+-Map accanthis.map
 -Map OrnementsADF.map
 -Map ArrowsADF.map
 -Map BulletsADF.map
+-Map alegreya.map
 -MixedMap allrunes.map
 -Map      euler.map
 -MixedMap cm.map
@@ -20,6 +22,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map antt.map
 -Map arabi.map
 -MixedMap arabtex.map
+-Map syriac.map
 -Map archaicprw.map
 -Map arev.map
 -Map bkaiu.map
@@ -31,17 +34,19 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map augie.map
 -Map auncial.map
 -Map aurical.map
+-Map uag.map
 -Map ybv.map
 -MixedMap bbold.map
 -Map belleek.map
 -Map bera.map
 -Map ybd.map
 -Map bguq.map
--Map biolinum-type1.map
 -Map sqrcaps.map
+-Map ubk.map
 -Map boondox.map
 -Map pbsi.map
 -Map burmese.map
+-Map cabin.map
 -Map calligra.map
 -Map cantarell.map
 -Map cmin.map
@@ -64,14 +69,16 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map comfortaa.map
 -Map original-context-symbol.map
 -Map CountriesOfEurope.map
--MixedMap csother.map
--MixedMap cstext.map
+-Map ucr.map
+-Map cs-charter.map
+-Map csfonts.map
 -Map cyklop.map
 -Map dejavu-type1.map
 -Map dictsym.map
 -Map dstroke.map
 -Map droid.map
 -Map dutchcal.map
+-Map EBGaramond.map
 -Map yes.map
 -Map epigrafica.map
 -Map epiolmec.map
@@ -80,15 +87,19 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map esvect.map
 -MixedMap ethiop.map
 -MixedMap eurosym.map
+-Map fbb.map
 -Map fdsymbol.map
 -Map fge.map
 -Map foekfont.map
 -Map fonetika.map
+-Map nectec.map
+-Map nf.map
 -Map tlwg.map
 -Map fourier-utopia-expert.map
 -Map fourier.map
 -Map frcursive.map
 -Map garuda-c90.map
+-Map gentium-type1.map
 -Map gfsartemisia.map
 -Map gfsbaskerville.map
 -Map gfsbodoni.map
@@ -97,13 +108,14 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map gfsneohellenic.map
 -Map gfsporson.map
 -Map gfssolomos.map
+-Map gillius.map
 -Map yfrak.map
 -Map ugq.map
--Map grverb.map
 -Map hacm.map
+-Map uhv.map
 -MixedMap hfbright.map
 -MixedMap iby.map
--Map fi4.map
+-Map zi4.map
 -Map Acorn.map
 -Map AnnSton.map
 -Map ArtNouv.map
@@ -127,6 +139,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map Starburst.map
 -Map Typocaps.map
 -Map Zallman.map
+-Map ipaex-type1.map
 -Map iwona.map
 -KanjiMap otf-@kanjiEmbed@.map
 -KanjiMap otf-cktx.map
@@ -136,7 +149,9 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map kpfonts.map
 -Map kurier.map
 -Map lato.map
--Map libertine-type1.map
+-Map libertine.map
+-Map LibreBaskerville.map
+-Map LibreCaslon.map
 -Map yly.map
 -Map linearA.map
 -Map l7x-urwvn.map
@@ -146,21 +161,32 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map marvosym.map
 -Map mathabx.map
 -Map mdbch.map
+-Map mdgreek.map
+-Map mdici.map
+-Map mdpgd.map
+-Map mdpus.map
 -Map mdput.map
 -Map mdugm.map
 -Map mdsymbol.map
+-Map merriweather.map
 -Map troff-updmap.map
 -MixedMap mflogo.map
+-Map mintspirit.map
 -Map MnSymbol.map
 -MixedMap mongolian.map
 -MixedMap musix.map
--Map ntx.map
+-Map mxedruli.map
+-Map nanumfonts.map
+-Map unc.map
+-Map newpx.map
+-Map newtx.map
 -Map norasi-c90.map
 -Map cherokee.map
 -Map ocrb.map
 -Map oinuit.map
 -Map omega.map
 -Map opensans.map
+-Map upl.map
 -Map paratype-type1.map
 -Map phaistos.map
 -MixedMap pigpen.map
@@ -176,20 +202,26 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -KanjiMap ptex-@kanjiEmbed@@kanjiVariant@.map
 -Map pxfonts.map
 -Map pxtx.map
+-Map quattrocento.map
+-Map Raleway.map
 -Map recycle.map
 -Map yrd.map
 -MixedMap rsfs.map
 -Map rsfso.map
 -Map skt.map
 -Map sansmathaccent.map
+-Map sansmathfonts.map
 -MixedMap semaf.map
 -Map SkakNew.map
+-Map SourceCodePro.map
+-Map SourceSansPro.map
 -Map starfont.map
 -Map icelandic.map
 -MixedMap stmaryrd.map
 -Map superiors.map
+-Map usy.map
 -Map tabvar.map
- Map mathpple.map
+-Map mathpple.map
 -Map qag.map
 -Map qbk.map
 -Map qcr.map
@@ -199,6 +231,7 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map qtm.map
 -Map qzc.map
 -Map tfrupee.map
+-Map utm.map
 -MixedMap tipa.map
 -MixedMap trajan.map
 -Map txfonts.map
@@ -228,5 +261,8 @@ $NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.2 2012/10/13 22:38:20 minskim Exp
 -Map mr2j.map
 -Map mrj.map
 -MixedMap wasy.map
+-Map XCharter.map
 -MixedMap xypic.map
 -MixedMap yhmath.map
+-Map uzc.map
+-Map uzd.map