From 3b60c7b05b84cf460b6dd9f9f1b34e3363b59f6f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 24 Dec 2009 18:00:33 +0000 Subject: oberdiek update (22dec09) git-svn-id: svn://tug.org/texlive/trunk@16496 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-update-auto | 5 ++++- Master/tlpkg/bin/tlpkginfo | 25 +++++++++++++++++-------- 2 files changed, 21 insertions(+), 9 deletions(-) (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto index b1ecece1ece..ead38785c2b 100755 --- a/Master/tlpkg/bin/tl-update-auto +++ b/Master/tlpkg/bin/tl-update-auto @@ -119,10 +119,13 @@ done fi # config.guess/sub/etc. from elsewhere on tug.org, mirrored from GNU. +# ylwrap comes from automake; ltmain.sh comes from libtool. For those +# two, have to manually remember to update when new versions are installed. # config_masterdir=/home/ftp/dist/build-aux # -for gnuconf in config.guess config.sub depcomp install-sh missing ; do +for gnuconf in config.guess config.sub depcomp install-sh missing \ + texinfo.tex; do master_conffile=$config_masterdir/$gnuconf local_conffile=../Build/source/build-aux/$gnuconf # diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo index 08261e3164c..f28b33e02d0 100755 --- a/Master/tlpkg/bin/tlpkginfo +++ b/Master/tlpkg/bin/tlpkginfo @@ -19,6 +19,9 @@ sub main # erroneous tds files (warn Robin about them) or problematic (purifyeps). # list format: pkg1|pkg2|etc $erroneous_tds = "fmtcount|purifyeps|thailatex|tufte-latex|xetexref|xtab"; + + # Heiko's tds files (don't propagate through CTAN fast enough). + $oberdiek_tds = "hyperref|oberdiek"; # special packages from latex-tds project (used by prepare()) $corelatex_tds_pkgs = "babel|cyrillic|graphics|latex|psnfss|tools"; @@ -163,7 +166,7 @@ sub find_ctan_dir # prepend ctan root if not an absolute dir (this happens when we make # a temp dir). $ctan_dir = "$CTAN/$ctan_dir" if $ctan_dir =~ m,^[^/],; - return $ctan_dir + return $ctan_dir; } @@ -205,7 +208,9 @@ sub catalogue_find_ctan_path # get the raw tag from the catalogue file. open CATFILE, '<', $catfile or die "Cannot read $catfile: $!\nFix me!\n"; - while ($ctan_path = ) { last if $ctan_path =~ /) { + last if $ctan_path =~ /#) and ()); close CATFILE; @@ -223,8 +228,7 @@ sub catalogue_find_ctan_path # in which case we copy that file into a temp dir and return that temp # dir; (2) it is actually in its own directory, e.g., ifxetex, in # which case we return undef here and let the code above find it. - # (The Catalogue maintainers do not consider this a problem for - # various reasons.) + # (The Catalogue maintainers do not consider this a problem.) # if ($ctan_path =~ /file='true'/) { if ($ctan_path =~ m,/$pkgname/,) { # pkg dir somewhere in path? @@ -258,8 +262,13 @@ sub prepare my $tds_path = "$ctan_loc.tds.zip"; $tds_path =~ s,^$CTAN,$CTAN/install,; - # ...except for files in latex-tds... - if ($pkg =~ /^($latex_tds_pkgs)$/) { + # ...except for heiko, when running on tug.org... + if ($pkg =~ /^($oberdiek_tds)$/) { + $tds_path = "/home/ftp/tex/$pkg/$pkg.tds.zip"; + # will be ignored below if it doesn't exist. + + # ...and except for files in latex-tds... + } elsif ($pkg =~ /^($latex_tds_pkgs)$/) { if ($pkg =~ /^($amslatex_tds_pkgs)$/) { $tds_path = "$latex_tds_dir/amslatex.tds.zip" ; } else { @@ -313,8 +322,8 @@ sub copy_to_tmpdir # special cases if ($pkgname eq "cc-pl") { - # there's no real ctan dir for this package, just a zip - system ("cd $pkgdir && unzip -q cc-pl.zip && rm cc-pl.zip"); + # there's no real ctan dir for this package, just a zip + system ("cd $pkgdir && unzip -q cc-pl.zip && rm cc-pl.zip"); } return $pkgdir; -- cgit v1.2.3