exclude mptopdf files from context update; do not warn about negative patterns not matching when updating from CTAN

git-svn-id: svn://tug.org/texlive/trunk@29640 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 68 insertions, 22 deletions

diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index 9b7ee63d9a9..a2faf894386 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -1,6 +1,6 @@
 # $Id$
 # TeXLive::TLPSRC.pm - module for handling tlpsrc files
-# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
+# Copyright 2007-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
@@ -420,7 +420,8 @@ sub make_tlpobj {
       if (!@archfiles) {
         if (($arch ne "win32") || defined($::tlpsrc_pattern_warn_win)) {
           tlwarn("$self->{name} ($arch): no hit on negative binpattern $finalp\n")
-            unless defined($::tlpsrc_pattern_no_warn_negative);
+            unless $::tlpsrc_pattern_no_warn_negative;
+            # see comments in libexec/place script.
         }
       }
       $tlp->remove_binfiles($arch,@archfiles);
@@ -443,7 +444,8 @@ sub _do_normal_pattern {
   my @matchfiles = $tltree->get_matching_files($type, $p, $self->{'name'});
   if (!$is_default_pattern && !@matchfiles
       && ($p !~ m,^f ignore,) && ($p !~ m,^d tlpkg/backups,)) {
-    tlwarn("$self->{name}: no hit for pattern $p\n");
+    tlwarn("$self->{name}: no hit for pattern $p\n")
+      unless $negative && $::tlpsrc_pattern_no_warn_negative;
   }
   if (defined($negative) && $negative == 1) {
     $tlp->remove_files($type,@matchfiles);
diff --git a/Master/tlpkg/bin/tl-compare-tlpdbs b/Master/tlpkg/bin/tl-compare-tlpdbs
index 10a50b321bf..1a8c1a5afe1 100755
--- a/Master/tlpkg/bin/tl-compare-tlpdbs
+++ b/Master/tlpkg/bin/tl-compare-tlpdbs
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# Copyright 2008, 2009, 2010, 2011 Norbert Preining
+# Copyright 2008-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 #
@@ -29,9 +29,9 @@ my $opt_help = 0;
 
 TeXLive::TLUtils::process_logging_options();
 GetOptions(
+  "all"   	=> sub { @add_ignored_packs = () },
   "version"	=> \$opt_version,
   "help|?"      => \$opt_help,
-  "all"   => sub { @add_ignored_packs = () },
 ) or pod2usage(1);
 
 pod2usage("-exitstatus" => 0, "-verbose" => 2) if $opt_help;
@@ -40,8 +40,7 @@ if ($opt_version) { print "$vc_id\n"; exit 0; }
 exit (&main());
 
 
-sub main
-{
+sub main {
   chomp(my $Master = `cd $mydir/../.. && pwd`);
 
   # get additional list of disabled packages
diff --git a/Master/tlpkg/bin/tl-update-asy b/Master/tlpkg/bin/tl-update-asy
index 02d9aac9eac..2fec72bb462 100755
--- a/Master/tlpkg/bin/tl-update-asy
+++ b/Master/tlpkg/bin/tl-update-asy
@@ -43,8 +43,7 @@ if false && $update_sources_from_ctan; then
 elif test "x$1" = x--build; then
   # this part is about building the i386-linux asymptote on tug.org.
   # Despite all the dire warnings above, this part actually can be run
-  # as a script, because it's so often necessary to run and rerun (and
-  # rerun) the build.
+  # as a script, because it's so often necessary to redo.
   set -e
   PATH=/usr/bin:/bin:/sbin; export PATH  # system gcc for sake of shared libs
   unset GREP_OPTIONS
@@ -55,6 +54,7 @@ elif test "x$1" = x--build; then
   mv .svn dot.svn
   if test -f Makefile; then
     make clean
+    svn revert doc/asy-latex.pdf
     rm -f Makefile config.h config.log config.status errors.temp
     rm -rf autom4te.cache
   fi
@@ -79,20 +79,20 @@ elif false && $update_runtime_from_ainst; then
   $cp binaries/i386-win32/texlive/asy.exe $pg/asymptote/
 
   cd /tmp/ainst
-  $cp share/info/{*/,}*.info $xmf/doc/info
-  $cp share/man/man1/asy.1 $xmf/doc/man/man1/asy.1
-  $cp share/man/man1/xasy.1x $xmf/doc/man/man1/xasy.1
-  $cp -r share/doc/asymptote $xmf/doc
+  $cp share/info/{*/,}*.info $xist/doc/info
+  $cp share/man/man1/asy.1 $xist/doc/man/man1/asy.1
+  $cp share/man/man1/xasy.1x $xist/doc/man/man1/xasy.1
+  $cp -r share/doc/asymptote $xist/doc
   #
-  $cp -r share/asymptote $xmf
+  $cp -r share/asymptote $xist
   #
-  $cp latex/asymptote/* $xmf/tex/latex/asymptote/
-  $cp context*/asymptote/* $xmf/tex/context/asymptote/
+  $cp latex/asymptote/* $xist/tex/latex/asymptote/
+  $cp context*/asymptote/* $xist/tex/context/asymptote/
   #
   $cp bin/asy $lb/
   strip $lb/asy
 
-  cd $xmf/doc/man
+  cd $xist/doc/man
   make
   
   ci="$xu/README \
@@ -100,9 +100,9 @@ elif false && $update_runtime_from_ainst; then
     $cb \
     $lb/asy \
     $pg/asymptote/ \
-    $xmf/asymptote/ \
-    $xmf/doc \
-    $xmf/tex/*/asymptote"
+    $xist/asymptote/ \
+    $xist/doc \
+    $xist/tex/*/asymptote"
 
   svn status $ci | sed -n 's/^\?//p' | fgrep -v binaries
   svn add `!!`
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 755b2af844f..8ecc58648ae 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -292,7 +292,7 @@ sub prepare {
 
   # ...and except for context, and others...
   } elsif ($pkg eq "context") {
-    $tds_path = "/tmp/cont-tmf.zip";
+    $tds_path = "/home/ftp/mirror/www.pragma-ade.com/context/beta/cont-tmf.zip";
 
   } elsif ($pkg eq "hfoldsty") {
     $tds_path = glob ("$CTAN/fonts/hfoldsty/hfoldsty-v*.zip");
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index da5f9dad994..9d998e1b9bf 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -4920,6 +4920,10 @@ sub POSTcontext {
   &SYSTEM ("$RM -rf web2c/");                # context*cnf*, texlive2011cnf.lua
   &SYSTEM ("find -name koeiel\* -o -name jmn | xargs rm -rf");
   
+  # remove mptopdf files, since they are in a separate package.
+  chomp (my @mptopdf_files = `tlpfiles mptopdf | sed 's,[^/]*/,,'`);
+  &SYSTEM ("$RM -f @mptopdf_files");
+  
   print "still POST$package - user-level executables\n";
   # similar to biber, executables go in both the Master bin dir and the
   # Build linked_scripts dir.  The executables are cherry-picked from
diff --git a/Master/tlpkg/libexec/mptopdf-extract b/Master/tlpkg/libexec/mptopdf-extract
new file mode 100755
index 00000000000..f959721a68f
--- /dev/null
+++ b/Master/tlpkg/libexec/mptopdf-extract
@@ -0,0 +1,28 @@
+#!/bin/sh
+# $Id$
+# Get the mptopdf files out of the context zip.  We distribute mptopdf
+# as a separate package, since it can be used with LaTeX.  See
+# description in mptopdf.tlpsrc for details.
+
+# Get files of our mptopdf package, ignoring top-level directory.
+# And ignoring the man page until it is present in ConTeXt.
+files=`tlpfiles mptopdf | sed 's,[^/]*/,,' | grep -v doc/man`
+if test -z "$files"; then
+  echo "$0: failed to get files for mptopdf." >&2
+  exit 1
+fi
+
+# We will extract them from the current context release.
+ctan=/home/ftp/mirror/rsync.tex.ac.uk/CTAN
+context_zip=$ctan/macros/context/current/cont-tmf.zip
+if test ! -s $context_zip; then
+  echo "$0: no context zip:" >&2
+  ls -l $context_zip >&2
+  exit 1
+fi
+
+# Working directory.
+workdir=/home/ftp/tex/mptopdf
+cd $workdir || exit 1
+rm -rf *
+unzip $context_zip $files
diff --git a/Master/tlpkg/libexec/place b/Master/tlpkg/libexec/place
index 4cc5a0a1028..d6bd479fd36 100755
--- a/Master/tlpkg/libexec/place
+++ b/Master/tlpkg/libexec/place
@@ -32,9 +32,22 @@ print "place: chicken mode = $chicken\n";
 
 die "usage: $0 PKGNAME\n" unless @ARGV == 1;
 $package = $ARGV[0];
-
 # $::opt_verbosity = 3;  # debug tlpdb reading
 
+# Negative patterns are used to avoid conflicts when the name of a given
+# package happens to match the name of a subdirectory in another package.
+# For example, cell.tlpsrc contains:
+#   docpattern +!d texmf-dist/doc/latex/cals/test/cell
+# to avoid including that test/cell subdirectory in the cals package
+# when building tlpdb.  Ordinarily, if the pattern being excluded
+# doesn't match anything, there is a warning (e.g., cals might get rid
+# of that subdir someday, and then we'd want to delete the pattern from cell.)
+# 
+# But when we update cell from CTAN, of course cals is not present,
+# therefore the negative pattern has nothing to match, therefore warning
+# about it is noise, therefore omit the warning.
+$::tlpsrc_pattern_no_warn_negative = 1;
+
 %dirs = ();  # dirs we make changes in
 $TMP = $ENV{"TMPDIR"} || "/tmp";
 $tmpfile = "$TMP/$>.tlplace"; # use effective uid in temp file names