mfpic 0.9 update

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

2 files changed, 29 insertions, 22 deletions

diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index 35f8e41143f..32033d98686 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -307,7 +307,8 @@ chdir $startdir || die "chdir($startdir) failed: $!";
 $standardsource='\.fdd|\.dtx|\.ins|\.c$|Makefile|\.drv';
 
 %specialfoundry = (
- 'fc',	'jknappen',
+ 'fc',		'jknappen',
+ 'mfpic',	'metafont',
 );
 $standardfoundry='public';
 
@@ -365,6 +366,7 @@ $standardfoundry='public';
  'latexmp',	'metapost',
  'leawood',	'fonts',
  'lfb',		'fonts',
+ 'mfpic',	'generic',
  'multido',	'generic',
  'ofs',		'generic',
  'pictex',	'generic',
@@ -397,6 +399,7 @@ $standardsourcefmt='latex';
  'ifxetex',	'generic',
  'jadetex',	'jadetex',
  'metatex',	'plain',
+ 'mfpic',	'generic',
  'ocherokee',	'lambda',
  'ofs',		'generic',
  'passivetex',	'xmltex',
@@ -457,6 +460,7 @@ $standardfmt='latex';
  'lfb',		'fonts',
  'lshort-portuguese', 'portuguese',
  'metatex',	'plain',
+ 'mfpic',	'generic',
  'mpattern',	'metapost',
  'ofs',		'generic',
  'pacioli',	'fonts',
@@ -563,7 +567,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$';
  'manjutex',	'\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|manju.tex',
  'metatex',	'metatex.tex',
  'mff',		'\.sty|mf[^f].*\.tex',
- 'mfpic',	'mfpic.tex',
+ 'mfpic',	'mfpic.tex|mfpic.sty|mfppatch.tex',
  'mh',		'\.sty|\.cls|\.fix',
  'minitoc',	"\.ml[do]|$standardtex",
  'misc',	'\.sty|\.ltx|\.cls',
@@ -695,7 +699,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$';
  'metatex',	'NULL',
  'mff',		'mffdoc.tex',
  'mfnfss',	'NULL',
- 'mfpic',	'mfpicdoc.tex',
+ 'mfpic',	'NULL',
  'midnight',	'\.doc',
  'minutes',	'Sample.tex',
  'natbib',	'natbib.dtx|natnotes.tex',
@@ -779,7 +783,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$';
 $standarddvi='NULL';  # let's try relying on authors uploading pdf's.
 
 
-# packages which need special Metapost files
+# packages which need special MetaPost files
 %specialmp= (
  'feynmp',	'feynmp.mp',
  'latexmp',	'latexmp.mp',
@@ -1010,14 +1014,19 @@ sub donormal {
    if ($inspatt eq "") { 
         $inspatt=$standardins; 
         }
-   $Foundry = $specialfoundry{$package };
-   if ($Foundry eq "") { 
-        $Foundry=$standardfoundry; 
-        }
+
+   my $Foundry = $specialfoundry{$package} || $standardfoundry;
+
    &runins($inspatt);
 # rebuild the list of files in the directory
    &buildfilelist;
-   &domf;
+   
+   if ($Foundry eq "metafont") {
+     &dosimplemf;
+   } else {
+     &domf;
+   }
+   
    &dodvi;
 # rebuild again, as we have .dvi files now
    &buildfilelist;
@@ -1099,10 +1108,9 @@ sub dobst {
 }
 
 sub dosimplemf {
-# there may be some simple MF files
-   $mfpatt = $specialmf{$package };
-   if ($mfpatt eq "") { $mfpatt=$standardmf; }
-   &install("$DEST/metafont/$package",$mfpatt);
+# there may be some simple MF files, e.g., if specialfoundry eq "metafont".
+   my $mfpatt = $specialmf{$package} || $standardmf;
+   &install ("$DEST/metafont/$package", $mfpatt);
 }
 sub domp {
 # there may be some Metapost files
@@ -1253,12 +1261,12 @@ sub killfiles {
    
 }
 
-# rebuild list of files
+# rebuild list of input files, e.g., after flattening
 sub buildfilelist {
   opendir(DIR,'.') || die ("ERROR: cannot open directory");
   @filenames =grep(!/^\.\.?$/,readdir(DIR));
   closedir(DIR);
-  print " [list rebuilt]\n";
+  print " [file list rebuilt]\n";
 }
 
 sub runmf {
@@ -1325,12 +1333,11 @@ sub MAKEflatten {
  # so far we've only seen README's at one level.
  &SYSTEM('for d in *; do test -r $d/README && mv $d/README README.$d; done');
  
- &SYSTEM("$MV -f */*/*/*/* .");
- &SYSTEM("$MV -f */*/*/* .");
- &SYSTEM("$MV -f */*/*/* .");
- &SYSTEM("$MV -f */*/* .");
- &SYSTEM("$MV -f */*/* .");
- &SYSTEM("$MV -f */* .");
+ -d <*/*/*/*/*/.> && &SYSTEM("$MV -f */*/*/*/* .");
+ -d <*/*/*/*/.> && &SYSTEM("$MV -f */*/*/* .");
+ -d <*/*/*/.> && &SYSTEM("$MV -f */*/* .");
+ -d <*/*/.> && &SYSTEM("$MV -f */*/* .");
+ -d <*/.> && &SYSTEM("$MV -f */* .");
  &SYSTEM("find -type d -print | xargs rmdir 2>/dev/null");
  &buildfilelist;
  &donormal;
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check
index 2b731b56080..7a2875f1f75 100755
--- a/Build/tools/tpm-ctan-check
+++ b/Build/tools/tpm-ctan-check
@@ -61,7 +61,7 @@ sub main
          "ltabptch", "ltxmisc",
 #"malayalam", # missing C sources on CTAN, wrote author 5jun05.
 #"mathspic", # inside pictex, later
-       "makecell", "makeplot", "mathmode", "mcaption", "memoir",
+       "makecell", "makeplot", "mathmode", "mcaption", "memoir", "mfpic",
          "mhchem", "minitoc", "microtype", "minitoc", "mla-paper", "movie15", 
 #"mpattern", # not up-to-date on CTAN, wrote author 28may05.
        "nag", "ncclatex", "ncctools", "newlfm", "nomencl", "nomentbl",