wsuipa license update (1dec08)

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

2 files changed, 43 insertions, 24 deletions

diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index e8aed161447..92ee3626f89 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -229,6 +229,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'ifacmtg',	"die 'skipping, nonfree license'",
  'indxcite',	"die 'skipping, too old, license suboptimal'",
  'invoice',	"&MAKEflatten",
+ 'ipa',		"die 'skipping, part of wsuipa'",
  'iwona',	"&MAKEcopy",
  'japanese',	"die 'skipping, requires ptex'",
  'jasthesis',	"die 'skipping, license is unknown'",
@@ -455,7 +456,6 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'wasy2',	"&MAKEflatten",
  'wntamil',	"die 'skipping, nonfree license'",
  'wordcount',	"&MAKEwordcount",
- 'wsuipa',	"&MAKEflatten",
  'xbase',       "die 'renamed to xpackages'",
  'xecjk',	"&MAKEcopy",
  'xecyr',	"&MAKEcopy",
@@ -477,9 +477,10 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
 );
 
 
-%flatten_prehook = (
- 'cm-super'		=> '&FLATTEN_PREHOOK_cm_super',
- 'ibygrk'		=> '&FLATTEN_PREHOOK_ibygrk',
+%prehook = (
+ 'cm-super'		=> '&PREHOOK_cm_super',
+ 'ibygrk'		=> '&PREHOOK_ibygrk',
+ 'wsuipa'		=> '&PREHOOK_wsuipa',
 );
 
 %specialpostaction = (
@@ -503,7 +504,6 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'xecjk'		=> '&POSTxecjk',
  'xecyr'		=> '&POSTxecyr',
  'xetex-pstricks'	=> '&POSTxetex_pstricks',
-# 'xlop'                 => '&POSTxlop',
  'xstring'              => '&POSTxstring',
 );
 
@@ -1471,7 +1471,6 @@ sub set_dir_defaults
   } elsif ($ctan_dir =~ m!/(info|help)/!) {
     $standarddest = "texmf-doc";
     $guess = "$standarddest for dest";
-
   }
 
   print "\t guessed $guess (based on $ctan_dir)\n" if $guess;
@@ -1495,6 +1494,19 @@ sub xmkdir
 
 
 
+# some packages need to intervene at the beginning.
+sub run_prehook
+{
+  my $prehook = $prehook{$package};
+  if ($prehook) {
+    print "\t PREHOOK: running $prehook\n";
+    eval $prehook;
+    die "$package failed in $prehook: $@" if $@;
+  }
+}
+
+
+
 # some packages (e.g., vntex) are tl-ready (or near enough).
 # 
 sub MAKEcopy
@@ -1608,6 +1620,8 @@ sub donormal
 
      &setup unless $ctrl eq "nosetup";
      &xchdir ("$DEST/doc/$whichdocformat/$package");
+     &run_prehook ($package);
+
      &buildfilelist;
 
      # run the .ins files (if any) supplied
@@ -2008,12 +2022,7 @@ sub MAKEflatten
   print "\t SPECIAL flatten $package\n";
 
   # cm-super et al. need to intervene at this point.
-  my $prehook = $flatten_prehook{$package};
-  if ($prehook) {
-    print "\t FLATTEN_PREHOOK: $prehook\n";
-    eval $prehook;
-    die "$package failed in $prehook: $@" if $@;
-  }
+  &run_prehook ($package);
 
   # mv foo/README to README.foo.  README.txt is for psfragx.
   # Obviously should be generalized.
@@ -3314,13 +3323,32 @@ sub MAKEpictex
 
 
 
-sub FLATTEN_PREHOOK_cm_super
+sub PREHOOK_cm_super
 {
-  print "FLATTEN_PREHOOK_$package - remove dvipdfm map files\n";
+  print "PREHOOK_$package - remove dvipdfm map files\n";
   # We generate our own dvipdfm (not to mention pdftex) map files.
   &SYSTEM ("$RM -rf dvipdfm");
 }
 
+sub PREHOOK_ibygrk
+{
+  print "PREHOOK_$package - handle ibycus4.map\n";
+  # ibygrk has two instances of the same file ibycus4.map; it is
+  # both tex source and mf source.  the usual method cannot deal, of course.
+  &SYSTEM ("$MV fonts/source/public/ibycus4/ibycus4.map .");
+  &SYSTEM ("$RM tex/generic/ibycus4/ibycus4.map");
+}
+
+sub PREHOOK_wsuipa
+{
+  print "PREHOOK_$package - rearrange directories, except for doc\n";
+  # we can't use flatten because we want to preserve the subdirs inside doc.
+  # annoyingly, the same filenames are repeated.
+  &SYSTEM ("$MV changes/* doc/* macros/* mf/* pk/* tfm/* .");
+}
+
+
+
 sub POSTcontext_lilypond {
   print "POST$package - creating package-level sunbdirectories\n";
   mkdir ("$DEST/doc/context/third/lilypond");
@@ -3361,15 +3389,6 @@ sub POSTglossaries
   &SYSTEM ("$CP $DEST/scripts/glossaries/makeglossaries.bat $wdir/");
 }
 
-sub FLATTEN_PREHOOK_ibygrk
-{
-  print "FLATTEN_PREHOOK_$package - handle ibycus4.map\n";
-  # ibygrk has two instances of the same file ibycus4.map; it is
-  # both tex source and mf source.  the usual method cannot deal, of course.
-  &SYSTEM ("$MV fonts/source/public/ibycus4/ibycus4.map .");
-  &SYSTEM ("$RM tex/generic/ibycus4/ibycus4.map");
-}
-
 sub POSTibygrk
 {
   print "POST$package - second copy of ibycus4.map\n";
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 7040182660e..26eab4b1010 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -231,7 +231,7 @@ my @WorkingTLP = qw(
         vancouver variations varindex varisize varsfromjobname vaucanson-g
           vector velthuis venn verbatimbox verbatimcopy verse versions vertex
           vhistory visualfaq vmargin vntex volumes vpe vwcol vxu
-        wadalab wallpaper warning warpcol williams wordlike wrapfig
+        wadalab wallpaper warning warpcol williams wordlike wrapfig wsuipa
         xargs xcolor xdoc xecyr xelibertine xepersian
           xetex-def xetex-pstricks xetexfontinfo
           xetexref xfor xgreek xifthen