doc

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

2 files changed, 19 insertions, 21 deletions

diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 0c4393b78b8..ce642521a10 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -401,7 +401,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'vicentino',	"die 'skipping, nonfree license'",
  'voss-de',	"&MAKEvossde",
  'vrsion',	"die 'skipping, nonfree license'",
- 'wadalab',     "&MAKEwadalab", # still problems (wadalab.map is in CJK)
+ 'wadalab',     "&MAKEwadalab",
  #'wadalab',	"die 'skipping, still needs work'",
  'wasy2',	"&MAKEflatten",
  'wntamil',	"die 'skipping, nonfree license'",
@@ -2743,7 +2743,7 @@ sub MAKEwadalab
   opendir (HERE, ".") || die "opendir(.) failed: $!";
   my @tarfiles = grep /\.tar\.gz$/, readdir HERE;
   closedir (HERE);
-  
+  #  
   my $destfonts = "$DEST/fonts";
   &SYSTEM ("mkdir -p $destfonts");
   foreach my $tarfile (@tarfiles) {
@@ -2752,15 +2752,17 @@ sub MAKEwadalab
     &SYSTEM ("cp -r $tarfile/texmf/* $DEST");
     &SYSTEM ("rm -r $tarfile/texmf && rmdir $tarfile");
   }
-  
+  #
   # except the mincho-1-8-* tarball misses the doc/fonts level.
   &SYSTEM ("$MV $DEST/doc/wadalab/* $DEST/doc/fonts/wadalab/");
-
+  #
   # wadalab has a dir of xdelta from the original fonts
   -d "xdelta" && &SYSTEM ("$MV xdelta $DEST/source/$whichdocformat/$package");
-
+  #
   # rm unused directories.
   &SYSTEM ("rmdir $DEST/*/$whichformat/$package 2>/dev/null");
+  #
+  print "\t OOPS have to create config.wadalab if wl does not add it!\n";
 }
 
 
diff --git a/Master/tlpkg/bin/place b/Master/tlpkg/bin/place
index 50f782428ec..970ec0250c3 100755
--- a/Master/tlpkg/bin/place
+++ b/Master/tlpkg/bin/place
@@ -104,14 +104,12 @@ if (!defined($tlpold)) {
   print "place: $package not present in $M/$InfraLocation/$DatabaseName\n\n";
 } else {
   print "new vs. present $package (present is indented)\n";
-  my @oldfiles;
-  push @oldfiles, $tlpold->all_files;
+  my @oldfiles = $tlpold->all_files;
   `rm -f $TMP/tlplace.old`;
   foreach (sort @oldfiles) {
     `echo $_ >> $TMP/tlplace.old`;
   }
-  my @newfiles;
-  push @newfiles, $tlpnew->all_files;
+  my @newfiles = $tlpnew->all_files;
   `rm -f $TMP/tlplace.new`;
   foreach (sort @newfiles) {
     `echo $_ >> $TMP/tlplace.new`;
@@ -245,19 +243,17 @@ sub add_file
 {
   my ($newfile) = @_;
   
-  my $newdir = dirname ($newfile);
-  
-  # when it's needed, parent must come first, else have svn "not working copy".
-  my $parentdir = dirname ($newdir);
-  unless (-d "$parentdir/.svn") {
-    &my_system ("svn add -N $parentdir");
-    $dirs{$parentdir}++;
-  }
-  
-  unless (-d "$newdir/.svn") {
-    &my_system ("svn add -N $newdir");
+  # when it's needed, (grand)parents must come first, else have svn "not
+  # working copy".  
+  my $newdir = $dir = dirname ($newfile);
+  my $needed_dirs = "";
+  until (-d "$dir/.svn") {
+    $needed_dirs = "$dir $needed_dirs";  # parents first
+    $dirs{$dir}++;
+    $dir = dirname ($dir);
   }
-  
+  &my_system ("svn add -N $needed_dirs") if $needed_dirs;
+
   &my_system ("svn add $newfile");
 
   # remember that we changed this directory.