diff options
author | minskim <minskim> | 2012-07-22 20:24:42 +0000 |
---|---|---|
committer | minskim <minskim> | 2012-07-22 20:24:42 +0000 |
commit | 7a5fe1b9c4af58b2dddab89fb2e5fb9ddc683a9f (patch) | |
tree | 213e6487e6d87f2ed893b93db745c99acf9dceef /print | |
parent | d730a982688e5b9a990ef3085b13e2cfbc2ca755 (diff) | |
download | pkgsrc-7a5fe1b9c4af58b2dddab89fb2e5fb9ddc683a9f.tar.gz |
Update tex-tetex{,-doc} to 3.0.26894.
Changes:
- Support multiple updmap.cfg, one in each texmf tree.
Diffstat (limited to 'print')
-rw-r--r-- | print/tex-tetex-doc/Makefile | 6 | ||||
-rw-r--r-- | print/tex-tetex-doc/distinfo | 8 | ||||
-rw-r--r-- | print/tex-tetex/Makefile | 11 | ||||
-rw-r--r-- | print/tex-tetex/PLIST | 3 | ||||
-rw-r--r-- | print/tex-tetex/distinfo | 12 | ||||
-rw-r--r-- | print/tex-tetex/patches/patch-bin_updmap | 119 | ||||
-rw-r--r-- | print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg (renamed from print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg) | 18 |
7 files changed, 86 insertions, 91 deletions
diff --git a/print/tex-tetex-doc/Makefile b/print/tex-tetex-doc/Makefile index 0e37638c6d8..cbc77460dcd 100644 --- a/print/tex-tetex-doc/Makefile +++ b/print/tex-tetex-doc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2012/03/04 01:01:43 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2012/07/22 20:24:42 minskim Exp $ DISTNAME= tetex.doc -PKGNAME= tex-${DISTNAME:S/./-/}-3.0.24482 -TEXLIVE_REV= 25424 +PKGNAME= tex-${DISTNAME:S/./-/}-3.0.26894 +TEXLIVE_REV= 26894 MAINTAINER= minskim@NetBSD.org COMMENT= Documentation for tex-tetex diff --git a/print/tex-tetex-doc/distinfo b/print/tex-tetex-doc/distinfo index 16b11f0d492..213ea8ee098 100644 --- a/print/tex-tetex-doc/distinfo +++ b/print/tex-tetex-doc/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.10 2012/03/04 01:01:43 minskim Exp $ +$NetBSD: distinfo,v 1.11 2012/07/22 20:24:42 minskim Exp $ -SHA1 (tex-tetex-25424/tetex.doc.tar.xz) = 61bc15a4e9a319d5bb86847deff01464e93cb5d4 -RMD160 (tex-tetex-25424/tetex.doc.tar.xz) = 401d141d4066cf9d0c50a32d355520dc5c8ff1c0 -Size (tex-tetex-25424/tetex.doc.tar.xz) = 326440 bytes +SHA1 (tex-tetex-26894/tetex.doc.tar.xz) = 5b02a706c4dc1b0238fe3f4cbf2a543fe03156e2 +RMD160 (tex-tetex-26894/tetex.doc.tar.xz) = 480525297e624abcdb13aef55d5a28e653bcdc52 +Size (tex-tetex-26894/tetex.doc.tar.xz) = 332676 bytes diff --git a/print/tex-tetex/Makefile b/print/tex-tetex/Makefile index 0e825d20efe..2bb00553230 100644 --- a/print/tex-tetex/Makefile +++ b/print/tex-tetex/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2012/03/04 01:01:43 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2012/07/22 20:24:42 minskim Exp $ DISTNAME= tetex -PKGNAME= tex-${DISTNAME}-3.0.25424 -TEXLIVE_REV= 25424 +PKGNAME= tex-${DISTNAME}-3.0.26894 +TEXLIVE_REV= 26894 MAINTAINER= minskim@NetBSD.org COMMENT= Supplementary files for updmap @@ -27,10 +27,11 @@ REPLACE_SH= bin/updmap-sys PKG_SYSCONFSUBDIR= texmf MAKE_DIRS+= ${PKG_SYSCONFDIR}/web2c -CONF_FILES+= ${PREFIX}/share/texmf/web2c/updmap.cfg \ +CONF_FILES+= ${PREFIX}/share/texmf-dist/web2c/updmap.cfg \ ${PKG_SYSCONFDIR}/web2c/updmap.cfg -TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf +TEX_TEXMF_DIRS+= ${PKG_SYSCONFDIR} \ + ${PREFIX}/share/texmf ${PREFIX}/share/texmf-dist .include "../../print/texlive/package.mk" diff --git a/print/tex-tetex/PLIST b/print/tex-tetex/PLIST index 9f34ac57a8d..2e33d030307 100644 --- a/print/tex-tetex/PLIST +++ b/print/tex-tetex/PLIST @@ -1,6 +1,7 @@ -@comment $NetBSD: PLIST,v 1.4 2011/11/06 08:43:28 minskim Exp $ +@comment $NetBSD: PLIST,v 1.5 2012/07/22 20:24:42 minskim Exp $ bin/updmap bin/updmap-sys +share/texmf-dist/web2c/updmap.cfg share/texmf/dvips/tetex/config.builtin35 share/texmf/dvips/tetex/config.dfaxhigh share/texmf/dvips/tetex/config.dfaxlo diff --git a/print/tex-tetex/distinfo b/print/tex-tetex/distinfo index e83e272f299..49773f5122d 100644 --- a/print/tex-tetex/distinfo +++ b/print/tex-tetex/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.11 2012/03/04 01:01:43 minskim Exp $ +$NetBSD: distinfo,v 1.12 2012/07/22 20:24:42 minskim Exp $ -SHA1 (tex-tetex-25424/tetex.tar.xz) = 78eacc487d1b98be71abf9a0781ddadeed4dbc2b -RMD160 (tex-tetex-25424/tetex.tar.xz) = 4ec522869f6373f1a15fa84581cf143d5951b8f5 -Size (tex-tetex-25424/tetex.tar.xz) = 23108 bytes -SHA1 (patch-bin_updmap) = 993283ee01bad935a41cd22e78b5ff57d9b32e2e +SHA1 (tex-tetex-26894/tetex.tar.xz) = 23dc779933cbabcebd7603c62d84f31983fad2c4 +RMD160 (tex-tetex-26894/tetex.tar.xz) = 2a9a2364fe7ac1b9e91b5d0eded75f3738d51ccd +Size (tex-tetex-26894/tetex.tar.xz) = 28908 bytes +SHA1 (patch-bin_updmap) = db3717e0dc5046530e2b8cf52ba7cfc194616618 SHA1 (patch-bin_updmap-sys) = adf818f5e13cb20f104d3d590eb4a7d1b4598139 -SHA1 (patch-texmf_web2c_updmap.cfg) = 035ae7d36dd04baa31717e113c4778148c667aab +SHA1 (patch-texmf-dist_web2c_updmap.cfg) = 79e98098006917c455a7b4403e88a9186edcbf56 diff --git a/print/tex-tetex/patches/patch-bin_updmap b/print/tex-tetex/patches/patch-bin_updmap index d1ebfd431d7..849a9e0c565 100644 --- a/print/tex-tetex/patches/patch-bin_updmap +++ b/print/tex-tetex/patches/patch-bin_updmap @@ -1,74 +1,63 @@ -$NetBSD: patch-bin_updmap,v 1.1 2011/11/06 08:43:28 minskim Exp $ +$NetBSD: patch-bin_updmap,v 1.2 2012/07/22 20:24:42 minskim Exp $ ---- bin/updmap.orig 2011-06-17 23:45:54.000000000 +0000 +--- bin/updmap.orig 2012-06-10 22:43:00.000000000 +0000 +++ bin/updmap -@@ -8,7 +8,7 @@ +@@ -23,7 +23,7 @@ my $TEXMFROOT; 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); +- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; ++ $TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`; + if ($?) { + print STDERR "updmap: Cannot find TEXMFROOT, aborting!\n"; + exit 1; +@@ -50,9 +50,9 @@ use TeXLive::TLUtils qw(mkdirhier mktexu + # this function checks by itself whether it is running on windows or not + reset_root_home(); -- @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); +-chomp(my $TEXMFMAIN = `kpsewhich --var-value=TEXMFMAIN`); +-chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); +-chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); ++chomp(my $TEXMFMAIN = `@KPSEWHICH@ --var-value=TEXMFMAIN`); ++chomp(my $TEXMFVAR = `@KPSEWHICH@ -var-value=TEXMFVAR`); ++chomp(my $TEXMFCONFIG = `@KPSEWHICH@ -var-value=TEXMFCONFIG`); -- my @files = `kpsewhich --format=map @maps`; -+ my @files = `@KPSEWHICH@ --format=map @maps`; - chomp @files; + # make sure that on windows *everything* is in lower case for comparison + if (win32()) { +@@ -213,15 +213,15 @@ sub main { + # in the list is the one where changes will be written to. + ($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) { + push @used_files, (win32() ? lc($f) : $f); + } + # +- chomp(my $TEXMFLOCAL =`kpsewhich --var-value=TEXMFLOCAL`); +- chomp(my $TEXMFHOME =`kpsewhich --var-value=TEXMFHOME`); ++ chomp(my $TEXMFLOCAL =`@KPSEWHICH@ --var-value=TEXMFLOCAL`); ++ chomp(my $TEXMFHOME =`@KPSEWHICH@ --var-value=TEXMFHOME`); + if (win32()) { + $TEXMFLOCAL = lc($TEXMFLOCAL); + $TEXMFHOME = lc($TEXMFHOME); +@@ -1140,7 +1140,7 @@ sub mkMaps { + sub locateMap { + my $map = shift; +- my $ret = `kpsewhich --format=map $map`; ++ my $ret = `@KPSEWHICH@ --format=map $map`; + chomp($ret); + return $ret; + } +@@ -1788,7 +1788,7 @@ sub read_map_files { + $alldata->{'maps'}{$m}{'status'} = 'enabled'; + } + @maps = sort_uniq(@maps); +- my @fullpath = `kpsewhich --format=map @maps`; ++ my @fullpath = `@KPSEWHICH@ --format=map @maps`; + chomp @fullpath; 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 /', + my ($ff) = grep /\/$map(\.map)?$/, @fullpath; diff --git a/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg b/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg index f9a216dffb9..9bfce4a82cc 100644 --- a/print/tex-tetex/patches/patch-texmf_web2c_updmap.cfg +++ b/print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg @@ -1,11 +1,11 @@ -$NetBSD: patch-texmf_web2c_updmap.cfg,v 1.2 2012/03/04 01:01:43 minskim Exp $ +$NetBSD: patch-texmf-dist_web2c_updmap.cfg,v 1.1 2012/07/22 20:24:42 minskim Exp $ ---- texmf/web2c/updmap.cfg.orig 2012-02-17 19:22:37.000000000 -0800 -+++ texmf/web2c/updmap.cfg 2012-03-03 13:54:51.000000000 -0800 -@@ -111,219 +111,4 @@ - # Map files should be marked by "#! " (without the quotes), not just #. - # - +--- texmf-dist/web2c/updmap.cfg.orig 2012-06-11 02:40:03.000000000 +0000 ++++ texmf-dist/web2c/updmap.cfg +@@ -26,223 +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. -Map OrnementsADF.map -Map ArrowsADF.map -Map BulletsADF.map @@ -61,6 +61,7 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.2 2012/03/04 01:01:43 minskim Exp $ -MixedMap cmll.map -Map comfortaa.map -Map original-context-symbol.map +-Map CountriesOfEurope.map -MixedMap csother.map -MixedMap cstext.map -Map cyklop.map @@ -150,6 +151,7 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.2 2012/03/04 01:01:43 minskim Exp $ -Map MnSymbol.map -MixedMap mongolian.map -MixedMap musix.map +-Map ntx.map -Map norasi-c90.map -Map cherokee.map -Map ocrb.map @@ -176,6 +178,7 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.2 2012/03/04 01:01:43 minskim Exp $ -MixedMap rsfs.map -Map rsfso.map -Map skt.map +-Map sansmathaccent.map -MixedMap semaf.map -Map SkakNew.map -Map starfont.map @@ -197,6 +200,7 @@ $NetBSD: patch-texmf_web2c_updmap.cfg,v 1.2 2012/03/04 01:01:43 minskim Exp $ -Map txfonts.map -Map gptimes.map -Map umj.map +-KanjiMap uptex-@kanjiEmbed@@kanjiVariant@.map -MixedMap dvng.map -Map yv1.map -Map yv2.map |