pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print/tex-tetex/patches Commit the texlive 2014 versio...
details: https://anonhg.NetBSD.org/pkgsrc/rev/fc06f4a83ac5
branches: trunk
changeset: 650682:fc06f4a83ac5
user: markd <markd%pkgsrc.org@localhost>
date: Sat Apr 25 20:26:37 2015 +0000
description:
Commit the texlive 2014 versions of the patches.
diffstat:
print/tex-tetex/patches/patch-bin_fmtutil | 26 +-
print/tex-tetex/patches/patch-bin_fmtutil-sys | 10 +-
print/tex-tetex/patches/patch-bin_texconfig-sys | 10 +-
print/tex-tetex/patches/patch-bin_updmap | 196 ++++++-------
print/tex-tetex/patches/patch-bin_updmap-sys | 10 +-
print/tex-tetex/patches/patch-texmf-dist_web2c_updmap.cfg | 35 ++-
6 files changed, 149 insertions(+), 138 deletions(-)
diffs (truncated from 715 to 300 lines):
diff -r 5231569ced4f -r fc06f4a83ac5 print/tex-tetex/patches/patch-bin_fmtutil
--- a/print/tex-tetex/patches/patch-bin_fmtutil Sat Apr 25 20:20:32 2015 +0000
+++ b/print/tex-tetex/patches/patch-bin_fmtutil Sat Apr 25 20:26:37 2015 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-bin_fmtutil,v 1.1 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: patch-bin_fmtutil,v 1.2 2015/04/25 20:26:37 markd Exp $
---- bin/fmtutil.orig 2012-10-09 17:39:16.000000000 +0000
+--- bin/fmtutil.orig 2014-11-23 18:10:07.000000000 +0000
+++ bin/fmtutil
-@@ -213,7 +213,7 @@ getmatch()
+@@ -215,7 +215,7 @@ getmatch()
initTexmfMain()
{
case $MT_TEXMFMAIN in
@@ -11,8 +11,8 @@
esac
export MT_TEXMFMAIN
}
-@@ -225,14 +225,14 @@ initTexmfMain()
- ###############################################################################
+@@ -227,14 +227,14 @@ initTexmfMain()
+ #
cache_vars()
{
- : ${MT_VARTEXFONTS=`kpsewhich --expand-var='$VARTEXFONTS' | sed 's%^!!%%'`}
@@ -34,7 +34,7 @@
export MT_VARTEXFONTS MT_MKTEXNAM MT_MKTEXNAM_OPT MT_MKTEXDIR
export MT_MKTEXDIR_OPT MT_MKTEXUPD MT_MKTEX_CNF MT_MKTEX_OPT
}
-@@ -574,7 +574,7 @@ main()
+@@ -579,7 +579,7 @@ main()
# set up destdir:
if test -z "$destdir"; then
@@ -43,7 +43,7 @@
destdir=$MT_TEXMFVAR/web2c
fi
test -d "$destdir" || mktexdir "$destdir" >/dev/null 2>&1
-@@ -683,7 +683,7 @@ parse_line()
+@@ -686,7 +686,7 @@ parse_line()
inifile=`echo $lastarg | sed 's%^\*%%'`
# See if we can find $inifile for return code:
@@ -52,8 +52,8 @@
}
###############################################################################
-@@ -696,7 +696,7 @@ find_hyphenfile()
- format="$1"; hyphenation="`echo $2 | sed 's/,/ /g'`"
+@@ -700,7 +700,7 @@ find_hyphenfile()
+ hyphenation="`echo $2 | sed 's/,/ /g'`"
case $hyphenation in
-) ;;
- *) kpsewhich -progname="$format" -format=tex $hyphenation;;
@@ -61,7 +61,7 @@
esac
}
-@@ -727,7 +727,7 @@ run_initex()
+@@ -729,7 +729,7 @@ run_initex()
poolfile=
tcxflag=
test -n "$pool" \
@@ -70,7 +70,7 @@
if test -n "$poolfile" && test -f "$poolfile"; then
verboseMsg "$progname: attempting to create localized format using pool=$pool and tcx=$tcx."
cp "$poolfile" $engine.pool
-@@ -886,7 +886,7 @@ recreate_by_fmt()
+@@ -907,7 +907,7 @@ recreate_by_fmt()
create_missing()
{
# match_cmd='test ! -f $destdir/$fmtfile'
@@ -79,8 +79,8 @@
recreate_loop
}
-@@ -896,7 +896,7 @@ create_missing()
- ###############################################################################
+@@ -916,7 +916,7 @@ create_missing()
+ #
recreate_existing()
{
- match_cmd='test -f "`kpsewhich -engine=$texengine -progname=$format $fmtfile`"'
diff -r 5231569ced4f -r fc06f4a83ac5 print/tex-tetex/patches/patch-bin_fmtutil-sys
--- a/print/tex-tetex/patches/patch-bin_fmtutil-sys Sat Apr 25 20:20:32 2015 +0000
+++ b/print/tex-tetex/patches/patch-bin_fmtutil-sys Sat Apr 25 20:26:37 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_fmtutil-sys,v 1.1 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: patch-bin_fmtutil-sys,v 1.2 2015/04/25 20:26:37 markd Exp $
---- bin/fmtutil-sys.orig 2012-10-09 17:39:16.000000000 +0000
+--- bin/fmtutil-sys.orig 2014-11-23 18:10:07.000000000 +0000
+++ bin/fmtutil-sys
-@@ -19,11 +19,11 @@ unset RUNNING_BSH
- test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
- export PATH
+@@ -21,11 +21,11 @@ mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+ mydir=`cd "$mydir" && pwd`
+ PATH="$mydir:$PATH"; export PATH
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
diff -r 5231569ced4f -r fc06f4a83ac5 print/tex-tetex/patches/patch-bin_texconfig-sys
--- a/print/tex-tetex/patches/patch-bin_texconfig-sys Sat Apr 25 20:20:32 2015 +0000
+++ b/print/tex-tetex/patches/patch-bin_texconfig-sys Sat Apr 25 20:26:37 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_texconfig-sys,v 1.1 2012/10/13 22:38:20 minskim Exp $
+$NetBSD: patch-bin_texconfig-sys,v 1.2 2015/04/25 20:26:37 markd Exp $
---- bin/texconfig-sys.orig 2012-10-09 17:39:16.000000000 +0000
+--- bin/texconfig-sys.orig 2014-07-13 00:07:52.000000000 +0000
+++ bin/texconfig-sys
-@@ -21,8 +21,8 @@ export PATH
- # hack around a bug in zsh:
- test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+@@ -23,8 +23,8 @@ mydir=`echo "$0" | sed 's,/[^/]*$,,'`
+ mydir=`cd "$mydir" && pwd`
+ PATH="$mydir:$PATH"; export PATH
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
diff -r 5231569ced4f -r fc06f4a83ac5 print/tex-tetex/patches/patch-bin_updmap
--- a/print/tex-tetex/patches/patch-bin_updmap Sat Apr 25 20:20:32 2015 +0000
+++ b/print/tex-tetex/patches/patch-bin_updmap Sat Apr 25 20:26:37 2015 +0000
@@ -1,29 +1,27 @@
-$NetBSD: patch-bin_updmap,v 1.4 2013/11/17 17:15:43 minskim Exp $
+$NetBSD: patch-bin_updmap,v 1.5 2015/04/25 20:26:37 markd Exp $
---- bin/updmap.orig 2013-10-07 22:58:25.000000000 +0000
+--- bin/updmap.orig 2015-01-16 00:02:11.000000000 +0000
+++ bin/updmap
-@@ -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;
+@@ -19,7 +19,7 @@ my $svnid = '$Id: updmap.pl 36067 2015-0
+ my $TEXMFROOT;
BEGIN {
- $^W=1;
+ $^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFROOT = `@KPSEWHICH@ -var-value=TEXMFROOT`;
if ($?) {
- print STDERR "updmap: Cannot find TEXMFROOT, aborting!\n";
-@@ -38,5 +38,5 @@ my $version = '$Id: updmap.pl 31853 2013
+ warn "updmap.pl: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ exit 1;
+@@ -38,7 +38,7 @@ my $version = "svn$svnrev ($lastchdate)"
+
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
+ #use Data::Dumper;
+@@ -50,12 +50,12 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
+ # see more comments at the definition of this function.
reset_root_home();
-chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
@@ -40,7 +38,9 @@
+chomp(my $TEXMFHOME = `@KPSEWHICH@ -var-value=TEXMFHOME`);
# make sure that on windows *everything* is in lower case for comparison
-@@ -80,6 +80,6 @@ my @cmdline_options = (
+ if (win32()) {
+@@ -78,8 +78,8 @@ my $updLSR;
+ my @cmdline_options = (
"sys",
"listfiles",
- "cnffile=s@",
@@ -49,21 +49,27 @@
+ "copy",
"disable=s@",
"dvipdfmoutputdir=s",
-@@ -191,5 +191,5 @@ sub main {
+ "dvipdfmxoutputdir=s",
+@@ -208,7 +208,7 @@ sub main {
+ save_updmap($opts{'_readsave'});
exit 0;
}
-
+
if ($opts{'showoptions'}) {
for my $o (@{$opts{'showoptions'}}) {
-@@ -231,5 +231,5 @@ sub main {
+ if (defined($settings{$o})) {
+@@ -248,7 +248,7 @@ 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;
-@@ -241,8 +241,8 @@ sub main {
+ for my $f (@all_files) {
+@@ -258,10 +258,10 @@ sub main {
+ my $TEXMFLOCALVAR;
my @TEXMFLOCAL;
if (win32()) {
- chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`);
@@ -74,35 +80,36 @@
+ chomp($TEXMFLOCALVAR =`@KPSEWHICH@ --expand-path='\$TEXMFLOCAL'`);
@TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR;
}
-@@ -280,5 +280,5 @@ sub main {
+ #
+@@ -293,7 +293,7 @@ sub main {
+ # TEXMFSYSVAR $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
# TEXMFLOCAL $TEXLIVE/texmf-local/web2c/updmap.cfg
# TEXMFDIST $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
- #
+ #
# updmap-sys (root):
# ==================
-@@ -415,5 +415,5 @@ sub main {
+ # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
+@@ -428,7 +428,7 @@ 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 {
+ if (!$opts{'nomkmap'}) {
+@@ -922,7 +922,7 @@ sub cidx2dvips_old {
+ if ($_ =~ /.*[@\:\/,]/) {next;}
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 {
+ s/^([^ ][^ ]* ([^ ][^ ]*) !*([^ ][^ ]*).*)/$1 $3-$2/;
+@@ -970,11 +970,11 @@ sub mkMaps {
+ }
my ($mode, $mode_origin) = get_cfg('LW35');
- my ($dvipsPreferOutline, $dvipsPreferOutline_origin) =
@@ -115,21 +122,24 @@
+ my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) =
get_cfg('pdftexDownloadBase14');
my ($pxdviUse, $pxdviUse_origin) = get_cfg('pxdviUse');
-@@ -1120,5 +1120,5 @@ sub mkMaps {
+ my ($kanjiEmbed, $kanjiEmbed_origin) = get_cfg('kanjiEmbed');
+@@ -1129,23 +1129,23 @@ sub mkMaps {
+ push @ps2pk_map, transLW35($mode, @ps2pk_fonts);
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 {
+ print "Generating output for dvips...\n" if !$opts{'quiet'};
+ my @download35_map;
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 {
+ my @builtin35_map;
push @builtin35_map, "% dvips35.map";
push @builtin35_map, transLW35($mode, @dvips35_fonts);
- &writeLines(">$dvipsoutputdir/builtin35.map",
@@ -140,77 +150,88 @@
+ my @dftdvips_fonts =
(($dvipsDownloadBase35 eq "true") ? @ps2pk_fonts : @dvips35_fonts);
-@@ -1152,5 +1152,5 @@ sub mkMaps {
+ my @psfonts_t1_map;
+@@ -1161,14 +1161,14 @@ sub mkMaps {
+ push @psfonts_t1_map, @mixedmaps_fonts;
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 {
Home |
Main Index |
Thread Index |
Old Index