iwona update

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

1 files changed, 51 insertions, 47 deletions

diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index 01f676c0e6f..dbbd0d49163 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -165,9 +165,11 @@ chdir $startdir || die "chdir($startdir) failed: $!";
  'ibycus-babel',"&MAKEibycusbabel",
  'ibygrk',	"&MAKEflatten",
  'invoice',	"&MAKEflatten",
+ 'iwona',	"&MAKEcopy",
  'jasthesis',	"print \"not installing jasthesis, license is unknown\n\"",
  'kerkis',	"&MAKEflatten",
  'koma-script',	"&MAKEkoma",
+ 'kurier',	"&MAKEcopy",
  'kuvio',	"print \"not installing kuvio, it is nonfree\n\"",
  'latex',	"&MAKEcopy",  # we use latex-tds/base.zip
  'latex-tds',	"&MAKEcopy",  # we use latex-tds/source.zip
@@ -1093,57 +1095,59 @@ sub xchdir
 # some packages (e.g., vntex) are tl-ready (or near enough).
 # 
 sub MAKEcopy {
- my $dest = $_[0] || $DEST;
+  my $dest = $_[0] || $DEST;
 
- print "\t COPY from $packagedir to $dest\n";
+  chomp (my $abspackagedir = `cd $packagedir && pwd`);
+  print "\t COPY from $abspackagedir to $dest\n";
 
- &xchdir ($packagedir);
- &SYSTEM ("mkdir -p $dest");
- 
- # do the copy.
- &SYSTEM ("$CP -r * $dest");
- 
- # for arev et al., remove symlinks.
- &SYSTEM ("find $dest -type l | xargs --no-run-if-empty rm");
- 
- # remove top-level README (shouldn't overwrite texmf-dist/README),
- # needed for vntex, pgf, others.
- -f "$dest/README" && &SYSTEM ("rm -f $dest/README");
- 
- # ditto CHANGELOG for stellenbosch.
- -f "$dest/CHANGELOG" 
- && &SYSTEM ("mv $dest/CHANGELOG $dest/doc/$whichdocformat/$package/");
- 
- # ditto assorted other for lm (files are in doc subtree already).  
- -f "$dest/MANIFEST.txt"
- && &SYSTEM ("cd $dest && rm -f GUST*.txt MANIFEST.txt README.eng");
-
- # for tex-gyre, rename context subdir.
- if (-d "$dest/fonts/map/pdftex/context") {
-   print "$package: rename context map dir.\n";
-   &SYSTEM ("mv $dest/fonts/map/pdftex/context $dest/fonts/map/pdftex/tex-gyre");
- }
+  &xchdir ($packagedir);
+  &SYSTEM ("mkdir -p $dest");
 
- # for eplain, move info file (with warning).
- if (-r "$dest/doc/$package/doc/eplain.info") {
-   warn "WARNING: moving eplain.info to /tmp\n";
-   warn " -- YOU must put it in texmf/doc/info!\n";
-   &SYSTEM ("mv $dest/doc/$package/doc/eplain.info /tmp");
- }
+  # do the copy.
+  &SYSTEM ("$CP -r * $dest");
 
- # for velthuis, remove bin dir (with warning).
- if (-d "$dest/bin") {
-   warn "WARNING: removing bin/ dir in $dest\n";
-   warn " -- YOU must deal with it!\n";
-   &SYSTEM ("rm -rf $dest/bin");
- }
+  # remove top-level README (shouldn't overwrite texmf-dist/README!),
+  # needed for vntex, pgf, others.  Do this before removing symlinks,
+  # in case the README is a symlink (e.g., iwona).
+  -r "$dest/README" && &SYSTEM ("rm -f $dest/README $dest/00*");
 
- # preserve the lm sources.
- if ($package eq "lm") {
-   my $srcdir = " $dest/source/$whichdocformat/$package/";
-   &SYSTEM ("mkdir -p $srcdir");
-   &SYSTEM ("mv $dest/lm*mt1.zip $srcdir/");
- }
+  # for arev et al., remove symlinks.
+  &SYSTEM ("find $dest -type l | xargs --no-run-if-empty rm");
+
+  # ditto CHANGELOG for stellenbosch.
+  -r "$dest/CHANGELOG" 
+  && &SYSTEM ("mv $dest/CHANGELOG $dest/doc/$whichdocformat/$package/");
+
+  # ditto assorted other for lm (files are in doc subtree already).  
+  -r "$dest/MANIFEST.txt"
+  && &SYSTEM ("cd $dest && rm -f GUST*.txt MANIFEST.txt README.eng");
+
+  # for tex-gyre, rename context subdir.  (shouldn't be needed next time.)
+  if (-d "$dest/fonts/map/pdftex/context") {
+    print "$package: rename context map dir.\n";
+    &SYSTEM ("mv $dest/fonts/map/pdftex/context $dest/fonts/map/pdftex/tex-gyre");
+  }
+
+  # for eplain, move info file (with warning).
+  if (-r "$dest/doc/$package/doc/eplain.info") {
+    warn "WARNING: moving eplain.info to /tmp\n";
+    warn " -- YOU must put it in texmf/doc/info!\n";
+    &SYSTEM ("mv $dest/doc/$package/doc/eplain.info /tmp");
+  }
+
+  # for velthuis, remove bin dir (with warning).
+  if (-d "$dest/bin") {
+    warn "WARNING: removing bin/ dir in $dest\n";
+    warn " -- YOU must deal with it!\n";
+    &SYSTEM ("rm -rf $dest/bin");
+  }
+
+  # preserve the lm sources.
+  if ($package eq "lm") {
+    my $srcdir = " $dest/source/$whichdocformat/$package/";
+    &SYSTEM ("mkdir -p $srcdir");
+    &SYSTEM ("mv $dest/lm*mt1.zip $srcdir/");
+  }
 }
 
 
@@ -1160,7 +1164,7 @@ sub setup {
   &SYSTEM("mkdir -p $DEST/source/$whichdocformat/$package");
   
   # junk we don't ever want.
-  unlink ("$packagedir/00Contents");
+  &SYSTEM ("rm -f $packagedir/00*");
 
   return if $ctl eq "nocopytodoc";
   # copy everything to the doc directory